[ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.arch / x86_sgi_uv_early_detect_oem.patch

From: Jack Steiner <steiner@sgi.com>
Subject: x86, uv: add early detection of UV system types
References: bnc#429984
Patch-Mainline: yes

I missed one line of the UV infrastructure patch.

The code is already upstream as part of a larger UV patch
but was somehow lost from the final UV infrastructure patch that was
sent to SuSE.

This change is necessary to detect that the system is a UV system prior
to parsing the SRAT processor information.

Mainline Commit: 2e42060c19cb79adacc48beb5e9ec5361df976a2

Signed-off-by: Thomas Renninger <trenn@suse.de>

---
 arch/x86/kernel/setup.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -818,6 +818,8 @@ void __init setup_arch(char **cmdline_p)
 	 */
 	acpi_boot_table_init();
 
+	early_acpi_boot_init();
+
 #ifdef CONFIG_ACPI_NUMA
 	/*
 	 * Parse SRAT to discover nodes.
Commit	Line	Data
2cb7cef9 BS	1	From: Jack Steiner <steiner@sgi.com>
	2	Subject: x86, uv: add early detection of UV system types
	3	References: bnc#429984
	4	Patch-Mainline: yes
	5
	6	I missed one line of the UV infrastructure patch.
	7
	8	The code is already upstream as part of a larger UV patch
	9	but was somehow lost from the final UV infrastructure patch that was
	10	sent to SuSE.
	11
	12	This change is necessary to detect that the system is a UV system prior
	13	to parsing the SRAT processor information.
	14
	15	Mainline Commit: 2e42060c19cb79adacc48beb5e9ec5361df976a2
	16
	17	Signed-off-by: Thomas Renninger <trenn@suse.de>
	18
	19	---
	20	arch/x86/kernel/setup.c \| 2 ++
	21	1 file changed, 2 insertions(+)
	22
	23	--- a/arch/x86/kernel/setup.c
	24	+++ b/arch/x86/kernel/setup.c
	25	@@ -818,6 +818,8 @@ void __init setup_arch(char **cmdline_p)
	26	*/
	27	acpi_boot_table_init();
	28
	29	+ early_acpi_boot_init();
	30	+
	31	#ifdef CONFIG_ACPI_NUMA
	32	/*
	33	* Parse SRAT to discover nodes.