tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86. reboot: Make Dell Latitude E6320 use reboot=pci
x86, doc only: Correct real-mode kernel header offset for init_size
x86: Disable AMD_NUMA for 32bit for now

Linus Torvalds 919d25a7 e6625fa4

+10 -2
+1 -1
Documentation/x86/boot.txt
··· 674 674 675 675 Field name: init_size 676 676 Type: read 677 - Offset/size: 0x25c/4 677 + Offset/size: 0x260/4 678 678 679 679 This field indicates the amount of linear contiguous memory starting 680 680 at the kernel runtime start address that the kernel needs before it
+1 -1
arch/x86/Kconfig
··· 1170 1170 config AMD_NUMA 1171 1171 def_bool y 1172 1172 prompt "Old style AMD Opteron NUMA detection" 1173 - depends on NUMA && PCI 1173 + depends on X86_64 && NUMA && PCI 1174 1174 ---help--- 1175 1175 Enable AMD NUMA node topology detection. You should say Y here if 1176 1176 you have a multi processor AMD system. This uses an old method to
+8
arch/x86/kernel/reboot.c
··· 419 419 DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), 420 420 }, 421 421 }, 422 + { /* Handle problems with rebooting on the Latitude E6320. */ 423 + .callback = set_pci_reboot, 424 + .ident = "Dell Latitude E6320", 425 + .matches = { 426 + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 427 + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), 428 + }, 429 + }, 422 430 { } 423 431 }; 424 432