Change maximum CPU support for x86-64.
Rawhide builds now use MAXSMP on x86. For release builds, set x86-64 to support 64 CPUs. If larger systems become widespread, we can increase in an update.
This commit is contained in:
parent
96efdd9553
commit
d283b6f1bb
2
Makefile
2
Makefile
@ -98,7 +98,7 @@ debug:
|
|||||||
@# just in case we're going from extremedebug -> debug
|
@# just in case we're going from extremedebug -> debug
|
||||||
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
|
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
|
||||||
|
|
||||||
@perl -pi -e 's/CONFIG_NR_CPUS=256/CONFIG_NR_CPUS=512/' config-x86_64-generic
|
@perl -pi -e 's/# CONFIG_MAXSMP is not set/CONFIG_MAXSMP=y/' config-x86-generic
|
||||||
|
|
||||||
# Try out UAS in rawhide builds.
|
# Try out UAS in rawhide builds.
|
||||||
@perl -pi -e 's/# CONFIG_USB_UAS is not set/CONFIG_USB_UAS=m/' config-generic
|
@perl -pi -e 's/# CONFIG_USB_UAS is not set/CONFIG_USB_UAS=m/' config-generic
|
||||||
|
@ -75,6 +75,7 @@ config-release:
|
|||||||
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
|
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
|
||||||
|
|
||||||
# Change defaults back to sane things.
|
# Change defaults back to sane things.
|
||||||
@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=256/' config-x86_64-generic
|
@perl -pi -e 's/CONFIG_MAXSMP=y/# CONFIG_MAXSMP is not set/' config-x86-generic
|
||||||
|
|
||||||
# Disable UAS for release until it's ready.
|
# Disable UAS for release until it's ready.
|
||||||
@perl -pi -e 's/CONFIG_USB_UAS=m/# CONFIG_USB_UAS is not set/' config-generic
|
@perl -pi -e 's/CONFIG_USB_UAS=m/# CONFIG_USB_UAS is not set/' config-generic
|
||||||
|
@ -307,7 +307,7 @@ CONFIG_STRICT_DEVMEM=y
|
|||||||
# CONFIG_NO_BOOTMEM is not set
|
# CONFIG_NO_BOOTMEM is not set
|
||||||
|
|
||||||
# CONFIG_MEMTEST is not set
|
# CONFIG_MEMTEST is not set
|
||||||
# CONFIG_MAXSMP is not set
|
CONFIG_MAXSMP=y
|
||||||
|
|
||||||
|
|
||||||
CONFIG_HP_ILO=m
|
CONFIG_HP_ILO=m
|
||||||
|
@ -12,7 +12,7 @@ CONFIG_AMD_NUMA=y
|
|||||||
CONFIG_X86_64_ACPI_NUMA=y
|
CONFIG_X86_64_ACPI_NUMA=y
|
||||||
# CONFIG_NUMA_EMU is not set
|
# CONFIG_NUMA_EMU is not set
|
||||||
|
|
||||||
CONFIG_NR_CPUS=512
|
CONFIG_NR_CPUS=64
|
||||||
CONFIG_PHYSICAL_START=0x1000000
|
CONFIG_PHYSICAL_START=0x1000000
|
||||||
|
|
||||||
CONFIG_IA32_EMULATION=y
|
CONFIG_IA32_EMULATION=y
|
||||||
|
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
|||||||
# For non-released -rc kernels, this will be appended after the rcX and
|
# For non-released -rc kernels, this will be appended after the rcX and
|
||||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||||
#
|
#
|
||||||
%global baserelease 5
|
%global baserelease 6
|
||||||
%global fedora_build %{baserelease}
|
%global fedora_build %{baserelease}
|
||||||
|
|
||||||
# base_sublevel is the kernel version we're starting with and patching
|
# base_sublevel is the kernel version we're starting with and patching
|
||||||
@ -2322,6 +2322,11 @@ fi
|
|||||||
# ||----w |
|
# ||----w |
|
||||||
# || ||
|
# || ||
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 17 2012 Dave Jones <davej@redhat.com>
|
||||||
|
- Rawhide builds now use MAXSMP on x86.
|
||||||
|
- For release builds, set x86-64 to support 64 CPUs.
|
||||||
|
If larger systems become widespread, we can increase in an update.
|
||||||
|
|
||||||
* Tue Jan 17 2012 Dave Jones <davej@redhat.com> 3.2.1-5
|
* Tue Jan 17 2012 Dave Jones <davej@redhat.com> 3.2.1-5
|
||||||
- Give KMEMLEAK a try again.
|
- Give KMEMLEAK a try again.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user