All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yong Zhang <yong.zhang0@gmail.com>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Cc: tglx@linutronix.de, yong.zhang0@gmail.com,
	Jeff Dike <jdike@addtoit.com>,
	Richard Weinberger <richard@nod.at>,
	Andrew Morton <akpm@linux-foundation.org>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Will Newton <will.newton@gmail.com>,
	WANG Cong <xiyou.wangcong@gmail.com>,
	Arnd Bergmann <arnd@arndb.de>,
	"David S. Miller" <davem@davemloft.net>,
	Boaz Harrosh <bharrosh@panasas.com>,
	Jiri Pirko <jpirko@redhat.com>, Jens Axboe <jaxboe@fusionio.com>,
	Tejun Heo <tj@kernel.org>,
	user-mode-linux-devel@lists.sourceforge.net,
	user-mode-linux-user@lists.sourceforge.net
Subject: [PATCH 19/55] um: irq: Remove IRQF_DISABLED
Date: Thu, 22 Sep 2011 16:58:46 +0800	[thread overview]
Message-ID: <1316681962-8217-20-git-send-email-yong.zhang0@gmail.com> (raw)
In-Reply-To: <1316681962-8217-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>
---
 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.4.1


  parent reply	other threads:[~2011-09-22  9:07 UTC|newest]

Thread overview: 106+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-22  8:58 [PATCH V2 00/55] Tree wide: cleanup IRQF_DISABLED Yong Zhang
2011-09-22  8:58 ` [PATCH 01/55] usb/hcd: Remove tricky code dealing with IRQF_DISABLED && IRQF_SHARED Yong Zhang
2011-09-22  8:58 ` [PATCH 02/55] alpha: irq: Remove IRQF_DISABLED Yong Zhang
2011-09-22  8:58 ` [PATCH 04/55] avr32: " Yong Zhang
2011-09-22  8:58 ` [PATCH 05/55] cris: " Yong Zhang
2011-09-22  8:58 ` [PATCH 06/55] frv: " Yong Zhang
2011-09-22  8:58 ` [PATCH 07/55] h8300: " Yong Zhang
2011-09-22  8:58 ` [PATCH 08/55] ia64: " Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58 ` [PATCH 09/55] m32r: " Yong Zhang
2011-09-22  8:58 ` [PATCH 10/55] m68k: " Yong Zhang
2011-09-22  8:58 ` Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58 ` [PATCH 11/55] microblaze: " Yong Zhang
2011-09-22  8:58 ` [PATCH 12/55] MIPS: " Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58 ` [PATCH 13/55] mn10300: " Yong Zhang
2011-09-22  8:58 ` [PATCH 14/55] parisc: irq: remove IRQF_DISABLED Yong Zhang
2011-09-22  8:58 ` [PATCH 15/55] powerpc: irq: Remove IRQF_DISABLED Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58 ` [PATCH 16/55] score: " Yong Zhang
2011-09-22  8:58 ` [PATCH 17/55] SH: " Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58 ` [PATCH 18/55] sparc: " Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58 ` Yong Zhang [this message]
2011-09-22 10:46   ` [PATCH 19/55] um: " Richard Weinberger
2011-09-22  8:58 ` [PATCH 20/55] unicore32: " Yong Zhang
2011-09-22  8:58 ` [PATCH 21/55] x86: irq: " Yong Zhang
2011-09-22  8:58 ` [PATCH 22/55] xtensa: " Yong Zhang
2011-09-22  8:58 ` [PATCH 23/55] clocksource: " Yong Zhang
2011-09-22  8:58 ` [PATCH 24/55] SCSI: " Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-23  1:35   ` Jack Wang
2011-09-23  1:35     ` Jack Wang
2011-09-23  1:35     ` Jack Wang
2011-09-22  8:58 ` [PATCH 25/55] ata: " Yong Zhang
2011-09-22  8:58 ` [PATCH 26/55] block: " Yong Zhang
2011-09-22  8:58 ` [PATCH 27/55] cdrom: " Yong Zhang
2011-09-22  8:58 ` [PATCH 28/55] driver/char: " Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58 ` [PATCH 29/55] crypto: " Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58 ` [PATCH 30/55] dmaengine: " Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58 ` [PATCH 31/55] EDAC: " Yong Zhang
2011-09-22  8:58 ` [PATCH 32/55] i2c: " Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-22  8:58   ` Yong Zhang
2011-09-24 11:53   ` Jean Delvare
2011-09-24 11:53     ` Jean Delvare
2011-09-24 11:53     ` Jean Delvare
2011-10-04 20:59   ` Ben Dooks
2011-10-04 20:59     ` Ben Dooks
2011-10-04 20:59     ` Ben Dooks
2011-09-22  8:59 ` [PATCH 34/55] ISDN: " Yong Zhang
2011-09-22  8:59 ` [PATCH 35/55] media: " Yong Zhang
2011-09-22  8:59 ` [PATCH 36/55] drivers:misc:irq: " Yong Zhang
2011-09-22  8:59 ` [PATCH 37/55] mmc: irq: " Yong Zhang
2011-09-23 18:55   ` Chris Ball
2011-09-22  8:59 ` [PATCH 38/55] mtd: " Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59   ` Yong Zhang
     [not found] ` <1316681962-8217-1-git-send-email-yong.zhang0-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-09-22  8:59   ` [PATCH 33/55] infiniband: " Yong Zhang
2011-09-22  8:59     ` Yong Zhang
2011-09-22 16:56     ` Roland Dreier
2011-09-23  1:40       ` Yong Zhang
2011-09-23  1:48         ` Yong Zhang
2011-09-23  1:48           ` Yong Zhang
2011-09-23 18:09           ` Roland Dreier
2011-09-22  8:59   ` [PATCH 39/55] net: " Yong Zhang
2011-09-22  8:59     ` Yong Zhang
2011-09-22  8:59 ` [PATCH 40/55] dirvers/parisc: " Yong Zhang
2011-09-22  8:59 ` [PATCH 41/55] pcmcia: " Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59 ` [PATCH 42/55] sony-laptop:irq: " Yong Zhang
2011-09-22  8:59 ` [PATCH 43/55] PNP: irq: " Yong Zhang
2011-09-22  8:59 ` [PATCH 44/55] power_supply:irq: " Yong Zhang
2011-11-25 20:35   ` Anton Vorontsov
2011-09-22  8:59 ` [PATCH 45/55] powerpc/ps3: irq: " Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59 ` [PATCH 46/55] rtc: " Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59 ` [PATCH 47/55] spi: " Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59 ` [PATCH 48/55] TTY: " Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59 ` [PATCH 49/55] video: " Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-10-04 20:20   ` Florian Tobias Schandinat
2011-10-04 20:20     ` Florian Tobias Schandinat
2011-10-04 20:20     ` Florian Tobias Schandinat
2011-09-22  8:59 ` [PATCH 50/55] w1: " Yong Zhang
2011-09-22  8:59 ` [PATCH 51/55] watchdog: " Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59 ` [PATCH 52/55] xen: " Yong Zhang
2011-09-22  8:59 ` [PATCH 53/55] sound: " Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59   ` Yong Zhang
2011-09-22  8:59 ` [PATCH 54/55] Documentation: irq: Change documents related to IRQF_DISABLED Yong Zhang
2011-09-22  8:59 ` [PATCH 55/55] genirq: Remove IRQF_DISABLED 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=1316681962-8217-20-git-send-email-yong.zhang0@gmail.com \
    --to=yong.zhang0@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=bharrosh@panasas.com \
    --cc=davem@davemloft.net \
    --cc=jaxboe@fusionio.com \
    --cc=jdike@addtoit.com \
    --cc=jpirko@redhat.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=richard@nod.at \
    --cc=tglx@linutronix.de \
    --cc=tj@kernel.org \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    --cc=user-mode-linux-user@lists.sourceforge.net \
    --cc=viro@zeniv.linux.org.uk \
    --cc=will.newton@gmail.com \
    --cc=xiyou.wangcong@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.