diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-01-25 19:46:27 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-01-25 19:48:45 -0500 |
| commit | 77886ddffa3c28b3f69c9005818b04c26c87581a (patch) | |
| tree | 9e1b85a2f9ed81d27cb1caef112f158d8c35cd49 | |
| parent | 84056ee1b86b6b8a96e32e54acf287912ada63df (diff) | |
| download | kernel-77886ddffa3c28b3f69c9005818b04c26c87581a.tar.gz kernel-77886ddffa3c28b3f69c9005818b04c26c87581a.tar.xz kernel-77886ddffa3c28b3f69c9005818b04c26c87581a.zip | |
[x86] disable TRANSPARENT_HUGEPAGEs
| -rw-r--r-- | config-x86-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic index d6feae847..f45da91dd 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -534,7 +534,7 @@ CONFIG_JUMP_LABEL=y CONFIG_X86_32_IRIS=m -CONFIG_TRANSPARENT_HUGEPAGE=y +# CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_CRYPTO_AES_NI_INTEL=m diff --git a/kernel.spec b/kernel.spec index e5572b90f..7a5192cdb 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -1955,6 +1955,9 @@ fi # ||----w | # || || %changelog +* Tue Jan 25 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git3.2 +- [x86] Disable TRANSPARENT_HUGEPAGE for now, there be dragons there. + * Tue Jan 25 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git3.1 - Linux 2.6.38-rc2-git3 - perf-gcc460-build-fixes.patch: fix context from [9486aa38] |