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>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/genx2apic_uv_x.c
index 3fe4722,2cfcbde..16a93ed
--- 1/arch/x86/kernel/genx2apic_uv_x.c
--- 2/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);
  

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/lguest/boot.c
Simple merge

diff --cc kernel/irq/manage.c
Simple merge