diff --git a/[refs] b/[refs] index fb8b95e720f7..81c8381203e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 513627d7fec6fcb7b3d56ce355cb4d192c76b530 +refs/heads/master: f5ef68da5fda5e095b585ea5ecdd42af3c8695f7 diff --git a/trunk/drivers/base/node.c b/trunk/drivers/base/node.c index d7de1753e094..e9b0957f15d1 100644 --- a/trunk/drivers/base/node.c +++ b/trunk/drivers/base/node.c @@ -64,7 +64,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) "Node %d Mapped: %8lu kB\n" "Node %d AnonPages: %8lu kB\n" "Node %d PageTables: %8lu kB\n" - "Node %d NFS Unstable: %8lu kB\n" + "Node %d NFS_Unstable: %8lu kB\n" "Node %d Bounce: %8lu kB\n" "Node %d Slab: %8lu kB\n", nid, K(i.totalram), diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c index 9f2cfc30f9cf..942156225447 100644 --- a/trunk/fs/proc/proc_misc.c +++ b/trunk/fs/proc/proc_misc.c @@ -169,7 +169,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, "Mapped: %8lu kB\n" "Slab: %8lu kB\n" "PageTables: %8lu kB\n" - "NFS Unstable: %8lu kB\n" + "NFS_Unstable: %8lu kB\n" "Bounce: %8lu kB\n" "CommitLimit: %8lu kB\n" "Committed_AS: %8lu kB\n"