From 142127e83972d0afe2e2769fc1182f7f4e42dc76 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 1 Jul 2006 19:29:28 -0700
Subject: [PATCH] --- yaml --- r: 31623 b: refs/heads/master c:
 8b91fbb8338bae702f5a6c984fb05f1a01f6590c h: refs/heads/master i:   31621:
 2955ad380f3ecff2ada9bc474c3784662fbaa72c   31619:
 19ed0ed6cd35fbf6360f1e15852fc32061af998f   31615:
 180fc82e3f24b620812bdfb6b1646ddf67778a31 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/v850/kernel/gbus_int.c   | 2 +-
 trunk/arch/v850/kernel/rte_me2_cb.c | 2 +-
 trunk/arch/v850/kernel/time.c       | 2 +-
 trunk/include/asm-v850/signal.h     | 2 --
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 91860e6e4028..460b749932f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd6aa6502e7f82c39090aea29e4b644c29e720bd
+refs/heads/master: 8b91fbb8338bae702f5a6c984fb05f1a01f6590c
diff --git a/trunk/arch/v850/kernel/gbus_int.c b/trunk/arch/v850/kernel/gbus_int.c
index 92918b8d89ef..25d636e79e6a 100644
--- a/trunk/arch/v850/kernel/gbus_int.c
+++ b/trunk/arch/v850/kernel/gbus_int.c
@@ -154,7 +154,7 @@ static unsigned gbus_int_startup_irq (unsigned irq)
 		/* First enable the CPU interrupt.  */
 		int rval =
 			request_irq (IRQ_GINT(gint), gbus_int_handle_irq,
-				     SA_INTERRUPT,
+				     IRQF_DISABLED,
 				     "gbus_int_handler",
 				     &gint_num_active_irqs[gint]);
 		if (rval != 0)
diff --git a/trunk/arch/v850/kernel/rte_me2_cb.c b/trunk/arch/v850/kernel/rte_me2_cb.c
index df7027d85437..3be355a029e2 100644
--- a/trunk/arch/v850/kernel/rte_me2_cb.c
+++ b/trunk/arch/v850/kernel/rte_me2_cb.c
@@ -263,7 +263,7 @@ static unsigned cb_pic_startup_irq (unsigned irq)
 
 	if (cb_pic_active_irqs == 0) {
 		rval = request_irq (IRQ_CB_PIC, cb_pic_handle_irq,
-				    SA_INTERRUPT, "cb_pic_handler", 0);
+				    IRQF_DISABLED, "cb_pic_handler", 0);
 		if (rval != 0)
 			return rval;
 	}
diff --git a/trunk/arch/v850/kernel/time.c b/trunk/arch/v850/kernel/time.c
index c1e85c2aef65..a0b46695f186 100644
--- a/trunk/arch/v850/kernel/time.c
+++ b/trunk/arch/v850/kernel/time.c
@@ -177,7 +177,7 @@ EXPORT_SYMBOL(do_settimeofday);
 static int timer_dev_id;
 static struct irqaction timer_irqaction = {
 	timer_interrupt,
-	SA_INTERRUPT,
+	IRQF_DISABLED,
 	CPU_MASK_NONE,
 	"timer",
 	&timer_dev_id,
diff --git a/trunk/include/asm-v850/signal.h b/trunk/include/asm-v850/signal.h
index cb52caa69925..a38df0834bbf 100644
--- a/trunk/include/asm-v850/signal.h
+++ b/trunk/include/asm-v850/signal.h
@@ -77,7 +77,6 @@ typedef unsigned long sigset_t;
  * SA_FLAGS values:
  *
  * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
  * SA_RESTART flag to get restarting signals (which were the default long ago)
  * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
  * SA_RESETHAND clears the handler when the signal is delivered.
@@ -97,7 +96,6 @@ typedef unsigned long sigset_t;
 
 #define SA_NOMASK	SA_NODEFER
 #define SA_ONESHOT	SA_RESETHAND
-#define SA_INTERRUPT	0x20000000 /* dummy -- ignored */
 
 #define SA_RESTORER	0x04000000