Skip to contentSkip to conversation

2.4.10-pre12

PATCH New Keith Owens 1 participant 1 message Sep 19, 2001 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

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) renamed from 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) +2 -3
@@ -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

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) renamed from 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) +1 -0
@@ -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)