public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
From: Javier Martinez Canillas <martinez.javier@gmail.com>
To: kernel-janitors@vger.kernel.org
Subject: [PATCH] usb/serial/generic: Fix compile error
Date: Sun, 11 Apr 2010 15:29:02 +0000	[thread overview]
Message-ID: <1270999742.11481.44.camel@lenovo> (raw)

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











             reply	other threads:[~2010-04-11 15:29 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-11 15:29 Javier Martinez Canillas [this message]
2010-04-12  3:04 ` [PATCH] usb/serial/generic: Fix compile error Dmitry Torokhov
2010-04-12  3:59 ` Javier Martinez Canillas
2010-04-14 15:45 ` Randy Dunlap
2010-04-14 15:59 ` Dmitry Torokhov
2010-04-14 16:07 ` Randy Dunlap
2010-04-14 16:24 ` Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1270999742.11481.44.camel@lenovo \
    --to=martinez.javier@gmail.com \
    --cc=kernel-janitors@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox