From: Yong Zhang <yong.zhang0@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, Jeff Dike <jdike@addtoit.com>,
Richard Weinberger <richard@nod.at>,
user-mode-linux-devel@lists.sourceforge.net,
user-mode-linux-user@lists.sourceforge.net
Subject: [PATCH 18/49] um: irq: Remove IRQF_DISABLED
Date: Sat, 22 Oct 2011 17:56:30 +0800 [thread overview]
Message-ID: <1319277421-9203-19-git-send-email-yong.zhang0@gmail.com> (raw)
In-Reply-To: <1319277421-9203-1-git-send-email-yong.zhang0@gmail.com>
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Richard Weinberger <richard@nod.at>
---
arch/um/drivers/line.c | 8 ++++----
arch/um/drivers/mconsole_kern.c | 2 +-
arch/um/drivers/net_kern.c | 2 +-
arch/um/drivers/port_kern.c | 4 ++--
arch/um/drivers/random.c | 2 +-
arch/um/drivers/ubd_kern.c | 2 +-
arch/um/drivers/xterm_kern.c | 2 +-
arch/um/kernel/sigio.c | 2 +-
arch/um/kernel/time.c | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 364c8a1..d38f475 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -347,8 +347,8 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
int err;
/*
- * Interrupts are disabled here because we registered the interrupt with
- * IRQF_DISABLED (see line_setup_irq).
+ * Interrupts are disabled here because genirq keep irqs disabled when
+ * calling the action handler.
*/
spin_lock(&line->lock);
@@ -371,7 +371,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
int line_setup_irq(int fd, int input, int output, struct line *line, void *data)
{
const struct line_driver *driver = line->driver;
- int err = 0, flags = IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM;
+ int err = 0, flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM;
if (input)
err = um_request_irq(driver->read_irq, fd, IRQ_READ,
@@ -807,7 +807,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty,
.stack = stack });
if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
- IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+ IRQF_SHARED | IRQF_SAMPLE_RANDOM,
"winch", winch) < 0) {
printk(KERN_ERR "register_winch_irq - failed to register "
"IRQ\n");
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index c70e047..e672bd6 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -773,7 +773,7 @@ static int __init mconsole_init(void)
register_reboot_notifier(&reboot_notifier);
err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,
- IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+ IRQF_SHARED | IRQF_SAMPLE_RANDOM,
"mconsole", (void *)sock);
if (err) {
printk(KERN_ERR "Failed to get IRQ for management console\n");
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index a492e59..46ffd65 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -161,7 +161,7 @@ static int uml_net_open(struct net_device *dev)
}
err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,
- IRQF_DISABLED | IRQF_SHARED, dev->name, dev);
+ IRQF_SHARED, dev->name, dev);
if (err != 0) {
printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);
err = -ENETUNREACH;
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index a11573b..e31680e 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -100,7 +100,7 @@ static int port_accept(struct port_list *port)
.port = port });
if (um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt,
- IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+ IRQF_SHARED | IRQF_SAMPLE_RANDOM,
"telnetd", conn)) {
printk(KERN_ERR "port_accept : failed to get IRQ for "
"telnetd\n");
@@ -184,7 +184,7 @@ void *port_data(int port_num)
}
if (um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt,
- IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+ IRQF_SHARED | IRQF_SAMPLE_RANDOM,
"port", port)) {
printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);
goto out_close;
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index 981085a..b25296e 100644
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -131,7 +131,7 @@ static int __init rng_init (void)
random_fd = err;
err = um_request_irq(RANDOM_IRQ, random_fd, IRQ_READ, random_interrupt,
- IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "random",
+ IRQF_SAMPLE_RANDOM, "random",
NULL);
if (err)
goto err_out_cleanup_hw;
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 620f5b7..c9dae89 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1088,7 +1088,7 @@ static int __init ubd_driver_init(void){
return 0;
}
err = um_request_irq(UBD_IRQ, thread_fd, IRQ_READ, ubd_intr,
- IRQF_DISABLED, "ubd", ubd_devs);
+ 0, "ubd", ubd_devs);
if(err != 0)
printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);
return 0;
diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index b646bcc..8bd130f 100644
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -50,7 +50,7 @@ int xterm_fd(int socket, int *pid_out)
init_completion(&data->ready);
err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
- IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+ IRQF_SHARED | IRQF_SAMPLE_RANDOM,
"xterm", data);
if (err) {
printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c
index 2b272b6..2a16392 100644
--- a/arch/um/kernel/sigio.c
+++ b/arch/um/kernel/sigio.c
@@ -25,7 +25,7 @@ int write_sigio_irq(int fd)
int err;
err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt,
- IRQF_DISABLED|IRQF_SAMPLE_RANDOM, "write sigio",
+ IRQF_SAMPLE_RANDOM, "write sigio",
NULL);
if (err) {
printk(KERN_ERR "write_sigio_irq : um_request_irq failed, "
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index a08d9fa..9149b5f 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -84,7 +84,7 @@ static void __init setup_itimer(void)
{
int err;
- err = request_irq(TIMER_IRQ, um_timer, IRQF_DISABLED, "timer", NULL);
+ err = request_irq(TIMER_IRQ, um_timer, 0, "timer", NULL);
if (err != 0)
printk(KERN_ERR "register_timer : request_irq failed - "
"errno = %d\n", -err);
--
1.7.1
next prev parent reply other threads:[~2011-10-22 10:06 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-22 9:56 [PATCH V3 00/49] Tree wide: cleanup IRQF_DISABLED Yong Zhang
2011-10-22 9:56 ` [PATCH 01/49] usb/hcd: Remove tricky code dealing with IRQF_DISABLED && IRQF_SHARED Yong Zhang
2011-10-22 9:56 ` [PATCH 02/49] alpha: irq: Remove IRQF_DISABLED Yong Zhang
2011-10-22 9:56 ` [PATCH 04/49] avr32: " Yong Zhang
2011-10-22 9:56 ` [PATCH 05/49] cris: " Yong Zhang
2011-10-22 9:56 ` [PATCH 06/49] frv: " Yong Zhang
2011-10-22 9:56 ` [PATCH 07/49] h8300: " Yong Zhang
2011-10-22 9:56 ` [PATCH 08/49] ia64: " Yong Zhang
2011-10-22 9:56 ` [PATCH 09/49] m32r: " Yong Zhang
2011-10-22 9:56 ` [PATCH 10/49] m68k: " Yong Zhang
2011-10-22 9:56 ` [PATCH 11/49] microblaze: " Yong Zhang
2011-10-22 9:56 ` [PATCH 12/49] MIPS: " Yong Zhang
2011-11-04 12:21 ` Ralf Baechle
2011-11-07 2:10 ` Yong Zhang
2011-11-07 2:49 ` Stephen Rothwell
2011-11-07 3:06 ` Yong Zhang
2011-10-22 9:56 ` [PATCH 13/49] mn10300: " Yong Zhang
2011-10-22 9:56 ` [PATCH 14/49] parisc: irq: remove IRQF_DISABLED Yong Zhang
2011-10-22 9:56 ` [PATCH 15/49] powerpc: irq: Remove IRQF_DISABLED Yong Zhang
2011-10-23 1:57 ` Geoff Levand
2011-10-22 9:56 ` [PATCH 16/49] SH: " Yong Zhang
2011-10-28 6:17 ` Paul Mundt
2011-10-22 9:56 ` [PATCH 17/49] sparc: " Yong Zhang
2011-10-22 9:56 ` Yong Zhang [this message]
2011-10-28 10:54 ` [PATCH 18/49] um: " Richard Weinberger
2011-10-28 11:51 ` Yong Zhang
2011-10-22 9:56 ` [PATCH 19/49] unicore32: " Yong Zhang
2011-10-22 9:56 ` [PATCH 20/49] x86: irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 21/49] xtensa: " Yong Zhang
2011-10-22 9:56 ` [PATCH 22/49] score: " Yong Zhang
2011-10-22 9:56 ` [PATCH 23/49] clocksource: " Yong Zhang
2011-10-22 9:56 ` [PATCH 24/49] SCSI: " Yong Zhang
2011-10-22 9:56 ` [PATCH 25/49] block: " Yong Zhang
2011-10-22 9:56 ` [PATCH 26/49] cdrom: " Yong Zhang
2011-10-22 9:56 ` [PATCH 27/49] driver/char: " Yong Zhang
2011-10-22 9:56 ` [PATCH 28/49] crypto: " Yong Zhang
2011-10-22 9:56 ` [PATCH 29/49] dmaengine: " Yong Zhang
2011-10-22 9:56 ` [PATCH 30/49] EDAC: " Yong Zhang
2011-10-22 9:56 ` [PATCH 31/49] ISDN: " Yong Zhang
2011-10-22 9:56 ` [PATCH 32/49] media: " Yong Zhang
2011-10-22 9:56 ` [PATCH 33/49] drivers:misc:irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 34/49] mtd: irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 35/49] net: " Yong Zhang
2011-10-22 9:56 ` [PATCH 36/49] dirvers/parisc: " Yong Zhang
2011-10-22 9:56 ` [PATCH 37/49] pcmcia: " Yong Zhang
2012-02-05 21:11 ` Dominik Brodowski
2011-10-22 9:56 ` [PATCH 38/49] sony-laptop:irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 39/49] PNP: irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 40/49] power_supply:irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 41/49] powerpc/ps3: irq: " Yong Zhang
2011-10-22 9:56 ` [PATCH 42/49] rtc: " Yong Zhang
2011-10-22 9:56 ` [PATCH 43/49] spi: " Yong Zhang
2011-10-24 12:14 ` Grant Likely
2011-10-22 9:56 ` [PATCH 44/49] w1: " Yong Zhang
2011-10-22 9:56 ` [PATCH 45/49] watchdog: " Yong Zhang
2011-10-22 9:56 ` [PATCH 46/49] xen: " Yong Zhang
2011-10-22 9:56 ` [PATCH 47/49] Documentation: irq: Change documents related to IRQF_DISABLED Yong Zhang
2011-10-22 9:57 ` [PATCH 48/49] USB: pxa168: xls: irq: Remove IRQF_DISABLED Yong Zhang
2011-10-22 13:16 ` Tanmay Upadhyay
2011-10-22 9:57 ` [PATCH 49/49] genirq: " Yong Zhang
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=1319277421-9203-19-git-send-email-yong.zhang0@gmail.com \
--to=yong.zhang0@gmail.com \
--cc=jdike@addtoit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=richard@nod.at \
--cc=tglx@linutronix.de \
--cc=user-mode-linux-devel@lists.sourceforge.net \
--cc=user-mode-linux-user@lists.sourceforge.net \
/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;
as well as URLs for NNTP newsgroup(s).