| Message ID | 1288713543-16683-3-git-send-email-john.johansen@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Andy Whitcroft |
| Headers | show |
Applied to Natty. -apw
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic index e25d3d6..0cda20a 100644 --- a/debian.master/config/amd64/config.flavour.generic +++ b/debian.master/config/amd64/config.flavour.generic @@ -4,6 +4,7 @@ CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_INTEL_IDLE=y # CONFIG_MEMORY_HOTPLUG is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server index 43c6c71..3fdffb1 100644 --- a/debian.master/config/amd64/config.flavour.server +++ b/debian.master/config/amd64/config.flavour.server @@ -4,6 +4,7 @@ # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_INTEL_IDLE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual index 54164a3..97a6244 100644 --- a/debian.master/config/amd64/config.flavour.virtual +++ b/debian.master/config/amd64/config.flavour.virtual @@ -4,6 +4,7 @@ # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" +# CONFIG_INTEL_IDLE is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 6805b05..3e604ef 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -26,6 +26,7 @@ CONFIG_FONTS=y CONFIG_HAVE_AOUT=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y # CONFIG_HUGETLB_PAGE is not set +CONFIG_INTEL_IDLE=y # CONFIG_INTR_REMAP is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_LAPBETHER is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 0351266..36d6624 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2001,7 +2001,6 @@ CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_WM831X_ON=m CONFIG_INPUT_YEALINK=m CONFIG_INSTRUCTION_DECODER=y -CONFIG_INTEL_IDLE=y CONFIG_INTEL_IOATDMA=m CONFIG_INTEL_IPS=m CONFIG_INTEL_MENLOW=m @@ -3752,6 +3751,7 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_APPARMOR_COMPAT_24=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_PATH=y diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic index af17ec8..e736d21 100644 --- a/debian.master/config/i386/config.flavour.generic +++ b/debian.master/config/i386/config.flavour.generic @@ -4,6 +4,7 @@ # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set +CONFIG_INTEL_IDLE=y # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_SYM53C8XX_2=m diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae index d14011f..7820034 100644 --- a/debian.master/config/i386/config.flavour.generic-pae +++ b/debian.master/config/i386/config.flavour.generic-pae @@ -4,6 +4,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y # CONFIG_HIGHMEM4G is not set CONFIG_HIGHMEM64G=y +CONFIG_INTEL_IDLE=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCSI_SYM53C8XX_2=y diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual index 327b2f2..a3ee2f7 100644 --- a/debian.master/config/i386/config.flavour.virtual +++ b/debian.master/config/i386/config.flavour.virtual @@ -4,6 +4,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y # CONFIG_HIGHMEM4G is not set CONFIG_HIGHMEM64G=y +# CONFIG_INTEL_IDLE is not set CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCSI_SYM53C8XX_2=y
BugLink: http://bugs.launchpad.net/bugs/651370 EC2 Xen does not properly handle the mwait instruction used by intel_idle resulting in an invalid opcode when an instance is launched on newer intel hardware. Signed-off-by: John Johansen <john.johansen@canonical.com> --- debian.master/config/amd64/config.flavour.generic | 1 + debian.master/config/amd64/config.flavour.server | 1 + debian.master/config/amd64/config.flavour.virtual | 1 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/config.common.ubuntu | 2 +- debian.master/config/i386/config.flavour.generic | 1 + .../config/i386/config.flavour.generic-pae | 1 + debian.master/config/i386/config.flavour.virtual | 1 + 8 files changed, 8 insertions(+), 1 deletions(-)