[Xen-changelog] Frob the Linux-2.6 configs to enable PAE (HIGHMEM_64G) if XEN_TARGET_X86_PAE=y

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 4c52791a04445a906e1b191c128d8660bd3fd918
# Parent  2333f6616d184251753b052b8bf0e05b81cc2d42

Frob the Linux-2.6 configs to enable PAE (HIGHMEM_64G) if XEN_TARGET_X86_PAE=y 

Signed-off-by: ian@xxxxxxxxxxxxx

diff -r 2333f6616d18 -r 4c52791a0444 buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk     Tue Jul 26 18:41:39 2005
+++ b/buildconfigs/Rules.mk     Wed Jul 27 00:27:36 2005
@@ -111,5 +111,12 @@
 %-mrproper-extra:
        @: # do nothing
 
+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
+       @: # do nothing yet
+endif
+
 # never delete any intermediate files.
 .SECONDARY:
diff -r 2333f6616d18 -r 4c52791a0444 buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen     Tue Jul 26 18:41:39 2005
+++ b/buildconfigs/mk.linux-2.6-xen     Wed Jul 27 00:27:36 2005
@@ -32,6 +32,8 @@
          cp 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) 
$(LINUX_DIR)/.config \
          || cp 
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
                $(LINUX_DIR)/.config
+       # See if we need to munge config to enable PAE
+       $(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk 
config-update-pae
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
          sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
diff -r 2333f6616d18 -r 4c52791a0444 buildconfigs/mk.linux-2.6-xen0
--- a/buildconfigs/mk.linux-2.6-xen0    Tue Jul 26 18:41:39 2005
+++ b/buildconfigs/mk.linux-2.6-xen0    Wed Jul 27 00:27:36 2005
@@ -32,6 +32,8 @@
          cp 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) 
$(LINUX_DIR)/.config \
          || cp 
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
                $(LINUX_DIR)/.config
+       # See if we need to munge config to enable PAE
+       $(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk 
config-update-pae
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
          sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
diff -r 2333f6616d18 -r 4c52791a0444 buildconfigs/mk.linux-2.6-xenU
--- a/buildconfigs/mk.linux-2.6-xenU    Tue Jul 26 18:41:39 2005
+++ b/buildconfigs/mk.linux-2.6-xenU    Wed Jul 27 00:27:36 2005
@@ -32,6 +32,8 @@
          cp 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) 
$(LINUX_DIR)/.config \
          || cp 
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
                $(LINUX_DIR)/.config
+       # See if we need to munge config to enable PAE
+       $(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk 
config-update-pae
        # Patch kernel Makefile to set EXTRAVERSION
        ( cd $(LINUX_DIR) ; \
          sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog