Messages in this thread Patch in this message |  | | Date | Wed, 19 Sep 2001 16:22:39 +1000 | From | Keith Owens <> | Subject | [patch] 2.4.10-pre12 |
| |
sysrq.c has incorrect definition of wakeup_bdflush(). nmi.c is missing definition of show_registers().
Index: 10-pre12.1/drivers/char/sysrq.c --- 10-pre12.1/drivers/char/sysrq.c Wed, 19 Sep 2001 14:59:20 +1000 kaos (linux-2.4/a/c/50_sysrq.c 1.2.2.2 644) +++ 10-pre12.1(w)/drivers/char/sysrq.c Wed, 19 Sep 2001 16:09:28 +1000 kaos (linux-2.4/a/c/50_sysrq.c 1.2.2.2 644) @@ -32,7 +32,6 @@ #include <asm/ptrace.h> -extern void wakeup_bdflush(int); extern void reset_vc(unsigned int); extern struct list_head super_blocks; @@ -221,7 +220,7 @@ void do_emergency_sync(void) { static void sysrq_handle_sync(int key, struct pt_regs *pt_regs, struct kbd_struct *kbd, struct tty_struct *tty) { emergency_sync_scheduled = EMERG_SYNC; - wakeup_bdflush(0); + wakeup_bdflush(); } static struct sysrq_key_op sysrq_sync_op = { handler: sysrq_handle_sync, @@ -232,7 +231,7 @@ static struct sysrq_key_op sysrq_sync_op static void sysrq_handle_mountro(int key, struct pt_regs *pt_regs, struct kbd_struct *kbd, struct tty_struct *tty) { emergency_sync_scheduled = EMERG_REMOUNT; - wakeup_bdflush(0); + wakeup_bdflush(); } static struct sysrq_key_op sysrq_mountro_op = { handler: sysrq_handle_mountro, Index: 10-pre12.1/arch/i386/kernel/nmi.c --- 10-pre12.1/arch/i386/kernel/nmi.c Wed, 19 Sep 2001 14:59:20 +1000 kaos (linux-2.4/o/f/18_nmi.c 1.1 644) +++ 10-pre12.1(w)/arch/i386/kernel/nmi.c Wed, 19 Sep 2001 16:08:33 +1000 kaos (linux-2.4/o/f/18_nmi.c 1.1 644) @@ -27,6 +27,7 @@ unsigned int nmi_watchdog = NMI_NONE; static unsigned int nmi_hz = HZ; unsigned int nmi_perfctr_msr; /* the MSR to reset in NMI handler */ +extern void show_registers(struct pt_regs *regs); #define K7_EVNTSEL_ENABLE (1 << 22) #define K7_EVNTSEL_INT (1 << 20) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |