diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-04-08 21:39:40 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-04-08 21:39:40 +0200 |
commit | 5075a717af4e35862f39cc1cad72ca1e421680c2 (patch) | |
tree | 9ba9f4acc9133c563ef4190718ad61122a6c780c /debian/patches/60_bigmem.patch | |
parent | cfa05583bc8ddc3fc341c4844d60286c97f0ab93 (diff) | |
parent | 38fbe1570b276f5e9acc1234532232034951e110 (diff) |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
Diffstat (limited to 'debian/patches/60_bigmem.patch')
-rw-r--r-- | debian/patches/60_bigmem.patch | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/debian/patches/60_bigmem.patch b/debian/patches/60_bigmem.patch index cdf6468..737a178 100644 --- a/debian/patches/60_bigmem.patch +++ b/debian/patches/60_bigmem.patch @@ -30,22 +30,15 @@ Index: gnumach/i386/i386/vm_param.h =================================================================== --- gnumach.orig/i386/i386/vm_param.h 2012-06-10 23:45:02.000000000 +0200 +++ gnumach/i386/i386/vm_param.h 2012-07-14 15:57:44.559495669 +0200 -@@ -31,13 +31,13 @@ - - /* The kernel address space is usually 1GB, usually starting at virtual address 0. */ - #ifdef MACH_XEN --#define VM_MIN_KERNEL_ADDRESS 0xC0000000UL -+#define VM_MIN_KERNEL_ADDRESS 0x80000000UL - #define INIT_VM_MIN_KERNEL_ADDRESS VM_MIN_KERNEL_ADDRESS - #else /* MACH_XEN */ +@@ -31,7 +31,7 @@ /* This can be changed freely to separate kernel addresses from user addresses * for better trace support in kdb; the _START symbol has to be offset by the * same amount. */ -#define VM_MIN_KERNEL_ADDRESS 0xC0000000UL +#define VM_MIN_KERNEL_ADDRESS 0x80000000UL - /* This must remain 0 */ - #define INIT_VM_MIN_KERNEL_ADDRESS 0x00000000UL - #endif /* MACH_XEN */ + + #ifdef MACH_XEN + /* PV kernels can be loaded directly to the target virtual address */ Index: gnumach/i386/xen/Makefrag.am =================================================================== --- gnumach.orig/i386/xen/Makefrag.am 2012-07-14 15:58:19.998781083 +0200 |