[MIPS] Remove unused watchpoint support and arch/mips/lib-{32,64}

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 077eb0bd1c786e6ea4f2b810c100b07d0243336e..12e24146a06c6a324a3128d580cd12c88bef2732 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -633,8 +633,6 @@ CPPFLAGS_vmlinux.lds := \
 head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
 
 libs-y                 += arch/mips/lib/
-libs-$(CONFIG_32BIT)   += arch/mips/lib-32/
-libs-$(CONFIG_64BIT)   += arch/mips/lib-64/
 
 core-y                 += arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/
 

diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 5ddc2e9deecf3cfa042976c33b9b932c7d27edbe..eb7730d679342d170b512797e991ee0ab92a75c3 100644 (file)
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -14,7 +14,6 @@
 #include <asm/cpu-features.h>
 #include <asm/mipsregs.h>
 #include <asm/processor.h>
-#include <asm/watch.h>
 
 unsigned int vced_count, vcei_count;
 

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 20bdbe48839bfaf1172cd785abf37efae98b09cc..7e9cb5b1b4a7e489ae69790b9230ec293d3bc532 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -39,7 +39,6 @@
 #include <asm/traps.h>
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
-#include <asm/watch.h>
 #include <asm/types.h>
 #include <asm/stacktrace.h>
 

diff --git a/arch/mips/lib-32/Makefile b/arch/mips/lib-32/Makefile
deleted file mode 100644 (file)
index 7bae849..0000000
--- a/arch/mips/lib-32/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for MIPS-specific library files..
-#
-
-lib-y  += watch.o

diff --git a/arch/mips/lib-32/watch.S b/arch/mips/lib-32/watch.S
deleted file mode 100644 (file)
index 808b3af..0000000
--- a/arch/mips/lib-32/watch.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.
- *
- * Kernel debug stuff to use the Watch registers.
- * Useful to find stack overflows, dangling pointers etc.
- *
- * Copyright (C) 1995, 1996, 1999 by Ralf Baechle
- */
-#include <asm/asm.h>
-#include <asm/mipsregs.h>
-#include <asm/regdef.h>
-
-               .set    noreorder
-/*
- * Parameter: a0 - logic address to watch
- *                 Currently only KSEG0 addresses are allowed!
- *            a1 - set bit #1 to trap on load references
- *                     bit #0 to trap on store references
- * Results  : none
- */
-               LEAF(__watch_set)
-               li      t0, 0x80000000
-               subu    a0, t0
-               ori     a0, 7
-               xori    a0, 7
-               or      a0, a1
-               mtc0    a0, CP0_WATCHLO
-               sw      a0, watch_savelo
-
-               jr      ra
-                mtc0   zero, CP0_WATCHHI
-               END(__watch_set)
-
-/*
- * Parameter: none
- * Results  : none
- */
-               LEAF(__watch_clear)
-               jr      ra
-                mtc0   zero, CP0_WATCHLO
-               END(__watch_clear)
-
-/*
- * Parameter: none
- * Results  : none
- */
-               LEAF(__watch_reenable)
-               lw      t0, watch_savelo
-               jr      ra
-                mtc0   t0, CP0_WATCHLO
-               END(__watch_reenable)
-
-/*
- * Saved value of the c0_watchlo register for watch_reenable()
- */
-               .data
-watch_savelo:  .word   0
-               .text

diff --git a/arch/mips/lib-64/Makefile b/arch/mips/lib-64/Makefile
deleted file mode 100644 (file)
index 7bae849..0000000
--- a/arch/mips/lib-64/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for MIPS-specific library files..
-#
-
-lib-y  += watch.o

diff --git a/arch/mips/lib-64/watch.S b/arch/mips/lib-64/watch.S
deleted file mode 100644 (file)
index f914340..0000000
--- a/arch/mips/lib-64/watch.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- *
- * Kernel debug stuff to use the Watch registers.
- * Useful to find stack overflows, dangling pointers etc.
- *
- * Copyright (C) 1995, 1996, 1999, 2001 by Ralf Baechle
- */
-#include <asm/asm.h>
-#include <asm/mipsregs.h>
-#include <asm/regdef.h>
-
-               .set    noreorder
-/*
- * Parameter: a0 - physical address to watch
- *            a1 - set bit #1 to trap on load references
- *                     bit #0 to trap on store references
- * Results  : none
- */
-               LEAF(__watch_set)
-               ori     a0, 7
-               xori    a0, 7
-               or      a0, a1
-               mtc0    a0, CP0_WATCHLO
-               sd      a0, watch_savelo
-               dsrl32  a0, a0, 0
-
-               jr      ra
-                mtc0   zero, CP0_WATCHHI
-               END(__watch_set)
-
-/*
- * Parameter: none
- * Results  : none
- */
-               LEAF(__watch_clear)
-               jr      ra
-                mtc0   zero, CP0_WATCHLO
-               END(__watch_clear)
-
-/*
- * Parameter: none
- * Results  : none
- */
-               LEAF(__watch_reenable)
-               ld      t0, watch_savelo
-               jr      ra
-                mtc0   t0, CP0_WATCHLO
-               END(__watch_reenable)
-
-/*
- * Saved value of the c0_watchlo register for watch_reenable()
- */
-               .local  watch_savelo
-               .comm   watch_savelo, 8, 8

diff --git a/include/asm-mips/watch.h b/include/asm-mips/watch.h
deleted file mode 100644 (file)
index 6aa90ca..0000000
--- a/include/asm-mips/watch.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 (C) 1996, 1997, 1998, 2000, 2001 by Ralf Baechle
- */
-#ifndef _ASM_WATCH_H
-#define _ASM_WATCH_H
-
-#include <linux/linkage.h>
-
-/*
- * Types of reference for watch_set()
- */
-enum wref_type {
-       wr_save = 1,
-       wr_load = 2
-};
-
-extern asmlinkage void __watch_set(unsigned long addr, enum wref_type ref);
-extern asmlinkage void __watch_clear(void);
-extern asmlinkage void __watch_reenable(void);
-
-#define watch_set(addr, ref)                                   \
-       if (cpu_has_watch)                                      \
-               __watch_set(addr, ref)
-#define watch_clear()                                          \
-       if (cpu_has_watch)                                      \
-               __watch_clear()
-#define watch_reenable()                                       \
-       if (cpu_has_watch)                                      \
-               __watch_reenable()
-
-#endif /* _ASM_WATCH_H */