diff options
| -rw-r--r-- | config-x86-32-generic | 2 | ||||
| -rw-r--r-- | config-x86-generic | 2 | ||||
| -rw-r--r-- | config-x86_64-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic index 65d68f8dc..0e9b3f4be 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -96,6 +96,8 @@ CONFIG_X86_TRAMPOLINE=y CONFIG_PCI_DIRECT=y +# CONFIG_TRANSPARENT_HUGEPAGE is not set + # SHPC has half-arsed PCI probing, which makes it load on too many systems # CONFIG_HOTPLUG_PCI_SHPC is not set diff --git a/config-x86-generic b/config-x86-generic index 8d2639154..e8335a2f0 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -392,8 +392,6 @@ CONFIG_X86_RESERVE_LOW=64 CONFIG_PCH_GBE=m CONFIG_PCH_PHUB=m -CONFIG_TRANSPARENT_HUGEPAGE=y - CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_SERPENT_SSE2_586=m diff --git a/config-x86_64-generic b/config-x86_64-generic index e10d7858d..bcea67e2a 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -29,6 +29,8 @@ CONFIG_AMD_IOMMU_V2=m CONFIG_SWIOTLB=y # CONFIG_CALGARY_IOMMU is not set +CONFIG_TRANSPARENT_HUGEPAGE=y + CONFIG_KEXEC_JUMP=y CONFIG_ACPI_BLACKLIST_YEAR=0 diff --git a/kernel.spec b/kernel.spec index 6c1a8c69b..082c43383 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2313,6 +2313,9 @@ fi # ||----w | # || || %changelog +* Fri Jan 25 2013 Justin M. Forbes <jforbes@redhat.com> +- Turn off THP for 32bit + * Fri Jan 25 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc4.git5.1 - Linux v3.8-rc4-277-g66e2d3e - Enable slub debug |