Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Garbage-collect prev_intr_depth; nothing uses it.



details:   https://anonhg.NetBSD.org/src/rev/e33fbf507073
branches:  trunk
changeset: 541155:e33fbf507073
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Jan 02 23:54:39 2003 +0000

description:
Garbage-collect prev_intr_depth; nothing uses it.

diffstat:

 sys/arch/arm/footbridge/footbridge_irq.S |  11 +----------
 sys/arch/arm/ixp12x0/ixp12x0_irq.S       |  11 +----------
 sys/arch/arm/xscale/i80200_irq.S         |  11 +----------
 sys/arch/arm/xscale/i80321_irq.S         |  11 +----------
 sys/arch/evbarm/ifpga/ifpga_irq.S        |  15 +--------------
 5 files changed, 5 insertions(+), 54 deletions(-)

diffs (252 lines):

diff -r c95fe7523021 -r e33fbf507073 sys/arch/arm/footbridge/footbridge_irq.S
--- a/sys/arch/arm/footbridge/footbridge_irq.S  Thu Jan 02 23:37:53 2003 +0000
+++ b/sys/arch/arm/footbridge/footbridge_irq.S  Thu Jan 02 23:54:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: footbridge_irq.S,v 1.4 2002/11/03 21:43:31 chris Exp $ */
+/*     $NetBSD: footbridge_irq.S,v 1.5 2003/01/02 23:54:39 thorpej Exp $       */
 
 /*
  * Copyright (c) 1998 Mark Brinicombe.
@@ -55,7 +55,6 @@
 
 .Lcurrent_intr_depth: 
        .word   _C_LABEL(current_intr_depth)
-       .word   _C_LABEL(prev_intr_depth)
 
 .Lastpending:
        .word   _C_LABEL(astpending)
@@ -72,9 +71,7 @@
         * each time the interrupt handler is nested.
         */
        ldr     r0, .Lcurrent_intr_depth
-       ldr     r2, .Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        add     r1, r1, #1
        str     r1, [r0]
        
@@ -84,9 +81,7 @@
         
        /* Decremement the nest count. */
        ldr     r0, .Lcurrent_intr_depth 
-       ldr     r2, .Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        sub     r1, r1, #1
        str     r1, [r0]
 
@@ -132,10 +127,6 @@
 _C_LABEL(current_intr_depth):
        .word   0
 
-       .global _C_LABEL(prev_intr_depth)
-_C_LABEL(prev_intr_depth):
-       .word   0
-
        /*
         * XXX Provide intrnames/intrcnt for legacy code, but
         * don't actually use them.
diff -r c95fe7523021 -r e33fbf507073 sys/arch/arm/ixp12x0/ixp12x0_irq.S
--- a/sys/arch/arm/ixp12x0/ixp12x0_irq.S        Thu Jan 02 23:37:53 2003 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_irq.S        Thu Jan 02 23:54:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_irq.S,v 1.3 2002/10/14 22:32:52 bjh21 Exp $    */
+/*     $NetBSD: ixp12x0_irq.S,v 1.4 2003/01/02 23:54:41 thorpej Exp $  */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -52,7 +52,6 @@
 
 Lcurrent_intr_depth: 
        .word   _C_LABEL(current_intr_depth)
-       .word   _C_LABEL(prev_intr_depth)
 
 Lintr_dispatch:
        .word   _C_LABEL(ixp12x0_intr_dispatch)
@@ -72,9 +71,7 @@
         * count each time the interrupt handler is nested.
         */
        ldr     r0, Lcurrent_intr_depth
-       ldr     r2, Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        add     r1, r1, #1
        str     r1, [r0]
 
@@ -87,9 +84,7 @@
 
        /* Decremement the nest count. */
        ldr     r0, Lcurrent_intr_depth 
-       ldr     r2, Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        sub     r1, r1, #1
        str     r1, [r0]
 
@@ -135,10 +130,6 @@
 _C_LABEL(current_intr_depth):
        .word   0
 
-       .global _C_LABEL(prev_intr_depth)
-_C_LABEL(prev_intr_depth):
-       .word   0
-
        /*
         * XXX Provide intrnames/intrcnt for legacy code, but
         * don't actually use them.
diff -r c95fe7523021 -r e33fbf507073 sys/arch/arm/xscale/i80200_irq.S
--- a/sys/arch/arm/xscale/i80200_irq.S  Thu Jan 02 23:37:53 2003 +0000
+++ b/sys/arch/arm/xscale/i80200_irq.S  Thu Jan 02 23:54:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i80200_irq.S,v 1.9 2002/10/25 14:29:37 briggs Exp $    */
+/*     $NetBSD: i80200_irq.S,v 1.10 2003/01/02 23:54:41 thorpej Exp $  */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -56,7 +56,6 @@
 
 .Lcurrent_intr_depth: 
        .word   _C_LABEL(current_intr_depth)
-       .word   _C_LABEL(prev_intr_depth)
 
 .Lintr_dispatch:
        .word   _C_LABEL(i80200_extirq_dispatch)
@@ -81,9 +80,7 @@
         * count each time the interrupt handler is nested.
         */
        ldr     r0, .Lcurrent_intr_depth
-       ldr     r2, .Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        add     r1, r1, #1
        str     r1, [r0]
 
@@ -127,9 +124,7 @@
 
        /* Decremement the nest count. */
        ldr     r0, .Lcurrent_intr_depth 
-       ldr     r2, .Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        sub     r1, r1, #1
        str     r1, [r0]
 
@@ -175,10 +170,6 @@
 _C_LABEL(current_intr_depth):
        .word   0
 
-       .global _C_LABEL(prev_intr_depth)
-_C_LABEL(prev_intr_depth):
-       .word   0
-
        /*
         * XXX Provide intrnames/intrcnt for legacy code, but
         * don't actually use them.
diff -r c95fe7523021 -r e33fbf507073 sys/arch/arm/xscale/i80321_irq.S
--- a/sys/arch/arm/xscale/i80321_irq.S  Thu Jan 02 23:37:53 2003 +0000
+++ b/sys/arch/arm/xscale/i80321_irq.S  Thu Jan 02 23:54:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i80321_irq.S,v 1.5 2002/10/14 22:32:53 bjh21 Exp $     */
+/*     $NetBSD: i80321_irq.S,v 1.6 2003/01/02 23:54:42 thorpej Exp $   */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -52,7 +52,6 @@
 
 .Lcurrent_intr_depth: 
        .word   _C_LABEL(current_intr_depth)
-       .word   _C_LABEL(prev_intr_depth)
 
 .Lintr_dispatch:
        .word   _C_LABEL(i80321_intr_dispatch)
@@ -72,9 +71,7 @@
         * count each time the interrupt handler is nested.
         */
        ldr     r0, .Lcurrent_intr_depth
-       ldr     r2, .Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        add     r1, r1, #1
        str     r1, [r0]
 
@@ -87,9 +84,7 @@
 
        /* Decremement the nest count. */
        ldr     r0, .Lcurrent_intr_depth 
-       ldr     r2, .Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        sub     r1, r1, #1
        str     r1, [r0]
 
@@ -135,10 +130,6 @@
 _C_LABEL(current_intr_depth):
        .word   0
 
-       .global _C_LABEL(prev_intr_depth)
-_C_LABEL(prev_intr_depth):
-       .word   0
-
        /*
         * XXX Provide intrnames/intrcnt for legacy code, but
         * don't actually use them.
diff -r c95fe7523021 -r e33fbf507073 sys/arch/evbarm/ifpga/ifpga_irq.S
--- a/sys/arch/evbarm/ifpga/ifpga_irq.S Thu Jan 02 23:37:53 2003 +0000
+++ b/sys/arch/evbarm/ifpga/ifpga_irq.S Thu Jan 02 23:54:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifpga_irq.S,v 1.3 2002/10/14 22:32:53 bjh21 Exp $
+/*     $NetBSD: ifpga_irq.S,v 1.4 2003/01/02 23:54:43 thorpej Exp $
 
 /*
  * Copyright (c) 1998 Mark Brinicombe.
@@ -91,7 +91,6 @@
 
 Lcurrent_intr_depth:
        .word   _C_LABEL(current_intr_depth)
-       .word   _C_LABEL(prev_intr_depth)
 
 Lspl_masks:
        .word   _C_LABEL(spl_masks)
@@ -122,9 +121,7 @@
         * each time the interrupt handler is nested.
         */
        ldr     r0, Lcurrent_intr_depth
-       ldr     r2, Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        add     r1, r1, #1
        str     r1, [r0]
 
@@ -336,9 +333,7 @@
 irq_unknown:
        /* Decrement the nest count */
        ldr     r0, Lcurrent_intr_depth
-       ldr     r2, Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r2]
        sub     r1, r1, #1
        str     r1, [r0]
 
@@ -365,9 +360,7 @@
 
        /* Decrement the nest count */
        ldr     r0, Lcurrent_intr_depth
-       ldr     r4, Lcurrent_intr_depth+4
        ldr     r1, [r0]
-       str     r1, [r4]
        sub     r1, r1, #1
        str     r1, [r0]
 
@@ -444,12 +437,6 @@
        str     r1, [r0, #(IFPGA_INTR_ENABLECLR)]
        mov     pc, lr
 
-       .data
-       .align 0
-       .global _C_LABEL(prev_intr_depth)
-_C_LABEL(prev_intr_depth):
-       .word   0
-
 #ifdef IRQSTATS
        /* These symbols are used by vmstat */
 



Home | Main Index | Thread Index | Old Index