Re: pre12 fails to compile: wakeup_bdflush issues

ddkilzer@theracingworld.com
Mon, 24 Sep 2001 01:37:30 -0500


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

Dave

--- drivers/char/sysrq.c.orig Sun Sep 23 17:24:55 2001
+++ drivers/char/sysrq.c Mon Sep 24 01:11:07 2001
@@ -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,

On Thu, Sep 20, 2001 at 13:30:37 EST, David S. Miller wrote:

> From: Ben Greear <greearb@candelatech.com>
> 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:
>
> --- drivers/char/sysrq.c.~1~ Wed Sep 19 14:30:53 2001
> +++ drivers/char/sysrq.c Thu Sep 20 11:29:30 2001
> @@ -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;
>

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