[PATCH 2/2] [Maverick] UBUNTU: [Config] Enable CONFIG_X86_X2APIC

[Leann Ogasawara]

The x2APIC architecture provides a new x2apic mode, which allows for the
increased range of processor addressability ( > 8 bit apic ID support),
MSR access to APIC registers, etc. The x2apic specification can be found
at:

http://download.intel.com/design/processor/specupdt/318148.pdf

It's been requested (I've CC'd Yinying) that we enable the
CONFIG_X86_X2APIC option in Maverick:

BugLink: http://bugs.launchpad.net/bugs/597091

config X86_X2APIC
        bool "Support x2apic"
        depends on X86_LOCAL_APIC && X86_64 && INTR_REMAP
        ---help---
          This enables x2apic support on CPUs that have this feature.

          This allows 32-bit apic IDs (so it can support very large systems),
          and accesses the local apic via MSRs not via mmio.

          If you don't know what to do here, say N.
=====

>From 3a9e8e91a78a21f255d0e6e40245a0af396d0efb Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara at canonical.com>
Date: Tue, 22 Jun 2010 12:48:37 -0700
Subject: [PATCH 2/2] UBUNTU: [Config] Enable CONFIG_X86_X2APIC

x2APIC architecture provides a new x2apic mode, which allows for the
increased range of processor addressability ( > 8 bit apic ID support),
MSR access to APIC registers, etc. The x2apic specification can be found
at:

http://download.intel.com/design/processor/specupdt/318148.pdf

BugLink: http://bugs.launchpad.net/bugs/597091

Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 |    1 +
 debian.master/config/armel/config.common.armel |    1 +
 debian.master/config/config.common.ubuntu      |    2 +-
 debian.master/config/i386/config.common.i386   |    1 +
 4 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9a0c022..eb8c710 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -287,5 +287,6 @@ CONFIG_X86_64=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=7
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_X86_X2APIC=y
 CONFIG_ZONE_DMA32=y
 CONFIG_ZONE_DMA_FLAG=1
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index f994606..80bfdac 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -128,4 +128,5 @@ CONFIG_VIRTIO_RING=m
 # CONFIG_VT6656 is not set
 # CONFIG_WM8350_WATCHDOG is not set
 # CONFIG_X25_ASY is not set
+# CONFIG_X86_X2APIC is not set
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 85258f1..a28f8be 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4997,10 +4997,10 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y
+# CONFIG_X86_UV is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_X86_VSMP is not set
 CONFIG_X86_WP_WORKS_OK=y
-# CONFIG_X86_X2APIC is not set
 CONFIG_X86_XADD=y
 CONFIG_XEN=y
 CONFIG_XENFS=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 9c0cd82..388fe35 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -287,5 +287,6 @@ CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_SPEEDSTEP_LIB=y
+# CONFIG_X86_X2APIC is not set
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ZONE_DMA_FLAG=1
-- 
1.7.0.4