summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-25 22:41:20 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-25 22:41:20 +0000
commitcd259ccdaec7c6702aa71196a0dad8968c34e9bf (patch)
tree4f79348d1201a9b59d1157a75142187a11158608 /arch
parentfbf7f8d08f48f03db03963cb15eceef6e6ae88bd (diff)
Cleanup a large number of random junk, nothing of importance.
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/kernel/i8259.c95
-rw-r--r--arch/mips/baget/.cvsignore (renamed from arch/mips/sgi/prom/.cvsignore)0
-rw-r--r--arch/mips/baget/prom/.cvsignore2
-rw-r--r--arch/mips/dec/.cvsignore2
-rw-r--r--arch/mips/dec/boot/.cvsignore2
-rw-r--r--arch/mips/dec/prom/.cvsignore2
-rw-r--r--arch/mips/kernel/r4k_fpu.S5
-rw-r--r--arch/mips/kernel/traps.c5
-rw-r--r--arch/mips/kernel/unaligned.c5
9 files changed, 15 insertions, 103 deletions
diff --git a/arch/alpha/kernel/i8259.c b/arch/alpha/kernel/i8259.c
deleted file mode 100644
index ad545b98e..000000000
--- a/arch/alpha/kernel/i8259.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * linux/arch/alpha/kernel/i8259.c
- *
- * This is the 'legacy' 8259A Programmable Interrupt Controller,
- * present in the majority of PC/AT boxes.
- *
- * Started hacking from linux-2.3.30pre6/arch/i386/kernel/i8259.c.
- */
-
-#include <linux/init.h>
-#include <linux/cache.h>
-#include <linux/sched.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-
-#include <asm/io.h>
-
-#include "proto.h"
-#include "irq_impl.h"
-
-
-/* Note mask bit is true for DISABLED irqs. */
-static unsigned int cached_irq_mask = 0xffff;
-
-static inline void
-i8259_update_irq_hw(unsigned int irq, unsigned long mask)
-{
- int port = 0x21;
- if (irq & 8) mask >>= 8;
- if (irq & 8) port = 0xA1;
- outb(mask, port);
-}
-
-inline void
-i8259a_enable_irq(unsigned int irq)
-{
- i8259_update_irq_hw(irq, cached_irq_mask &= ~(1 << irq));
-}
-
-inline void
-i8259a_disable_irq(unsigned int irq)
-{
- i8259_update_irq_hw(irq, cached_irq_mask |= 1 << irq);
-}
-
-void
-i8259a_mask_and_ack_irq(unsigned int irq)
-{
- i8259a_disable_irq(irq);
-
- /* Ack the interrupt making it the lowest priority. */
- if (irq >= 8) {
- outb(0xE0 | (irq - 8), 0xa0); /* ack the slave */
- irq = 2;
- }
- outb(0xE0 | irq, 0x20); /* ack the master */
-}
-
-unsigned int
-i8259a_startup_irq(unsigned int irq)
-{
- i8259a_enable_irq(irq);
- return 0; /* never anything pending */
-}
-
-struct hw_interrupt_type i8259a_irq_type = {
- typename: "XT-PIC",
- startup: i8259a_startup_irq,
- shutdown: i8259a_disable_irq,
- enable: i8259a_enable_irq,
- disable: i8259a_disable_irq,
- ack: i8259a_mask_and_ack_irq,
- end: i8259a_enable_irq,
-};
-
-void __init
-init_i8259a_irqs(void)
-{
- static struct irqaction cascade = {
- handler: no_action,
- name: "cascade",
- };
-
- long i;
-
- outb(0xff, 0x21); /* mask all of 8259A-1 */
- outb(0xff, 0xA1); /* mask all of 8259A-2 */
-
- for (i = 0; i < 16; i++) {
- irq_desc[i].status = IRQ_DISABLED;
- irq_desc[i].handler = &i8259a_irq_type;
- }
-
- setup_irq(2, &cascade);
-}
diff --git a/arch/mips/sgi/prom/.cvsignore b/arch/mips/baget/.cvsignore
index 857dd22e9..857dd22e9 100644
--- a/arch/mips/sgi/prom/.cvsignore
+++ b/arch/mips/baget/.cvsignore
diff --git a/arch/mips/baget/prom/.cvsignore b/arch/mips/baget/prom/.cvsignore
new file mode 100644
index 000000000..857dd22e9
--- /dev/null
+++ b/arch/mips/baget/prom/.cvsignore
@@ -0,0 +1,2 @@
+.depend
+.*.flags
diff --git a/arch/mips/dec/.cvsignore b/arch/mips/dec/.cvsignore
new file mode 100644
index 000000000..857dd22e9
--- /dev/null
+++ b/arch/mips/dec/.cvsignore
@@ -0,0 +1,2 @@
+.depend
+.*.flags
diff --git a/arch/mips/dec/boot/.cvsignore b/arch/mips/dec/boot/.cvsignore
new file mode 100644
index 000000000..857dd22e9
--- /dev/null
+++ b/arch/mips/dec/boot/.cvsignore
@@ -0,0 +1,2 @@
+.depend
+.*.flags
diff --git a/arch/mips/dec/prom/.cvsignore b/arch/mips/dec/prom/.cvsignore
new file mode 100644
index 000000000..857dd22e9
--- /dev/null
+++ b/arch/mips/dec/prom/.cvsignore
@@ -0,0 +1,2 @@
+.depend
+.*.flags
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S
index 4624416e7..c5649bd03 100644
--- a/arch/mips/kernel/r4k_fpu.S
+++ b/arch/mips/kernel/r4k_fpu.S
@@ -1,4 +1,4 @@
-/* $Id: r4k_fpu.S,v 1.7 1999/08/18 23:37:44 ralf Exp $
+/* $Id: r4k_fpu.S,v 1.8 1999/09/28 22:25:47 ralf Exp $
*
* r4k_fpu.S: Save/restore floating point context for signal handlers.
*
@@ -32,7 +32,6 @@ LEAF(save_fp_context)
cfc1 t1,fcr31
/* Store the 16 even double precision registers */
-1:
EX(sdc1 $f0,(SC_FPREGS+0)(a0))
EX(sdc1 $f2,(SC_FPREGS+16)(a0))
EX(sdc1 $f4,(SC_FPREGS+32)(a0))
@@ -75,7 +74,7 @@ LEAF(restore_fp_context)
* Restore the 16 even double precision registers
* when cp1 was enabled in the cp0 status register.
*/
-1: EX(ldc1 $f0,(SC_FPREGS+0)(a0))
+ EX(ldc1 $f0,(SC_FPREGS+0)(a0))
EX(ldc1 $f2,(SC_FPREGS+16)(a0))
EX(ldc1 $f4,(SC_FPREGS+32)(a0))
EX(ldc1 $f6,(SC_FPREGS+48)(a0))
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index d0d72c0c0..90d2b90ed 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1,12 +1,13 @@
-/* $Id: traps.c,v 1.27 2000/01/16 01:29:05 ralf Exp $
+/* $Id: traps.c,v 1.28 2000/03/13 10:33:02 raiko Exp $
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright 1994, 1995, 1996, 1997, 1998 by Ralf Baechle
+ * Copyright (C) 1994 - 1999 by Ralf Baechle
* Modified for R3000 by Paul M. Antoine, 1995, 1996
* Complete output from die() by Ulf Carlsson, 1998
+ * Copyright (C) 1999 Silicon Graphics, Inc.
*/
#include <linux/config.h>
#include <linux/init.h>
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 2520b4e34..9953922b7 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -1,4 +1,4 @@
-/* $Id: unaligned.c,v 1.8 1999/10/10 18:49:15 ralf Exp $
+/* $Id: unaligned.c,v 1.7 1999/12/04 03:59:00 ralf Exp $
*
* Handle unaligned accesses by emulation.
*
@@ -7,8 +7,7 @@
* for more details.
*
* Copyright (C) 1996, 1998 by Ralf Baechle
- *
- * $Id: unaligned.c,v 1.6 1999/10/09 00:00:58 ralf Exp $
+ * Copyright (C) 1999 Silicon Graphics, Inc.
*
* This file contains exception handler for address error exception with the
* special capability to execute faulting instructions in software. The