diff options
| author | Guillem Jover <guillem@debian.org> | 2006-04-02 13:13:38 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2006-04-02 13:13:38 +0000 |
| commit | 4f1d8bbdd8b402b3bc55e8a7633c53529b4d19d4 (patch) | |
| tree | d154cf251b3b78967f182b56823c1dc3ea306867 /debian/patches/05_halt_on_panic_flag.patch | |
| parent | 01c90e6fc5a25274c2f0f5bd920b73d072bb59dd (diff) | |
Sync with new upstream snapshot.
Diffstat (limited to 'debian/patches/05_halt_on_panic_flag.patch')
| -rw-r--r-- | debian/patches/05_halt_on_panic_flag.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/05_halt_on_panic_flag.patch b/debian/patches/05_halt_on_panic_flag.patch index 075af1a..6e38b37 100644 --- a/debian/patches/05_halt_on_panic_flag.patch +++ b/debian/patches/05_halt_on_panic_flag.patch @@ -11,7 +11,7 @@ --- i386/i386at/model_dep.c 2004-11-29 06:34:51.000000000 +0100 +++ i386/i386at/model_dep.c 2005-12-29 16:01:03.000000000 +0100 -@@ -108,6 +108,10 @@ +@@ -94,6 +94,10 @@ int rebootflag = 0; /* exported to kdintr */ @@ -22,7 +22,7 @@ /* XX interrupt stack pointer and highwater mark, for locore.S. */ vm_offset_t int_stack_top, int_stack_high; -@@ -366,6 +370,11 @@ +@@ -347,6 +351,11 @@ cninit(); /* need console for debugger */ Debugger(); } @@ -36,7 +36,7 @@ machine_slot[0].is_cpu = TRUE; --- kern/debug.c 2000-07-23 02:34:12.000000000 +0200 +++ kern/debug.c 2005-12-29 15:21:46.000000000 +0100 -@@ -121,6 +121,10 @@ +@@ -120,6 +120,10 @@ } } @@ -47,7 +47,7 @@ /*VARARGS1*/ void panic(const char *s, ...) -@@ -168,7 +172,7 @@ +@@ -161,7 +165,7 @@ #if MACH_KDB Debugger("panic"); #else |