diff options
| author | Ravikiran G Thirumalai <kiran@scalex86.org> | 2008-03-20 00:41:16 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:08 +0200 |
| commit | aa7d8e25eca5deb33eb08013bc78a80514349b40 (patch) | |
| tree | 71075bf2c7103641377e5e182102cf8350797f8b /arch/x86/kernel/setup_64.c | |
| parent | 3250c91ada16a06de5afef55bce7b766c894d75c (diff) | |
| download | linux-aa7d8e25eca5deb33eb08013bc78a80514349b40.tar.gz linux-aa7d8e25eca5deb33eb08013bc78a80514349b40.tar.bz2 linux-aa7d8e25eca5deb33eb08013bc78a80514349b40.zip | |
x86: fix build breakage when PCI is define and PARAVIRT is not
- Fix the the build breakage when PARAVIRT is defined
but PCI is not
This fixes problem reported at:
http://marc.info/?l=linux-kernel&m=120525966600698&w=2
- Make is_vsmp_box() available even when PARAVIRT is not defined.
This is needed to determine if tsc's are reliable as a time source
even when PARAVIRT is not defined.
- split vsmp_init to use is_vsmp_box() and set_vsmp_pv_ops()
set_vsmp_pv_ops will do nothing if PCI is not enabled in the config.
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
| -rw-r--r-- | arch/x86/kernel/setup_64.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 990724143c43..20034493b5ad 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -351,9 +351,7 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled) efi_init(); -#ifdef CONFIG_PARAVIRT vsmp_init(); -#endif dmi_scan_machine(); |