From fdbb3fb4565a33881ca32e952b386c014960484c Mon Sep 17 00:00:00 2001
From: James Bottomley <jejb@parisc-linux.org>
Date: Fri, 21 Oct 2005 22:54:38 -0400
Subject: [PATCH] --- yaml --- r: 10506 b: refs/heads/master c:
 dd0fd51dc1585941c2edccdb40e5f11ea3a64496 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/arch/parisc/kernel/entry.S | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 1179720a50c0..31bcc2fe90f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63af965d2bc8d8c5d4c5949b8d3dbdc3c7b7d97a
+refs/heads/master: dd0fd51dc1585941c2edccdb40e5f11ea3a64496
diff --git a/trunk/arch/parisc/kernel/entry.S b/trunk/arch/parisc/kernel/entry.S
index 166df5bab769..c7e66ee5b083 100644
--- a/trunk/arch/parisc/kernel/entry.S
+++ b/trunk/arch/parisc/kernel/entry.S
@@ -970,9 +970,6 @@ intr_return:
 	add     %r19,%r20,%r19	/* now have &irq_stat[smp_processor_id()] */
 #endif /* CONFIG_SMP */
 
-	LDREG   IRQSTAT_SIRQ_PEND(%r19),%r20    /* hardirq.h: unsigned long */
-	cmpib,<>,n 0,%r20,intr_do_softirq /* forward */
-
 intr_check_resched:
 
 	/* check for reschedule */
@@ -1017,17 +1014,6 @@ intr_restore:
 	nop
 	nop
 
-	.import do_softirq,code
-intr_do_softirq:
-	BL      do_softirq,%r2
-#ifdef CONFIG_64BIT
-	ldo	-16(%r30),%r29		/* Reference param save area */
-#else
-	nop
-#endif
-	b       intr_check_resched
-	nop
-
 	.import schedule,code
 intr_do_resched:
 	/* Only do reschedule if we are returning to user space */
@@ -2096,9 +2082,6 @@ syscall_check_bh:
 	add     %r19,%r20,%r19	/* now have &irq_stat[smp_processor_id()] */
 #endif /* CONFIG_SMP */
 
-	LDREG   IRQSTAT_SIRQ_PEND(%r19),%r20    /* hardirq.h: unsigned long */
-	cmpib,<>,n 0,%r20,syscall_do_softirq /* forward */
-
 syscall_check_resched:
 
 	/* check for reschedule */
@@ -2236,16 +2219,6 @@ pt_regs_ok:
 	b	intr_restore
 	nop
 
-	.import do_softirq,code
-syscall_do_softirq:
-	BL      do_softirq,%r2
-	nop
-	/* NOTE: We enable I-bit incase we schedule later,
-	 * and we might be going back to userspace if we were
-	 * traced. */
-	b       syscall_check_resched
-	ssm     PSW_SM_I, %r0  /* do_softirq returns with I bit off */
-
 	.import schedule,code
 syscall_do_resched:
 	BL	schedule,%r2