diff options
| author | Dave Jones <davej@redhat.com> | 2011-09-20 17:13:44 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-09-20 17:13:44 -0400 |
| commit | 8674cb1bd896989a4b1b3c67a7831fc33141363b (patch) | |
| tree | 9a9c84d56a746c6dc64f2d847f813c4322317492 | |
| parent | 90ed75b4f7f7307ae77253facb001d2425073df7 (diff) | |
| download | kernel-8674cb1bd896989a4b1b3c67a7831fc33141363b.tar.gz kernel-8674cb1bd896989a4b1b3c67a7831fc33141363b.tar.xz kernel-8674cb1bd896989a4b1b3c67a7831fc33141363b.zip | |
Limit 32-bit x86 kernels to 32 processors.
| -rw-r--r-- | config-x86-32-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic index f42d60da6..caeae9398 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -28,7 +28,7 @@ CONFIG_M686=y # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set -CONFIG_NR_CPUS=64 +CONFIG_NR_CPUS=32 CONFIG_X86_GENERIC=y # CONFIG_X86_PPRO_FENCE is not set diff --git a/kernel.spec b/kernel.spec index 0430ab674..a3db79f06 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2067,6 +2067,9 @@ fi # ||----w | # || || %changelog +* Tue Sep 20 2011 Dave Jones <davej@redhat.com> +- Limit 32-bit x86 kernels to 32 processors. + * Mon Sep 19 2011 Dave Jones <davej@redhat.com> - Merge some improvements to the 32bit mmap randomisation from Kees Cook. |