[kernel] Disable IMA. (Forces TPM on, which may be undesirable: See 733964, 746097) Move TPM modules to modul

[Dave Jones]

commit 7729f4130173279cb683d4d8dee630e14cc7b32c
Author: Dave Jones <davej at redhat.com>
Date:   Mon Dec 19 15:11:34 2011 -0500

    Disable IMA. (Forces TPM on, which may be undesirable: See 733964, 746097)
    Move TPM modules to modules-extra

 config-generic |    2 +-
 kernel.spec    |    4 ++++
 mod-extra.list |    4 ++++
 3 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/config-generic b/config-generic
index 0e9fc74..9326ba0 100644
--- a/config-generic
+++ b/config-generic
@@ -4492,7 +4492,7 @@ CONFIG_FCOE_FNIC=m
 
 CONFIG_NOP_USB_XCEIV=m
 
-CONFIG_IMA=y
+# CONFIG_IMA is not set
 CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_IMA_AUDIT=y
 CONFIG_IMA_LSM_RULES=y
diff --git a/kernel.spec b/kernel.spec
index f04c040..3a241f5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2230,6 +2230,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Dec 19 2011 Dave Jones <davej at redhat.com>
+- Disable IMA. (Forces TPM on, which may be undesirable: See 733964, 746097)
+  Move TPM modules to modules-extra
+
 * Mon Dec 19 2011 Dave Jones <davej at redhat.com> - 3.2.0-0.rc6.git1.1
 - Linux 3.2-rc6-git1 (390f998509bf049019df0b078c0a6606e0d57fb4)
 
diff --git a/mod-extra.list b/mod-extra.list
index 68d9dbf..9311d64 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -194,3 +194,7 @@ ma600-sir.ko
 mcp2120-sir.ko
 toim3232-sir.ko
 pps_core.ko
+tpm_atmel
+tpm_infineon
+tpm_nsc
+tpm_tis