[PATCH 1/2] [Maverick] UBUNTU: [Config] Enable CONFIG_INTR_REMAP=y

[Leann Ogasawara]

Interrupt-remapping is part of the Intel Virtualization Technology for
Directed I/O architecture.  The specification can be found from:

http://download.intel.com/technology/computing/vptech/Intel(r)_VT_for_Direct_IO.pdf

It's been requested (I've CC'd Yinying) that we enable the
CONFIG_INTR_REMAP option in Maverick.  Even though it's noted as
EXPERIMENTAL in the Kconfig, testing from Intel has shown it to be
stable.

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

config INTR_REMAP
        bool "Support for Interrupt Remapping (EXPERIMENTAL)"
        depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
        ---help---
          Supports Interrupt remapping for IO-APIC and MSI devices.
          To use x2apic mode in the CPU's which support x2APIC enhancements or
          to support platforms with CPU's having > 8 bit APIC ID, say Y.

=====

>From 070368f064201158569e0a57e7cdd7d7544a4939 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara at canonical.com>
Date: Tue, 22 Jun 2010 12:42:35 -0700
Subject: [PATCH 1/2] UBUNTU: [Config] Enable CONFIG_INTR_REMAP=y

Interrupt-remapping is part of the Intel Virtualization Technology for
Directed I/O architecture and the specification can be found from:

http://download.intel.com/technology/computing/vptech/Intel(r)_VT_for_Direct_IO.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 783b7ac..9a0c022 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -72,6 +72,7 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INTR_REMAP=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IPMI_HANDLER=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 262a404..f994606 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -27,6 +27,7 @@ CONFIG_FONTS=y
 CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 # CONFIG_HUGETLB_PAGE is not set
+# CONFIG_INTR_REMAP is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_LAPBETHER is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 231120b..85258f1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1974,7 +1974,6 @@ CONFIG_INTEL_IDLE=m
 CONFIG_INTEL_IOATDMA=m
 CONFIG_INTEL_MENLOW=m
 CONFIG_INTEL_SCU_IPC=y
-# CONFIG_INTR_REMAP is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IOSCHED_CFQ=y
@@ -5001,6 +5000,7 @@ CONFIG_X86_TSC=y
 # 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 92110fd..9c0cd82 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -74,6 +74,7 @@ CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_INTR_REMAP is not set
 # CONFIG_IOMMU_API is not set
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IPMI_HANDLER=m
-- 
1.7.0.4