aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/setup.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-13 15:05:03 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-13 15:05:03 -0500
commit22796b15725488002437ebbf98a22fdbe596cf89 (patch)
treee6745c9e367e782c0b184eb941e2b86805975f88 /arch/x86/include/asm/setup.h
parentbf33a70a73876b163d62612e9567cbac6604ba7e (diff)
parent0fb807c3e573ff9de2965ca38c907605d4735d16 (diff)
Merge branch 'core/header-fixes' into x86/headers
Conflicts: arch/x86/include/asm/setup.h
Diffstat (limited to 'arch/x86/include/asm/setup.h')
-rw-r--r--arch/x86/include/asm/setup.h43
1 files changed, 22 insertions, 21 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 45b40278b582..c230189462a2 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -7,21 +7,6 @@
7 7
8#ifndef __ASSEMBLY__ 8#ifndef __ASSEMBLY__
9 9
10/* Interrupt control for vSMPowered x86_64 systems */
11void vsmp_init(void);
12
13void setup_bios_corruption_check(void);
14
15#ifdef CONFIG_X86_VISWS
16extern void visws_early_detect(void);
17extern int is_visws_box(void);
18#else
19static inline void visws_early_detect(void) { }
20static inline int is_visws_box(void) { return 0; }
21#endif
22
23extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
24extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
25/* 10/*
26 * Any setup quirks to be performed? 11 * Any setup quirks to be performed?
27 */ 12 */
@@ -48,12 +33,6 @@ struct x86_quirks {
48 int (*update_genapic)(void); 33 int (*update_genapic)(void);
49}; 34};
50 35
51extern struct x86_quirks *x86_quirks;
52extern unsigned long saved_video_mode;
53
54#ifndef CONFIG_PARAVIRT
55#define paravirt_post_allocator_init() do {} while (0)
56#endif
57#endif /* __ASSEMBLY__ */ 36#endif /* __ASSEMBLY__ */
58 37
59#ifdef __i386__ 38#ifdef __i386__
@@ -76,6 +55,28 @@ extern unsigned long saved_video_mode;
76#ifndef __ASSEMBLY__ 55#ifndef __ASSEMBLY__
77#include <asm/bootparam.h> 56#include <asm/bootparam.h>
78 57
58/* Interrupt control for vSMPowered x86_64 systems */
59void vsmp_init(void);
60
61void setup_bios_corruption_check(void);
62
63#ifdef CONFIG_X86_VISWS
64extern void visws_early_detect(void);
65extern int is_visws_box(void);
66#else
67static inline void visws_early_detect(void) { }
68static inline int is_visws_box(void) { return 0; }
69#endif
70
71extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
72extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
73extern struct x86_quirks *x86_quirks;
74extern unsigned long saved_video_mode;
75
76#ifndef CONFIG_PARAVIRT
77#define paravirt_post_allocator_init() do {} while (0)
78#endif
79
79#ifndef _SETUP 80#ifndef _SETUP
80 81
81/* 82/*