[SCM] Debian GNU Mach packaging branch, master, updated. debian/2%1.3.99.dfsg.git20120219-1-48-g2fced06

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 5483e0baa8b104d5b2c59cf86cbd1b9ef95803e4
Author: Samuel Thibault <address@hidden>
Date:   Sat May 5 13:39:51 2012 +0200

    Refresh patches
    
      * patches/50_initrd.patch: Refresh.
      * patches/60_bigmem.patch: Also update the kernel/user addresses limit.

diff --git a/debian/changelog b/debian/changelog
index 9014963..58083d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ gnumach (2:1.3.99.dfsg.git20120505-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
   * control: Bump Standards-Version to 3.9.3 (no changes).
+  * patches/50_initrd.patch: Refresh.
+  * patches/60_bigmem.patch: Also update the kernel/user addresses limit.
 
  -- Samuel Thibault <address@hidden>  Sat, 05 May 2012 13:22:36 +0200
 
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 */

-- 
Debian GNU Mach packaging