[PATCH] usb/serial/generic: Fix compile error

[PATCH] usb/serial/generic: Fix compile error

[Javier Martinez Canillas]

usb/serial/generic.c gives me a compile error when CONFIG_MAGIC_SYSRQ is
not defined.

The problem is that usb_serial_handle_sysrq_char() calls handle_sysrq()
that only is defined if CONFIG_MAGIC_SYSRQ is defined.

This patch add an empty handle_sysrq inline function if
CONFIG_MAGIC_SYSRQ is not defined and generic.c compiles cleanly.

From 9c484ab9136f25bf55b7664116a5f3b78eae69dc Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <martinez.javier@gmail.com>
Date: Sun, 11 Apr 2010 11:14:22 -0400
Subject: [PATCH] usb/serial/generic: Fix compile error


Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
 include/linux/sysrq.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
index 5f2bdef..0b754c1 100644
--- a/include/linux/sysrq.h
+++ b/include/linux/sysrq.h
@@ -53,6 +53,11 @@ int sysrq_toggle_support(int enable_mask);
 
 #else
 
+static inline void handle_sysrq(int key, struct tty_struct *tty)
+{
+
+}
+
 static inline int register_sysrq_key(int key, struct sysrq_key_op *op)
 {
 	return -EINVAL;
-- 
1.6.0.4

Re: [PATCH] usb/serial/generic: Fix compile error

[Dmitry Torokhov]

Hi Javier,

On Sun, Apr 11, 2010 at 11:29:02AM -0400, Javier Martinez Canillas wrote:
> usb/serial/generic.c gives me a compile error when CONFIG_MAGIC_SYSRQ is
> not defined.
> 
> The problem is that usb_serial_handle_sysrq_char() calls handle_sysrq()
> that only is defined if CONFIG_MAGIC_SYSRQ is defined.
> 
> This patch add an empty handle_sysrq inline function if
> CONFIG_MAGIC_SYSRQ is not defined and generic.c compiles cleanly.
> 

Thanks for the patch. I will fold it into the one where I managed to
loose the static inline if you do not mind.

-- 
Dmitry

Re: [PATCH] usb/serial/generic: Fix compile error

[Javier Martinez Canillas]

On Sun, Apr 11, 2010 at 11:04 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
>
> Thanks for the patch. I will fold it into the one where I managed to
> loose the static inline if you do not mind.
>
> --

I don't mind, it's ok for me.
Thank you very much for the quick answer.

Best regards,

-----------------------------------------
Javier Martínez Canillas
+595 981 88 66 58
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] usb/serial/generic: Fix compile error

[Randy Dunlap]

On Sun, 11 Apr 2010 20:04:46 -0700 Dmitry Torokhov wrote:

> Hi Javier,
> 
> On Sun, Apr 11, 2010 at 11:29:02AM -0400, Javier Martinez Canillas wrote:
> > usb/serial/generic.c gives me a compile error when CONFIG_MAGIC_SYSRQ is
> > not defined.
> > 
> > The problem is that usb_serial_handle_sysrq_char() calls handle_sysrq()
> > that only is defined if CONFIG_MAGIC_SYSRQ is defined.
> > 
> > This patch add an empty handle_sysrq inline function if
> > CONFIG_MAGIC_SYSRQ is not defined and generic.c compiles cleanly.
> > 
> 
> Thanks for the patch. I will fold it into the one where I managed to
> loose the static inline if you do not mind.

can we get this patch into linux-next also, please?
It still fails in 2 places when MAGIC_SYSRQ is disabled.

---
~Randy

Re: [PATCH] usb/serial/generic: Fix compile error

[Dmitry Torokhov]

On Wed, Apr 14, 2010 at 08:45:19AM -0700, Randy Dunlap wrote:
> On Sun, 11 Apr 2010 20:04:46 -0700 Dmitry Torokhov wrote:
> 
> > Hi Javier,
> > 
> > On Sun, Apr 11, 2010 at 11:29:02AM -0400, Javier Martinez Canillas wrote:
> > > usb/serial/generic.c gives me a compile error when CONFIG_MAGIC_SYSRQ is
> > > not defined.
> > > 
> > > The problem is that usb_serial_handle_sysrq_char() calls handle_sysrq()
> > > that only is defined if CONFIG_MAGIC_SYSRQ is defined.
> > > 
> > > This patch add an empty handle_sysrq inline function if
> > > CONFIG_MAGIC_SYSRQ is not defined and generic.c compiles cleanly.
> > > 
> > 
> > Thanks for the patch. I will fold it into the one where I managed to
> > loose the static inline if you do not mind.
> 
> can we get this patch into linux-next also, please?
> It still fails in 2 places when MAGIC_SYSRQ is disabled.
> 

Should be there...

-- 
Dmitry

Re: [PATCH] usb/serial/generic: Fix compile error

[Randy Dunlap]

On Wed, 14 Apr 2010 08:59:53 -0700 Dmitry Torokhov wrote:

> On Wed, Apr 14, 2010 at 08:45:19AM -0700, Randy Dunlap wrote:
> > On Sun, 11 Apr 2010 20:04:46 -0700 Dmitry Torokhov wrote:
> > 
> > > Hi Javier,
> > > 
> > > On Sun, Apr 11, 2010 at 11:29:02AM -0400, Javier Martinez Canillas wrote:
> > > > usb/serial/generic.c gives me a compile error when CONFIG_MAGIC_SYSRQ is
> > > > not defined.
> > > > 
> > > > The problem is that usb_serial_handle_sysrq_char() calls handle_sysrq()
> > > > that only is defined if CONFIG_MAGIC_SYSRQ is defined.
> > > > 
> > > > This patch add an empty handle_sysrq inline function if
> > > > CONFIG_MAGIC_SYSRQ is not defined and generic.c compiles cleanly.
> > > > 
> > > 
> > > Thanks for the patch. I will fold it into the one where I managed to
> > > loose the static inline if you do not mind.
> > 
> > can we get this patch into linux-next also, please?
> > It still fails in 2 places when MAGIC_SYSRQ is disabled.
> > 
> 
> Should be there...

It's not in linux-next-20100414.

---
~Randy

Re: [PATCH] usb/serial/generic: Fix compile error

[Dmitry Torokhov]

On Wed, Apr 14, 2010 at 09:07:40AM -0700, Randy Dunlap wrote:
> On Wed, 14 Apr 2010 08:59:53 -0700 Dmitry Torokhov wrote:
> 
> > On Wed, Apr 14, 2010 at 08:45:19AM -0700, Randy Dunlap wrote:
> > > On Sun, 11 Apr 2010 20:04:46 -0700 Dmitry Torokhov wrote:
> > > 
> > > > Hi Javier,
> > > > 
> > > > On Sun, Apr 11, 2010 at 11:29:02AM -0400, Javier Martinez Canillas wrote:
> > > > > usb/serial/generic.c gives me a compile error when CONFIG_MAGIC_SYSRQ is
> > > > > not defined.
> > > > > 
> > > > > The problem is that usb_serial_handle_sysrq_char() calls handle_sysrq()
> > > > > that only is defined if CONFIG_MAGIC_SYSRQ is defined.
> > > > > 
> > > > > This patch add an empty handle_sysrq inline function if
> > > > > CONFIG_MAGIC_SYSRQ is not defined and generic.c compiles cleanly.
> > > > > 
> > > > 
> > > > Thanks for the patch. I will fold it into the one where I managed to
> > > > loose the static inline if you do not mind.
> > > 
> > > can we get this patch into linux-next also, please?
> > > It still fails in 2 places when MAGIC_SYSRQ is disabled.
> > > 
> > 
> > Should be there...
> 
> It's not in linux-next-20100414.
> 

I see it in by 'next' branch, let's see if it shows up in the next next.

-- 
Dmitry