diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-11-10 06:39:56 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:44 -0500 |
commit | acb499f0ddfbea1176a70d93eb53943c325a073b (patch) | |
tree | be8ff69f3c54d515b6148dd6f367f4ef488d7260 | |
parent | f3ef75b773b38fe2028fa4627cab3991e2c60180 (diff) |
sh: Move vsyscall_init() defs up one level.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | include/asm-sh/processor.h | 6 | ||||
-rw-r--r-- | include/asm-sh/processor_32.h | 6 |
2 files changed, 6 insertions, 6 deletions
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 { | |||
49 | /* arch/sh/kernel/setup.c */ | 49 | /* arch/sh/kernel/setup.c */ |
50 | const char *get_cpu_subtype(struct sh_cpuinfo *c); | 50 | const char *get_cpu_subtype(struct sh_cpuinfo *c); |
51 | 51 | ||
52 | #ifdef CONFIG_VSYSCALL | ||
53 | int vsyscall_init(void); | ||
54 | #else | ||
55 | #define vsyscall_init() do { } while (0) | ||
56 | #endif | ||
57 | |||
52 | #endif /* __ASM_SH_PROCESSOR_H */ | 58 | #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) | |||
237 | #define prefetchw(x) prefetch(x) | 237 | #define prefetchw(x) prefetch(x) |
238 | #endif | 238 | #endif |
239 | 239 | ||
240 | #ifdef CONFIG_VSYSCALL | ||
241 | extern int vsyscall_init(void); | ||
242 | #else | ||
243 | #define vsyscall_init() do { } while (0) | ||
244 | #endif | ||
245 | |||
246 | #endif /* __KERNEL__ */ | 240 | #endif /* __KERNEL__ */ |
247 | #endif /* __ASM_SH_PROCESSOR_32_H */ | 241 | #endif /* __ASM_SH_PROCESSOR_32_H */ |