diff options
| author |   Michael Marineau <marineam@gentoo.org> | 2007-09-05 23:16:09 +0000 |
|---|---|---|
| committer | Michael Marineau <marineam@gentoo.org> | 2007-09-05 23:16:09 +0000 |
| commit | 9bc5b4aa65db9f566873fdf416d433a49793cd14 (patch) | |
| tree | 443e1ab6cdfd473cf8676565a60045d900d75ef7 | |
| parent | Sync patchset with Red Hat's 2.6.20-2931.fc7 release. (diff) | |
| download | xen-9bc5b4aa65db9f566873fdf416d433a49793cd14.tar.gz xen-9bc5b4aa65db9f566873fdf416d433a49793cd14.tar.bz2 xen-9bc5b4aa65db9f566873fdf416d433a49793cd14.zip | |
Fix builds for non-PAE kernels and remove the compatibility note since it isn't true now
svn path=/patches/; revision=37
| -rw-r--r-- | trunk/2.6.20/50005_compatibility-config-note.patch | 13 | ||||
| -rw-r--r-- | trunk/2.6.20/50006_pgetable-build-fix.patch | 14 |
2 files changed, 14 insertions, 13 deletions
diff --git a/trunk/2.6.20/50005_compatibility-config-note.patch b/trunk/2.6.20/50005_compatibility-config-note.patch deleted file mode 100644 index a750d03..0000000 --- a/trunk/2.6.20/50005_compatibility-config-note.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: linux-2.6.20-xen-r2/drivers/xen/Kconfig -=================================================================== ---- linux-2.6.20-xen-r2.orig/drivers/xen/Kconfig -+++ linux-2.6.20-xen-r2/drivers/xen/Kconfig -@@ -228,7 +228,7 @@ choice - bool "3.0.2 and later" - - config XEN_COMPAT_LATEST_ONLY -- bool "no compatibility code" -+ bool "3.0.4 and later (no compatibility code)" - - endchoice - diff --git a/trunk/2.6.20/50006_pgetable-build-fix.patch b/trunk/2.6.20/50006_pgetable-build-fix.patch new file mode 100644 index 0000000..cb82906 --- /dev/null +++ b/trunk/2.6.20/50006_pgetable-build-fix.patch @@ -0,0 +1,14 @@ +Index: linux-2.6.20-xen-r3/include/asm/mach-xen/asm/pgtable-2level.h +=================================================================== +--- linux-2.6.20-xen-r3.orig/include/asm/mach-xen/asm/pgtable-2level.h ++++ linux-2.6.20-xen-r3/include/asm/mach-xen/asm/pgtable-2level.h +@@ -30,8 +30,7 @@ + + #define pte_none(x) (!(x).pte_low) + +-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR +-static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) ++static inline pte_t raw_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) + { + pte_t pte = *ptep; + if (!pte_none(pte)) { |