diff options
author | 2007-10-10 20:56:59 +0000 | |
---|---|---|
committer | 2007-10-10 20:56:59 +0000 | |
commit | add9038e8cd4d9b005d6d249ee30c529fd520ac8 (patch) | |
tree | c5c825cf64fc4bfbbc640729d95a2359bfa042fa | |
parent | Merge update two Debian patches (diff) | |
download | xen-add9038e8cd4d9b005d6d249ee30c529fd520ac8.tar.gz xen-add9038e8cd4d9b005d6d249ee30c529fd520ac8.tar.bz2 xen-add9038e8cd4d9b005d6d249ee30c529fd520ac8.zip |
Disable CONFIG_HIGHPTE when XEN support is enabled
svn path=/patches/; revision=49
-rw-r--r-- | trunk/2.6.18/00000_README | 3 | ||||
-rw-r--r-- | trunk/2.6.18/50007_disable-highpte.patch | 13 | ||||
-rw-r--r-- | trunk/2.6.20/00000_README | 4 | ||||
-rw-r--r-- | trunk/2.6.20/50007_disable-highpte.patch | 13 |
4 files changed, 33 insertions, 0 deletions
diff --git a/trunk/2.6.18/00000_README b/trunk/2.6.18/00000_README index 7f99598..6c84c68 100644 --- a/trunk/2.6.18/00000_README +++ b/trunk/2.6.18/00000_README @@ -217,3 +217,6 @@ Patches Compile fix for non-SMP (UP) kernels. Since UP support is broken in upstream Xen I'm not sure if I trust it or not. :-P +50007_disable-highpte.patch + CONFIG_HIGHPTE can cause serious problems so lets save people's + sanity, avoid killing kittens, and end all war by disabling it. diff --git a/trunk/2.6.18/50007_disable-highpte.patch b/trunk/2.6.18/50007_disable-highpte.patch new file mode 100644 index 0000000..3d829fc --- /dev/null +++ b/trunk/2.6.18/50007_disable-highpte.patch @@ -0,0 +1,13 @@ +Index: linux-2.6.18/arch/i386/Kconfig +=================================================================== +--- linux-2.6.18.orig/arch/i386/Kconfig ++++ linux-2.6.18/arch/i386/Kconfig +@@ -624,7 +624,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID + + config HIGHPTE + bool "Allocate 3rd-level pagetables from highmem" +- depends on HIGHMEM4G || HIGHMEM64G ++ depends on ( HIGHMEM4G || HIGHMEM64G ) && !X86_XEN + help + The VM uses one page table entry for each page of physical memory. + For systems with a lot of RAM, this can be wasteful of precious diff --git a/trunk/2.6.20/00000_README b/trunk/2.6.20/00000_README index 63ec415..c54dae7 100644 --- a/trunk/2.6.20/00000_README +++ b/trunk/2.6.20/00000_README @@ -42,3 +42,7 @@ Patches 50006_pgetable-build-fix.patch Fix a function re-definition error when PAE is not enabled. + +50007_disable-highpte.patch + CONFIG_HIGHPTE can cause serious problems so lets save people's + sanity, avoid killing kittens, and end all war by disabling it. diff --git a/trunk/2.6.20/50007_disable-highpte.patch b/trunk/2.6.20/50007_disable-highpte.patch new file mode 100644 index 0000000..3d829fc --- /dev/null +++ b/trunk/2.6.20/50007_disable-highpte.patch @@ -0,0 +1,13 @@ +Index: linux-2.6.18/arch/i386/Kconfig +=================================================================== +--- linux-2.6.18.orig/arch/i386/Kconfig ++++ linux-2.6.18/arch/i386/Kconfig +@@ -624,7 +624,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID + + config HIGHPTE + bool "Allocate 3rd-level pagetables from highmem" +- depends on HIGHMEM4G || HIGHMEM64G ++ depends on ( HIGHMEM4G || HIGHMEM64G ) && !X86_XEN + help + The VM uses one page table entry for each page of physical memory. + For systems with a lot of RAM, this can be wasteful of precious |