Commit c2d42c16 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

mm/vmstat.c: uninline node_page_state() 

With x86_64 (config http://ozlabs.org/~akpm/config-akpm2.txt

) and old gcc
(4.4.4), drivers/base/node.c:node_read_meminfo() is using 2344 bytes of
stack.  Uninlining node_page_state() reduces this to 440 bytes.

The stack consumption issue is fixed by newer gcc (4.8.4) however with
that compiler this patch reduces the node.o text size from 7314 bytes to
4578.

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 27f28b97

include/linux/vmstat.h

+1 −23
Original line number Diff line number Diff line
@@ -161,30 +161,8 @@ static inline unsigned long zone_page_state_snapshot(struct zone *zone, 
}



#ifdef CONFIG_NUMA

/*

 * Determine the per node value of a stat item. This function

 * is called frequently in a NUMA machine, so try to be as

 * frugal as possible.

 */

static inline unsigned long node_page_state(int node,

				 enum zone_stat_item item)

{

	struct zone *zones = NODE_DATA(node)->node_zones;



	return

#ifdef CONFIG_ZONE_DMA

		zone_page_state(&zones[ZONE_DMA], item) +

#endif

#ifdef CONFIG_ZONE_DMA32

		zone_page_state(&zones[ZONE_DMA32], item) +

#endif

#ifdef CONFIG_HIGHMEM

		zone_page_state(&zones[ZONE_HIGHMEM], item) +

#endif

		zone_page_state(&zones[ZONE_NORMAL], item) +

		zone_page_state(&zones[ZONE_MOVABLE], item);

}



extern unsigned long node_page_state(int node, enum zone_stat_item item);

extern void zone_statistics(struct zone *, struct zone *, gfp_t gfp);



#else

mm/vmstat.c

+22 −0
Original line number Diff line number Diff line
@@ -591,6 +591,28 @@ void zone_statistics(struct zone *preferred_zone, struct zone *z, gfp_t flags) 
	else

		__inc_zone_state(z, NUMA_OTHER);

}



/*

 * Determine the per node value of a stat item.

 */

unsigned long node_page_state(int node, enum zone_stat_item item)

{

	struct zone *zones = NODE_DATA(node)->node_zones;



	return

#ifdef CONFIG_ZONE_DMA

		zone_page_state(&zones[ZONE_DMA], item) +

#endif

#ifdef CONFIG_ZONE_DMA32

		zone_page_state(&zones[ZONE_DMA32], item) +

#endif

#ifdef CONFIG_HIGHMEM

		zone_page_state(&zones[ZONE_HIGHMEM], item) +

#endif

		zone_page_state(&zones[ZONE_NORMAL], item) +

		zone_page_state(&zones[ZONE_MOVABLE], item);

}



#endif



#ifdef CONFIG_COMPACTION

CRA Git | Maintained and supported by SUSTech CRA and CCSE