diff --git a/[refs] b/[refs] index 06e56b795732..48662ef086bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: acb7669c125676e63cf96582455509216c39745e +refs/heads/master: 2d5c1be8870383622809c25935fff00d2630c7a5 diff --git a/trunk/drivers/base/node.c b/trunk/drivers/base/node.c index 39f3d1b3a213..0f867a083338 100644 --- a/trunk/drivers/base/node.c +++ b/trunk/drivers/base/node.c @@ -84,8 +84,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) nid, K(i.totalram), nid, K(i.freeram), nid, K(i.totalram - i.freeram), - nid, node_page_state(nid, NR_ACTIVE), - nid, node_page_state(nid, NR_INACTIVE), + nid, K(node_page_state(nid, NR_ACTIVE)), + nid, K(node_page_state(nid, NR_INACTIVE)), #ifdef CONFIG_HIGHMEM nid, K(i.totalhigh), nid, K(i.freehigh),