kevin/linux
1
Fork 0
Code
54b4cbd269
linux/arch/cris/arch-v10/kernel
History
Jesper Nilsson a10568733c CRIS v10: Include mm.h instead of vmstat.h in kernel/time.c 
Commit 2f569afd9c
(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.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <mikael.starvik@axis.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-03-04 16:35:09 -08:00
..
asm-offsets.c
crisksyms.c
debugport.c CRIS v10: Update and fix bug in kernel/debugport. 2008-02-08 11:06:29 +01:00
dma.c CRIS v10: Remove CVS id tag from kernel/dma.c 2008-02-08 11:06:30 +01:00
entry.S CRIS: Add new timerfd syscall entries. 2008-02-08 11:54:30 +01:00
fasttimer.c CRIS v10: Cleanup kernel/fasttimer.c 2008-02-08 11:06:30 +01:00
head.S CRIS v10: Setup serial port 2 to avoid accidental TXD pulse on startup. 2008-02-08 11:06:31 +01:00
io_interface_mux.c CRIS v10: Update kernel/io_interface_mux.c 2008-02-08 11:06:32 +01:00
irq.c CRIS v10: Cleanup kernel/irq.c 2008-02-08 11:06:30 +01:00
kgdb.c CRIS v10: Remove CVS log and id from kernel/kgdb.c 2008-02-08 11:06:30 +01:00
Makefile
process.c CRIS v10: Remove CVS id from kernel/process.c 2008-02-08 11:06:30 +01:00
ptrace.c CRIS v10: Clear TIF_SYSCALL_TRACE flag in ptrace_disable in kernel/ptrace.c 2008-02-08 11:06:32 +01:00
setup.c
shadows.c CRIS v10: Remove useless CVS id from kernel/shadows.c 2008-02-08 11:06:31 +01:00
signal.c
time.c CRIS v10: Include mm.h instead of vmstat.h in kernel/time.c 2008-03-04 16:35:09 -08:00
traps.c CRIS v32: Update traps.c 2008-02-08 11:06:26 +01:00