diff options
author | Guillem Jover <guillem@debian.org> | 2009-11-14 04:59:57 +0000 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2009-11-14 04:59:57 +0000 |
commit | a1e4c67baf141ced8255e8729d09e480af0a19e8 (patch) | |
tree | 70cb039a9c55e8619cfa5f21a8e39bea75d01935 /debian/patches/05_halt_on_panic_flag.patch | |
parent | 592f6c450e2515c818e4cbe152321ebf56772d3f (diff) |
New upstream git snapshot
Update debian/copyright to point to the git repository.
Sync with upstream:
- debian/patches/14_alloc_params.patch: Remove, merged upstream.
- debian/patches/16_ide_multsect.patch: Likewise.
- debian/patches/05_halt_on_panic_flag.patch: Refresh.
Diffstat (limited to 'debian/patches/05_halt_on_panic_flag.patch')
-rw-r--r-- | debian/patches/05_halt_on_panic_flag.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/debian/patches/05_halt_on_panic_flag.patch b/debian/patches/05_halt_on_panic_flag.patch index b14101f..5c4555b 100644 --- a/debian/patches/05_halt_on_panic_flag.patch +++ b/debian/patches/05_halt_on_panic_flag.patch @@ -7,8 +7,11 @@ argument. -Index: b/i386/i386at/model_dep.c -=================================================================== +--- + i386/i386at/model_dep.c | 9 +++++++++ + kern/debug.c | 6 +++++- + 2 files changed, 14 insertions(+), 1 deletion(-) + --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -110,6 +110,10 @@ void inittodr(); /* forward */ @@ -22,7 +25,7 @@ Index: b/i386/i386at/model_dep.c /* XX interrupt stack pointer and highwater mark, for locore.S. */ vm_offset_t int_stack_top, int_stack_high; -@@ -394,6 +398,11 @@ void c_boot_entry(vm_offset_t bi) +@@ -434,6 +438,11 @@ void c_boot_entry(vm_offset_t bi) cninit(); /* need console for debugger */ Debugger("init"); } @@ -34,8 +37,6 @@ Index: b/i386/i386at/model_dep.c #endif /* MACH_KDB */ machine_slot[0].is_cpu = TRUE; -Index: b/kern/debug.c -=================================================================== --- a/kern/debug.c +++ b/kern/debug.c @@ -126,6 +126,10 @@ panic_init(void) |