Hi Alexey,
Today's linux-next merge of the proc tree got a conflict in mm/hugetlb.c
between commit 4f98a2fee8acdb4ac84545df98cccecfd130f8db ("vmscan: split
LRU lists into anon & file sets") from Linus' tree and commit
d8ad172f12c10f974821247773a8b82ba7965ae4 ("proc: switch /proc/meminfo to
seq_file") from the proc tree.
Just a context change. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc mm/hugetlb.c
index ce8cbb2,85ade11..0000000
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@@ -1455,15 -1456,15 +1456,15 @@@ int hugetlb_overcommit_handler(struct c
#endif /* CONFIG_SYSCTL */
- int hugetlb_report_meminfo(char *buf)
+ void hugetlb_report_meminfo(struct seq_file *m)
{
struct hstate *h = &default_hstate;
- return sprintf(buf,
+ seq_printf(m,
- "HugePages_Total: %5lu\n"
- "HugePages_Free: %5lu\n"
- "HugePages_Rsvd: %5lu\n"
- "HugePages_Surp: %5lu\n"
- "Hugepagesize: %5lu kB\n",
+ "HugePages_Total: %5lu\n"
+ "HugePages_Free: %5lu\n"
+ "HugePages_Rsvd: %5lu\n"
+ "HugePages_Surp: %5lu\n"
+ "Hugepagesize: %8lu kB\n",
h->nr_huge_pages,
h->free_huge_pages,
h->resv_huge_pages,
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
