x86/mrst changes for v2.6.35
Subsystems (3)
Linus,
Please pull the latest Intel Moorestown git tree
from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-mrst-for-linus
Thanks,
Ingo
------------------>
Jacob Pan (3):
x86: Avoid check hlt for newer cpus
x86, mrst, pci: return 0 for non-present pci bars x86, mrst: add nop functions to x86_init mpparse functions
arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/mrst.c | 5 +++++ arch/x86/pci/mrst.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/bugs.c +1 -1
@@ -86,7 +86,7 @@ static void __init check_fpu(void)static void __init check_hlt (void ) { -if (paravirt_enabled ()) +if (boot_cpu_data.x86 >=5 ||paravirt_enabled ())return ;printk (KERN_INFO "Checking 'hlt' instruction... " );
arch/x86/kernel/mrst.c +5 -0
@@ -237,4 +237,9 @@ void __init x86_mrst_early_setup(void) x86_init.pci.fixup_irqs = x86_init_noop; legacy_pic = &null_legacy_pic; + +/* Avoid searching for BIOS MP tables */ + x86_init.mpparse.find_smp_config = x86_init_noop; + x86_init.mpparse.get_smp_config = x86_init_uint_noop; + }
arch/x86/pci/mrst.c +1 -1
@@ -109,7 +109,7 @@ static int pci_device_update_fixed(struct pci_bus *bus, unsigned int devfn, decode++; decode = ~(decode -1 ); }else { - decode = ~0 ; + decode =0 ; }/*