aboutsummaryrefslogtreecommitdiffstats
path: root/buildconfigs/Rules.mk
diff options
context:
space:
mode:
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-08-03 08:52:28 +0000
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-08-03 08:52:28 +0000
commit2304d1d14419564b76b4e57e80ec0ac6bb66f191 (patch)
tree4f3bd32d992c7cdf4bc0e7964c108a9ceff61f45 /buildconfigs/Rules.mk
parente0c4ddb3965edb5f421d911b81dcb90968919ab9 (diff)
downloadxen-2304d1d14419564b76b4e57e80ec0ac6bb66f191.tar.gz
xen-2304d1d14419564b76b4e57e80ec0ac6bb66f191.tar.bz2
xen-2304d1d14419564b76b4e57e80ec0ac6bb66f191.zip
Fix automatic toggling of PAE in Linux config files
Signed-off-by: ian@xensource.com
Diffstat (limited to 'buildconfigs/Rules.mk')
-rw-r--r--buildconfigs/Rules.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index 97831bdfb0..f259822b5f 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -115,7 +115,7 @@ config-update-pae:
ifeq ($(XEN_TARGET_X86_PAE),y)
sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE)
else
- grep '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE)
+ grep '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true
endif
# never delete any intermediate files.