aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@engr.sgi.com>2006-01-08 04:00:38 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 23:12:40 -0500
commitbec6b0c89b234090681a4516e20ac5debe3e7c59 (patch)
tree168a4c123e38b08d12b6787c18c4aa032520a48b /mm
parentb28a02de8c70d41d6b6ba8911e83ed3ccf2e13f8 (diff)
[PATCH] slab: remove nested #ifdef CONFIG_NUMA
For some reason there is an #ifdef CONFIG_NUMA within another #ifdef CONFIG_NUMA in the page allocator. Remove innermost #ifdef CONFIG_NUMA Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0b98f428b07b..5eeeadd9f66a 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1883,7 +1883,6 @@ bad:
1883 1883
1884static inline void free_zone_pagesets(int cpu) 1884static inline void free_zone_pagesets(int cpu)
1885{ 1885{
1886#ifdef CONFIG_NUMA
1887 struct zone *zone; 1886 struct zone *zone;
1888 1887
1889 for_each_zone(zone) { 1888 for_each_zone(zone) {
@@ -1892,7 +1891,6 @@ static inline void free_zone_pagesets(int cpu)
1892 zone_pcp(zone, cpu) = NULL; 1891 zone_pcp(zone, cpu) = NULL;
1893 kfree(pset); 1892 kfree(pset);
1894 } 1893 }
1895#endif
1896} 1894}
1897 1895
1898static int __devinit pageset_cpuup_callback(struct notifier_block *nfb, 1896static int __devinit pageset_cpuup_callback(struct notifier_block *nfb,