[kernel/f15/master] disable tpm/ima on ppc

[Kyle McMartin]

commit 755fd341e761cf3ff402950f34b0cb33afe4f083
Author: Kyle McMartin <kyle at redhat.com>
Date:   Tue Mar 29 21:18:02 2011 -0400

    disable tpm/ima on ppc

 config-powerpc-generic   |    3 +++
 config-powerpc32-generic |    1 -
 kernel.spec              |    3 +++
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 9cd30a4..3c8d8f0 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 b18a845..daa06ab 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 275491d..98cbfe9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1970,6 +1970,9 @@ fi
 
 %changelog
 * Tue Mar 29 2011 Kyle McMartin <kmcmartin at redhat.com>
+- Disable CONFIG_IMA, CONFIG_TCG_TPM on powerpc (#689468)
+
+* Tue Mar 29 2011 Kyle McMartin <kmcmartin at redhat.com>
 - printk: do not mangle valid userspace syslog prefixes with
   /dev/kmsg (#691888)
   - The patch is upstream in 2.6.39, and Lennart tells me the patch has been