diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/bootparam.h | 10 | ||||
-rw-r--r-- | arch/x86/kernel/head_32.S | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h index 1724e8de317c..283a9a1b3efd 100644 --- a/arch/x86/include/asm/bootparam.h +++ b/arch/x86/include/asm/bootparam.h | |||
@@ -109,4 +109,14 @@ struct boot_params { | |||
109 | __u8 _pad9[276]; /* 0xeec */ | 109 | __u8 _pad9[276]; /* 0xeec */ |
110 | } __attribute__((packed)); | 110 | } __attribute__((packed)); |
111 | 111 | ||
112 | enum { | ||
113 | X86_SUBARCH_PC = 0, | ||
114 | X86_SUBARCH_LGUEST, | ||
115 | X86_SUBARCH_XEN, | ||
116 | X86_SUBARCH_MRST, | ||
117 | X86_NR_SUBARCHS, | ||
118 | }; | ||
119 | |||
120 | |||
121 | |||
112 | #endif /* _ASM_X86_BOOTPARAM_H */ | 122 | #endif /* _ASM_X86_BOOTPARAM_H */ |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index cc827ac9e8d3..304e3f3d747b 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -157,6 +157,7 @@ subarch_entries: | |||
157 | .long default_entry /* normal x86/PC */ | 157 | .long default_entry /* normal x86/PC */ |
158 | .long lguest_entry /* lguest hypervisor */ | 158 | .long lguest_entry /* lguest hypervisor */ |
159 | .long xen_entry /* Xen hypervisor */ | 159 | .long xen_entry /* Xen hypervisor */ |
160 | .long default_entry /* Moorestown MID */ | ||
160 | num_subarch_entries = (. - subarch_entries) / 4 | 161 | num_subarch_entries = (. - subarch_entries) / 4 |
161 | .previous | 162 | .previous |
162 | #endif /* CONFIG_PARAVIRT */ | 163 | #endif /* CONFIG_PARAVIRT */ |