diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-03-29 20:31:13 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-03-29 20:31:13 -0400 |
| commit | 5db0b2d98ff6e08eac65cc509c51ca8940420b92 (patch) | |
| tree | 2b0694a90261dd58a2a445997ea8ed62ea6bf28f | |
| parent | f80257e0479c02970d5ddadfe59157fac8526c40 (diff) | |
| download | kernel-5db0b2d98ff6e08eac65cc509c51ca8940420b92.tar.gz kernel-5db0b2d98ff6e08eac65cc509c51ca8940420b92.tar.xz kernel-5db0b2d98ff6e08eac65cc509c51ca8940420b92.zip | |
disable tpm/ima on ppc
| -rw-r--r-- | config-powerpc-generic | 3 | ||||
| -rw-r--r-- | config-powerpc32-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/config-powerpc-generic b/config-powerpc-generic index 228d2ecac..05b9a4a3c 100644 --- a/config-powerpc-generic +++ b/config-powerpc-generic @@ -342,3 +342,6 @@ CONFIG_MPC512X_DMA=m CONFIG_KVM_GUEST=y CONFIG_I2C_MPC=m + +# CONFIG_IMA is not set +# CONFIG_TCG_TPM is not set diff --git a/config-powerpc32-generic b/config-powerpc32-generic index 909d38917..07c060cf1 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 145822f4d..8e82f9164 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1942,6 +1942,9 @@ fi %changelog * Tue Mar 29 2011 Kyle McMartin <kmcmartin@redhat.com> +- Disable CONFIG_IMA, CONFIG_TCG_TPM on powerpc (#689468) + +* Tue Mar 29 2011 Kyle McMartin <kmcmartin@redhat.com> - Disable qla4xxx (CONFIG_SCSI_QLA_ISCSI) driver on powerpc32 (#686199) * Tue Mar 29 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc1.git0.0 |