Merge tag 'linux-watchdog-5.10-rc1' of git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-microblaze.git] / mm / hugetlb.c

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 2fb9a4c..fe76f8f 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3571,18 +3571,20 @@ void hugetlb_report_meminfo(struct seq_file *m)
        seq_printf(m, "Hugetlb:        %8lu kB\n", total / 1024);
 }
 
-int hugetlb_report_node_meminfo(int nid, char *buf)
+int hugetlb_report_node_meminfo(char *buf, int len, int nid)
 {
        struct hstate *h = &default_hstate;
+
        if (!hugepages_supported())
                return 0;
-       return sprintf(buf,
-               "Node %d HugePages_Total: %5u\n"
-               "Node %d HugePages_Free:  %5u\n"
-               "Node %d HugePages_Surp:  %5u\n",
-               nid, h->nr_huge_pages_node[nid],
-               nid, h->free_huge_pages_node[nid],
-               nid, h->surplus_huge_pages_node[nid]);
+
+       return sysfs_emit_at(buf, len,
+                            "Node %d HugePages_Total: %5u\n"
+                            "Node %d HugePages_Free:  %5u\n"
+                            "Node %d HugePages_Surp:  %5u\n",
+                            nid, h->nr_huge_pages_node[nid],
+                            nid, h->free_huge_pages_node[nid],
+                            nid, h->surplus_huge_pages_node[nid]);
 }
 
 void hugetlb_show_meminfo(void)
@@ -5704,12 +5706,12 @@ void __init hugetlb_cma_reserve(int order)
        reserved = 0;
        for_each_node_state(nid, N_ONLINE) {
                int res;
-               char name[20];
+               char name[CMA_MAX_NAME];
 
                size = min(per_node, hugetlb_cma_size - reserved);
                size = round_up(size, PAGE_SIZE << order);
 
-               snprintf(name, 20, "hugetlb%d", nid);
+               snprintf(name, sizeof(name), "hugetlb%d", nid);
                res = cma_declare_contiguous_nid(0, size, 0, PAGE_SIZE << order,
                                                 0, false, name,
                                                 &hugetlb_cma[nid], nid);