lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull x86/urgent branch from Ingo Molnar:
 "These are the fixes left over from the very end of the v3.4
  stabilization cycle, plus one more fix."

Ugh.  Those KERN_CONT additions are just pointless.  I think they came
as a reaction to some of the early (broken) printk() work - but that was
fixed before it was merged.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, relocs: Build clean fix
  x86, printk: Add missing KERN_CONT to NMI selftest
  x86: Fix boot on Twinhead H12Y
This commit is contained in:
Linus Torvalds
2012-05-23 10:21:19 -07:00
parent 19bec32d7f b2d668da93
commit e7b30a17c1
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/Makefile
View File

@@ -205,6 +205,7 @@ archclean:
$(Q)rm -rf $(objtree)/arch/i386 $(Q)rm -rf $(objtree)/arch/i386
$(Q)rm -rf $(objtree)/arch/x86_64 $(Q)rm -rf $(objtree)/arch/x86_64
$(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)
$(Q)$(MAKE) $(clean)=arch/x86/tools
define archhelp define archhelp
echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)'

12
arch/x86/kernel/nmi_selftest.c
View File

@@ -118,15 +118,15 @@ static void __init dotest(void (*testcase_fn)(void), int expected)
unexpected_testcase_failures++; unexpected_testcase_failures++;
if (nmi_fail == FAILURE) if (nmi_fail == FAILURE)
printk("FAILED |"); printk(KERN_CONT "FAILED |");
else if (nmi_fail == TIMEOUT) else if (nmi_fail == TIMEOUT)
printk("TIMEOUT|"); printk(KERN_CONT "TIMEOUT|");
else else
printk("ERROR |"); printk(KERN_CONT "ERROR |");
dump_stack(); dump_stack();
} else { } else {
testcase_successes++; testcase_successes++;
printk(" ok |"); printk(KERN_CONT " ok |");
} }
testcase_total++; testcase_total++;
@@ -151,10 +151,10 @@ void __init nmi_selftest(void)
print_testname("remote IPI"); print_testname("remote IPI");
dotest(remote_ipi, SUCCESS); dotest(remote_ipi, SUCCESS);
printk("\n"); printk(KERN_CONT "\n");
print_testname("local IPI"); print_testname("local IPI");
dotest(local_ipi, SUCCESS); dotest(local_ipi, SUCCESS);
printk("\n"); printk(KERN_CONT "\n");
cleanup_nmi_testsuite(); cleanup_nmi_testsuite();

17
arch/x86/pci/fixup.c
View File

@@ -519,3 +519,20 @@ static void sb600_disable_hpet_bar(struct pci_dev *dev)
} }
} }
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, 0x4385, sb600_disable_hpet_bar); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, 0x4385, sb600_disable_hpet_bar);
/*
* Twinhead H12Y needs us to block out a region otherwise we map devices
* there and any access kills the box.
*
* See: https://bugzilla.kernel.org/show_bug.cgi?id=10231
*
* Match off the LPC and svid/sdid (older kernels lose the bridge subvendor)
*/
static void __devinit twinhead_reserve_killing_zone(struct pci_dev *dev)
{
if (dev->subsystem_vendor == 0x14FF && dev->subsystem_device == 0xA003) {
pr_info("Reserving memory on Twinhead H12Y\n");
request_mem_region(0xFFB00000, 0x100000, "twinhead");
}
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x27B9, twinhead_reserve_killing_zone);