Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 919d25a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of... 

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
parents e6625fa4 3628c3f5

Documentation/x86/boot.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -674,7 +674,7 @@ Protocol: 2.10+ 




Field name:	init_size

Field name:	init_size

Type:		read

Type:		read

Offset/size:	0x25c/4

Offset/size:	0x260/4





  This field indicates the amount of linear contiguous memory starting

  This field indicates the amount of linear contiguous memory starting

  at the kernel runtime start address that the kernel needs before it

  at the kernel runtime start address that the kernel needs before it

arch/x86/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -1170,7 +1170,7 @@ comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI" 
config AMD_NUMA

config AMD_NUMA

	def_bool y

	def_bool y

	prompt "Old style AMD Opteron NUMA detection"

	prompt "Old style AMD Opteron NUMA detection"

	depends on NUMA && PCI

	depends on X86_64 && NUMA && PCI

	---help---

	---help---

	  Enable AMD NUMA node topology detection.  You should say Y here if

	  Enable AMD NUMA node topology detection.  You should say Y here if

	  you have a multi processor AMD system. This uses an old method to

	  you have a multi processor AMD system. This uses an old method to

arch/x86/kernel/reboot.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -419,6 +419,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"),

			DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"),

		},

		},

	},

	},

	{	/* Handle problems with rebooting on the Latitude E6320. */

		.callback = set_pci_reboot,

		.ident = "Dell Latitude E6320",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"),

		},

	},

	{ }

	{ }

};

};