aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-12 09:06:29 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-12 09:09:23 -0400
commit46eaa6702016e3ac9a188172a2c309d6ca1be1cd (patch)
tree77e893c287fe15acafd68bede8eb9b46bd541672 /include
parenta9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (diff)
x86: memory corruption check - cleanup
Move the prototypes from the generic kernel.h header to the more appropriate include/asm-x86/bios_ebda.h header file. Also, remove the check from the power management code - this is a pure x86 matter for now. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/bios_ebda.h17
-rw-r--r--include/linux/kernel.h17
2 files changed, 17 insertions, 17 deletions
diff --git a/include/asm-x86/bios_ebda.h b/include/asm-x86/bios_ebda.h
index ec42ed874591..79b4b88505d7 100644
--- a/include/asm-x86/bios_ebda.h
+++ b/include/asm-x86/bios_ebda.h
@@ -16,4 +16,21 @@ static inline unsigned int get_bios_ebda(void)
16 16
17void reserve_ebda_region(void); 17void reserve_ebda_region(void);
18 18
19#ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION
20/*
21 * This is obviously not a great place for this, but we want to be
22 * able to scatter it around anywhere in the kernel.
23 */
24void check_for_bios_corruption(void);
25void start_periodic_check_for_corruption(void);
26#else
27static inline void check_for_bios_corruption(void)
28{
29}
30
31static inline void start_periodic_check_for_corruption(void)
32{
33}
34#endif
35
19#endif /* ASM_X86__BIOS_EBDA_H */ 36#endif /* ASM_X86__BIOS_EBDA_H */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 50873b211788..2651f805ba6d 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -240,23 +240,6 @@ extern const char *print_tainted(void);
240extern void add_taint(unsigned); 240extern void add_taint(unsigned);
241extern int root_mountflags; 241extern int root_mountflags;
242 242
243#ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION
244/*
245 * This is obviously not a great place for this, but we want to be
246 * able to scatter it around anywhere in the kernel.
247 */
248void check_for_bios_corruption(void);
249void start_periodic_check_for_corruption(void);
250#else
251static inline void check_for_bios_corruption(void)
252{
253}
254
255static inline void start_periodic_check_for_corruption(void)
256{
257}
258#endif
259
260/* Values used for system_state */ 243/* Values used for system_state */
261extern enum system_states { 244extern enum system_states {
262 SYSTEM_BOOTING, 245 SYSTEM_BOOTING,