Skip to contentSkip to conversation

pre12 fails to compile: wakeup_bdflush issues

DISCUSSION Ben Greear 3 participants 3 messages Sep 20, 2001 – Sep 24, 2001

lore
Share & tools
lore

Ben Greear

author
#0 lore raw

I used the .config from RH's roswell beta.

I get this error:

sysrq.c:35: conflicting types for 'wakeup_bdflush' /root/linux/include/linux/fs.h:1347: previous declaration of 'wakeup_bdflush'

One says it takes a void argument, the other an int......

Ben

Signature · 3 lines
Ben Greear <[email protected]>          <[email protected]>
President of Candela Technologies Inc      http://www.candelatech.com
ScryMUD:  http://scry.wanfear.com     http://scry.wanfear.com/~greear
#1 lore raw

From: Ben Greear <[email protected]>
Date: Thu, 20 Sep 2001 10:47:20 -0700

I get this error:

sysrq.c:35: conflicting types for 'wakeup_bdflush' /root/linux/include/linux/fs.h:1347: previous declaration of 'wakeup_bdflush'

One says it takes a void argument, the other an int......

The fix is simple:

char/sysrq.c renamed from char/sysrq.c.~1~ +0 -1
@@ -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;
 
#2 lore raw
In reply to Ben Greear

What about the other two calls to wakeup_bdflush(0) in drivers/char/sysrq.c? Should they be fixed using the patch below?

Dave

char/sysrq.c renamed from char/sysrq.c.orig +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 @@
 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 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,
Quoted 22 lines · David S. Miller

From: Ben Greear <[email protected]>
Date: Thu, 20 Sep 2001 10:47:20 -0700

I get this error:

sysrq.c:35: conflicting types for 'wakeup_bdflush' /root/linux/include/linux/fs.h:1347: previous declaration of 'wakeup_bdflush'

One says it takes a void argument, the other an int......

The fix is simple:

char/sysrq.c Thu Sep 20 11:29:30 2001 renamed from char/sysrq.c.~1~ Wed Sep 19 14:30:53 2001 +0 -1
@@ -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;