Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ee92255 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

drivers/base/node.c: reduce stack usage of node_read_meminfo() 



	drivers/base/node.c: In function 'node_read_meminfo':
	drivers/base/node.c:139: warning: the frame size of 848 bytes is
	larger than 512 bytes

Fix it by splitting the sprintf() into three parts.  It has no functional
change.

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9a5b489b

drivers/base/node.c

+23 −23
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
	struct sysinfo i;



	si_meminfo_node(&i, nid);



	n = sprintf(buf, "\n"

	n = sprintf(buf,

		       "Node %d MemTotal:       %8lu kB\n"

		       "Node %d MemFree:        %8lu kB\n"

		       "Node %d MemUsed:        %8lu kB\n"
@@ -78,13 +77,33 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       "Node %d Active(file):   %8lu kB\n"

		       "Node %d Inactive(file): %8lu kB\n"

		       "Node %d Unevictable:    %8lu kB\n"

		       "Node %d Mlocked:        %8lu kB\n"

		       "Node %d Mlocked:        %8lu kB\n",

		       nid, K(i.totalram),

		       nid, K(i.freeram),

		       nid, K(i.totalram - i.freeram),

		       nid, K(node_page_state(nid, NR_ACTIVE_ANON) +

				node_page_state(nid, NR_ACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_INACTIVE_ANON) +

				node_page_state(nid, NR_INACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_ACTIVE_ANON)),

		       nid, K(node_page_state(nid, NR_INACTIVE_ANON)),

		       nid, K(node_page_state(nid, NR_ACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_INACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_UNEVICTABLE)),

		       nid, K(node_page_state(nid, NR_MLOCK)));



#ifdef CONFIG_HIGHMEM

	n += sprintf(buf + n,

		       "Node %d HighTotal:      %8lu kB\n"

		       "Node %d HighFree:       %8lu kB\n"

		       "Node %d LowTotal:       %8lu kB\n"

		       "Node %d LowFree:        %8lu kB\n"

		       "Node %d LowFree:        %8lu kB\n",

		       nid, K(i.totalhigh),

		       nid, K(i.freehigh),

		       nid, K(i.totalram - i.totalhigh),

		       nid, K(i.freeram - i.freehigh));

#endif

	n += sprintf(buf + n,

		       "Node %d Dirty:          %8lu kB\n"

		       "Node %d Writeback:      %8lu kB\n"

		       "Node %d FilePages:      %8lu kB\n"
@@ -99,25 +118,6 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       "Node %d Slab:           %8lu kB\n"

		       "Node %d SReclaimable:   %8lu kB\n"

		       "Node %d SUnreclaim:     %8lu kB\n",

		       nid, K(i.totalram),

		       nid, K(i.freeram),

		       nid, K(i.totalram - i.freeram),

		       nid, K(node_page_state(nid, NR_ACTIVE_ANON) +

				node_page_state(nid, NR_ACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_INACTIVE_ANON) +

				node_page_state(nid, NR_INACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_ACTIVE_ANON)),

		       nid, K(node_page_state(nid, NR_INACTIVE_ANON)),

		       nid, K(node_page_state(nid, NR_ACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_INACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_UNEVICTABLE)),

		       nid, K(node_page_state(nid, NR_MLOCK)),

#ifdef CONFIG_HIGHMEM

		       nid, K(i.totalhigh),

		       nid, K(i.freehigh),

		       nid, K(i.totalram - i.totalhigh),

		       nid, K(i.freeram - i.freehigh),

#endif

		       nid, K(node_page_state(nid, NR_FILE_DIRTY)),

		       nid, K(node_page_state(nid, NR_WRITEBACK)),

		       nid, K(node_page_state(nid, NR_FILE_PAGES)),