[PATCH] mm, vmstat: add infrastructure for per-node vmstats -fix

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The kbuild test robot reported the following

All warnings (new ones prefixed by >>):

   drivers/base/node.c: In function 'node_read_meminfo':
>> drivers/base/node.c:126:31: warning: passing argument 1 of 'node_page_state' makes pointer from integer without a cast [-Wint-conversion]
             nid, node_page_state(nid, NR_KERNEL_STACK) *
                                  ^~~
   In file included from include/linux/mm.h:991:0,
                    from drivers/base/node.c:7:
   include/linux/vmstat.h:184:22: note: expected 'struct pglist_data *' but argument is of type 'int'
    extern unsigned long node_page_state(struct pglist_data *pgdat,

This may be a problem due to a merge conflict. This is a fix for the mmotm
patch mm-vmstat-add-infrastructure-for-per-node-vmstats.patch

Signed-off-by: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
---
 drivers/base/node.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/node.c b/drivers/base/node.c
index a3ae3ae34593..0a1b6433a76c 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -123,7 +123,7 @@ static ssize_t node_read_meminfo(struct device *dev,
 		       nid, K(sum_zone_node_page_state(nid, NR_FILE_MAPPED)),
 		       nid, K(sum_zone_node_page_state(nid, NR_ANON_PAGES)),
 		       nid, K(i.sharedram),
-		       nid, node_page_state(nid, NR_KERNEL_STACK) *
+		       nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK) *
 				THREAD_SIZE / 1024,
 		       nid, K(sum_zone_node_page_state(nid, NR_PAGETABLE)),
 		       nid, K(sum_zone_node_page_state(nid, NR_UNSTABLE_NFS)),

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]