summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2011-07-06 18:05:04 -0400
committerChuck Ebbert <cebbert@redhat.com>2011-07-06 18:05:04 -0400
commitc2cf2cf9902c9990cde5112782bb98bbafee420b (patch)
tree2f346bf348d9a403dae2eadcd4bd7f3d53311b87
parent4d4f51ed0dcc073e4d731c180d8315309792bce7 (diff)
downloadkernel-c2cf2cf9902c9990cde5112782bb98bbafee420b.tar.gz
kernel-c2cf2cf9902c9990cde5112782bb98bbafee420b.tar.xz
kernel-c2cf2cf9902c9990cde5112782bb98bbafee420b.zip
Set CONFIG_X86_RESERVE_LOW=640 as requested by mjg
-rw-r--r--config-x86-generic3
-rw-r--r--config-x86_64-generic3
-rw-r--r--kernel.spec3
3 files changed, 5 insertions, 4 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 79a63a880..437eed906 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -464,7 +464,7 @@ CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_X86_RESERVE_LOW=640
# CONFIG_CMDLINE_BOOL is not set
@@ -545,7 +545,6 @@ CONFIG_VIDEO_VIA_CAMERA=m
CONFIG_EDAC_MCE_INJ=m
CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_X86_RESERVE_LOW=64
CONFIG_PCH_GBE=m
CONFIG_PCH_PHUB=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index fe187a1bc..a633484ed 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -378,7 +378,7 @@ CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_X86_RESERVE_LOW=640
# CONFIG_CMDLINE_BOOL is not set
@@ -456,7 +456,6 @@ CONFIG_IDEAPAD_LAPTOP=m
CONFIG_EDAC_MCE_INJ=m
CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_X86_RESERVE_LOW=64
CONFIG_PCH_GBE=m
CONFIG_PCH_PHUB=m
diff --git a/kernel.spec b/kernel.spec
index dc927c670..943db3f03 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1878,6 +1878,9 @@ fi
# and build.
%changelog
+* Wed Jul 06 2011 Chuck Ebbert <cebbert@redhat.com>
+- Set CONFIG_X86_RESERVE_LOW=640 as requested by mjg
+
* Mon Jul 04 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc6.git0.1
- Linux 3.0-rc6
- [generic] SCSI_ISCI=m, because why not