Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index f6002e5dc1876dce3a88f11ba4ef6dea2e8507e1..90957f14195c7685e0ad25e188f2d2328ffbec97 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1086,11 +1086,7 @@ extern void si_meminfo(struct sysinfo * val);
 extern void si_meminfo_node(struct sysinfo *val, int nid);
 extern int after_bootmem;
 
-#ifdef CONFIG_NUMA
 extern void setup_per_cpu_pageset(void);
-#else
-static inline void setup_per_cpu_pageset(void) {}
-#endif
 
 extern void zone_pcp_update(struct zone *zone);