| Message ID | 1441766015-25686-1-git-send-email-dann.frazier@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Sep 08, 2015 at 08:33:35PM -0600, dann frazier wrote: > BugLink: http://bugs.launchpad.net/bugs/1388952 > > Probing for a BMC in I/O space is not supported on ARM and can cause various > faults. Acked-by: Paolo Pisati <paolo.pisati@canonical.com>
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index c15455a..713929b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -55,6 +55,7 @@ CONFIG_HUGETLB_PAGE=y # CONFIG_I2C_SLAVE is not set CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_IMA=y +CONFIG_IPMI_SI_PROBE_DEFAULTS=y CONFIG_JUMP_LABEL=y CONFIG_KVM=m CONFIG_LOG_BUF_SHIFT=18 diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index a1f0b7c..64ca34b 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -55,6 +55,7 @@ CONFIG_HZ=100 # CONFIG_I2C_SLAVE is not set CONFIG_IMA=y CONFIG_IOMMU_IO_PGTABLE_LPAE=y +# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set CONFIG_JUMP_LABEL=y CONFIG_KVM=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 41dee4c..e87e419 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -48,6 +48,7 @@ CONFIG_HZ=250 CONFIG_HZ_250=y CONFIG_I2C_SLAVE=y CONFIG_IMA=y +# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set # CONFIG_JUMP_LABEL is not set CONFIG_KVM=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 4f4417d..9612ffe 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3530,7 +3530,6 @@ CONFIG_IPMI_HANDLER=m CONFIG_IPMI_POWERNV=m CONFIG_IPMI_POWEROFF=m CONFIG_IPMI_SI=m -CONFIG_IPMI_SI_PROBE_DEFAULTS=y CONFIG_IPMI_SSIF=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMMU_VMSA=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index a58b72a..3d66922 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -54,6 +54,7 @@ CONFIG_HUGETLB_PAGE=y # CONFIG_I2C_SLAVE is not set CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_IMA=y +CONFIG_IPMI_SI_PROBE_DEFAULTS=y CONFIG_ISA=y CONFIG_JUMP_LABEL=y CONFIG_KVM=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index d9d0ba1..8766471 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -42,6 +42,7 @@ CONFIG_HZ_250=y # CONFIG_I2C_SLAVE is not set # CONFIG_IBMEBUS is not set CONFIG_IBMVETH=m +CONFIG_IPMI_SI_PROBE_DEFAULTS=y # CONFIG_IRQ_ALL_CPUS is not set # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set # CONFIG_ISA is not set diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 9a58044..c061978 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -64,6 +64,7 @@ CONFIG_HZ_250=y CONFIG_IBMEBUS=y CONFIG_IBMVETH=y CONFIG_IMA=y +CONFIG_IPMI_SI_PROBE_DEFAULTS=y CONFIG_IRQ_ALL_CPUS=y # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set CONFIG_JUMP_LABEL=y
BugLink: http://bugs.launchpad.net/bugs/1388952 Probing for a BMC in I/O space is not supported on ARM and can cause various faults. (regression from vivid) Signed-off-by: dann frazier <dann.frazier@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/arm64/config.common.arm64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 + 7 files changed, 6 insertions(+), 1 deletion(-)