From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 11 Aug 2008 09:19:20 +0000 (+0200)
Subject: Merge branch 'linus' into x86/x2apic
X-Git-Tag: v2.6.28-rc1~711^2~1^2~33^2~2^3
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8067794bec1cc5de1431102cf0a6a1c7ce75cd85;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/x2apic

Conflicts:

	arch/x86/kernel/genapic_64.c

Manual merge:

	arch/x86/kernel/genx2apic_uv_x.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

8067794bec1cc5de1431102cf0a6a1c7ce75cd85
diff --cc arch/x86/kernel/genx2apic_uv_x.c
index 3fe472223a9,2cfcbded888..16a93ed7baf
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
@@@ -26,35 -26,6 +26,36 @@@
  #include <asm/uv/uv_hub.h>
  #include <asm/uv/bios.h>
  
 +DEFINE_PER_CPU(int, x2apic_extra_bits);
 +
 +static enum uv_system_type uv_system_type;
 +
 +static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 +{
 +	if (!strcmp(oem_id, "SGI")) {
 +		if (!strcmp(oem_table_id, "UVL"))
 +			uv_system_type = UV_LEGACY_APIC;
 +		else if (!strcmp(oem_table_id, "UVX"))
 +			uv_system_type = UV_X2APIC;
 +		else if (!strcmp(oem_table_id, "UVH")) {
 +			uv_system_type = UV_NON_UNIQUE_APIC;
 +			return 1;
 +		}
 +	}
 +	return 0;
 +}
 +
 +enum uv_system_type get_uv_system_type(void)
 +{
 +	return uv_system_type;
 +}
 +
 +int is_uv_system(void)
 +{
 +	return uv_system_type != UV_NONE;
 +}
++EXPORT_SYMBOL_GPL(is_uv_system);
 +
  DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);
  EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info);