diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-05-05 13:39:51 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-05-05 13:39:51 +0200 |
| commit | be7e167f2538dd11e64daa789a9415d9fb33426c (patch) | |
| tree | 0e2fdb5eff5022c4913b4cb2cd0963bf21a21197 /debian/patches | |
| parent | a5cdbbf621630c8a928b45cbd67b1c7fc0e11469 (diff) | |
Refresh patches
* patches/50_initrd.patch: Refresh.
* patches/60_bigmem.patch: Also update the kernel/user addresses limit.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/50_initrd.patch | 10 | ||||
| -rw-r--r-- | debian/patches/60_bigmem.patch | 34 |
2 files changed, 35 insertions, 9 deletions
diff --git a/debian/patches/50_initrd.patch b/debian/patches/50_initrd.patch index affcb7f..3091996 100644 --- a/debian/patches/50_initrd.patch +++ b/debian/patches/50_initrd.patch @@ -45,7 +45,7 @@ Index: gnumach/kern/boot_script.c +/* Create an initial ramdisk */ +static int -+ramdisk_create (struct cmd *cmd, int *val) ++ramdisk_create (struct cmd *cmd, long *val) +{ + return boot_script_ramdisk_create (cmd, (char **) val); +} @@ -53,10 +53,10 @@ Index: gnumach/kern/boot_script.c /* List of builtin symbols. */ static struct sym builtin_symbols[] = { - { "task-create", VAL_FUNC, (int) create_task, VAL_TASK, 0 }, - { "task-resume", VAL_FUNC, (int) resume_task, VAL_NONE, 1 }, - { "prompt-task-resume", VAL_FUNC, (int) prompt_resume_task, VAL_NONE, 1 }, -+ { "ramdisk-create", VAL_FUNC, (int) ramdisk_create, VAL_STR, 0 }, + { "task-create", VAL_FUNC, (long) create_task, VAL_TASK, 0 }, + { "task-resume", VAL_FUNC, (long) resume_task, VAL_NONE, 1 }, + { "prompt-task-resume", VAL_FUNC, (long) prompt_resume_task, VAL_NONE, 1 }, ++ { "ramdisk-create", VAL_FUNC, (long) ramdisk_create, VAL_STR, 0 }, }; #define NUM_BUILTIN (sizeof (builtin_symbols) / sizeof (builtin_symbols[0])) diff --git a/debian/patches/60_bigmem.patch b/debian/patches/60_bigmem.patch index b0dd482..ca477b1 100644 --- a/debian/patches/60_bigmem.patch +++ b/debian/patches/60_bigmem.patch @@ -1,10 +1,10 @@ Push kernel/user limit to 2GiB, so Mach can address up to close to 2GiB memory. This makes glibc's local-bigmem.diff patch mandatory. -diff --git a/i386/include/mach/i386/vm_param.h b/i386/include/mach/i386/vm_param.h -index 6d7c5f3..839ae68 100644 ---- a/i386/include/mach/i386/vm_param.h -+++ b/i386/include/mach/i386/vm_param.h +Index: gnumach/i386/include/mach/i386/vm_param.h +=================================================================== +--- gnumach.orig/i386/include/mach/i386/vm_param.h 2012-05-05 11:22:08.295629763 +0000 ++++ gnumach/i386/include/mach/i386/vm_param.h 2012-05-05 11:25:25.955430280 +0000 @@ -73,6 +73,6 @@ with that. */ @@ -13,3 +13,29 @@ index 6d7c5f3..839ae68 100644 +#define VM_MAX_ADDRESS (0x80000000UL) #endif /* _MACH_I386_VM_PARAM_H_ */ +Index: gnumach/i386/Makefrag.am +=================================================================== +--- gnumach.orig/i386/Makefrag.am 2012-05-05 11:22:08.291629849 +0000 ++++ gnumach/i386/Makefrag.am 2012-05-05 11:26:22.262233815 +0000 +@@ -199,7 +199,7 @@ EXTRA_DIST += \ + i386/ldscript + if PLATFORM_at + gnumach_LINKFLAGS += \ +- --defsym _START=0xC0100000 \ ++ --defsym _START=0x80100000 \ + --defsym _START_MAP=0x100000 \ + -T '$(srcdir)'/i386/ldscript + endif +Index: gnumach/i386/i386/vm_param.h +=================================================================== +--- gnumach.orig/i386/i386/vm_param.h 2012-05-05 11:22:08.295629763 +0000 ++++ gnumach/i386/i386/vm_param.h 2012-05-05 11:27:42.380531253 +0000 +@@ -37,7 +37,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 */ |