Skip to contentSkip to conversation

CRIS v10: Include mm.h instead of vmstat.h in kernel/time.c

PATCH New Jesper Nilsson 1 participant 1 message Feb 25, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 CRIS v10: Include mm.h instead of vmstat.h in kernel/time.c

Commit 2f569afd9ced9ebec9a6eb3dbf6f83429be0a7b4 (CONFIG_HIGHPTE vs. sub-page page tables) introduced use of inc_zone_page_state and dec_zone_page_state in include/linux/mm.h.

Those are defined in include/linux/vmstat.h, but after it includes mm.h, making it impossible to include vmstat.h since inc_zone_page_state and dec_zone_page_state then would be undefined.

arch/cris/arch-v10/kernel/time.c does just this, which makes the CRIS v10 build break with the following error:

...
CC arch/cris/arch-v10/kernel/time.o
In file included from include/linux/vmstat.h:7,

                 from arch/cris/arch-v10/kernel/time.c:17:

include/linux/mm.h: In function 'pgtable_page_ctor':
include/linux/mm.h:902: error: implicit declaration of function 'inc_zone_page_state' include/linux/mm.h: In function 'pgtable_page_dtor':
include/linux/mm.h:908: error: implicit declaration of function 'dec_zone_page_state' make[2]: *** [arch/cris/arch-v10/kernel/time.o] Error 1
make[1]: *** [arch/cris/arch-v10/kernel] Error 2
make: *** [sub-make] Error 2
...

By changing kernel/time.c to include linux/mm.h, the build succeeds.

---
 arch/cris/arch-v10/kernel/time.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/cris/arch-v10/kernel/time.c +1 -1
index 9310a7b..525483f 100644
@@ -13,7 +13,7 @@
 #include <linux/swap.h>
 #include <linux/sched.h>
 #include <linux/init.h>
-#include <linux/vmstat.h>
+#include <linux/mm.h>
 #include <asm/arch/svinto.h>
 #include <asm/types.h>
 #include <asm/signal.h>
Signature · 6 lines
1.5.4.2.133.g3d51e


/^JN - Jesper Nilsson
--
               Jesper Nilsson -- [email protected]