diff --git a/config-powerpc-generic b/config-powerpc-generic index 9cd30a459..3c8d8f058 100644 --- a/config-powerpc-generic +++ b/config-powerpc-generic @@ -338,3 +338,6 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m CONFIG_MPC512X_DMA=m CONFIG_KVM_GUEST=y + +# CONFIG_IMA is not set +# CONFIG_TCG_TPM is not set diff --git a/config-powerpc32-generic b/config-powerpc32-generic index b18a845c1..daa06ab57 100644 --- a/config-powerpc32-generic +++ b/config-powerpc32-generic @@ -137,7 +137,6 @@ CONFIG_VIRTUALIZATION=y # CONFIG_MEMSTICK is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_TCG_TPM is not set # PPC gets sad with debug alloc (bz 448598) # CONFIG_DEBUG_PAGEALLOC is not set diff --git a/kernel.spec b/kernel.spec index 275491dc3..98cbfe9f0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1969,6 +1969,9 @@ fi # and build. %changelog +* Tue Mar 29 2011 Kyle McMartin +- Disable CONFIG_IMA, CONFIG_TCG_TPM on powerpc (#689468) + * Tue Mar 29 2011 Kyle McMartin - printk: do not mangle valid userspace syslog prefixes with /dev/kmsg (#691888)