From: Paul Mundt Date: Sat, 10 Nov 2007 11:39:56 +0000 (+0900) Subject: sh: Move vsyscall_init() defs up one level. X-Git-Tag: v2.6.25-rc1~1169^2~144 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=acb499f0ddfbea1176a70d93eb53943c325a073b;p=karo-tx-linux.git sh: Move vsyscall_init() defs up one level. Signed-off-by: Paul Mundt --- diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h index b98c882d5036..76c4dc7021cb 100644 --- a/include/asm-sh/processor.h +++ b/include/asm-sh/processor.h @@ -49,4 +49,10 @@ enum cpu_type { /* arch/sh/kernel/setup.c */ const char *get_cpu_subtype(struct sh_cpuinfo *c); +#ifdef CONFIG_VSYSCALL +int vsyscall_init(void); +#else +#define vsyscall_init() do { } while (0) +#endif + #endif /* __ASM_SH_PROCESSOR_H */ diff --git a/include/asm-sh/processor_32.h b/include/asm-sh/processor_32.h index 35040fe43e5e..1ad74633c009 100644 --- a/include/asm-sh/processor_32.h +++ b/include/asm-sh/processor_32.h @@ -237,11 +237,5 @@ static inline void prefetch(void *x) #define prefetchw(x) prefetch(x) #endif -#ifdef CONFIG_VSYSCALL -extern int vsyscall_init(void); -#else -#define vsyscall_init() do { } while (0) -#endif - #endif /* __KERNEL__ */ #endif /* __ASM_SH_PROCESSOR_32_H */