7 files changed, 17 insertions, 230 deletions

diff --git a/arch/frv/kernel/Makefile b/arch/frv/kernel/Makefile
index e8f73ed28b5..c36f70b6699 100644
--- a/arch/frv/kernel/Makefile
+++ b/arch/frv/kernel/Makefile
@@ -9,7 +9,7 @@ extra-y:= head.o init_task.o vmlinux.lds
 
 obj-y := $(heads-y) entry.o entry-table.o break.o switch_to.o kernel_thread.o \
          kernel_execve.o process.o traps.o ptrace.o signal.o dma.o \
-         sys_frv.o time.o semaphore.o setup.o frv_ksyms.o \
+         sys_frv.o time.o setup.o frv_ksyms.o \
          debug-stub.o irq.o sleep.o uaccess.o
 
 obj-$(CONFIG_GDBSTUB)           += gdb-stub.o gdb-io.o
diff --git a/arch/frv/kernel/frv_ksyms.c b/arch/frv/kernel/frv_ksyms.c
index f772704b3d2..0316b3c50ef 100644
--- a/arch/frv/kernel/frv_ksyms.c
+++ b/arch/frv/kernel/frv_ksyms.c
@@ -12,7 +12,6 @@
 #include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
 #include <asm/checksum.h>
 #include <asm/hardirq.h>
 #include <asm/cacheflush.h>
diff --git a/arch/frv/kernel/semaphore.c b/arch/frv/kernel/semaphore.c
deleted file mode 100644
index 7ee3a147b47..00000000000
--- a/arch/frv/kernel/semaphore.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* semaphore.c: FR-V semaphores
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from lib/rwsem-spinlock.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/sched.h>
-#include <linux/module.h>
-#include <asm/semaphore.h>
-
-struct sem_waiter {
-        struct list_head        list;
-        struct task_struct      *task;
-};
-
-#ifdef CONFIG_DEBUG_SEMAPHORE
-void semtrace(struct semaphore *sem, const char *str)
-{
-        if (sem->debug)
-                printk("[%d] %s({%d,%d})\n",
-                       current->pid,
-                       str,
-                       sem->counter,
-                       list_empty(&sem->wait_list) ? 0 : 1);
-}
-#else
-#define semtrace(SEM,STR) do { } while(0)
-#endif
-
-/*
- * wait for a token to be granted from a semaphore
- * - entered with lock held and interrupts disabled
- */
-void __down(struct semaphore *sem, unsigned long flags)
-{
-        struct task_struct *tsk = current;
-        struct sem_waiter waiter;
-
-        semtrace(sem, "Entering __down");
-
-        /* set up my own style of waitqueue */
-        waiter.task = tsk;
-        get_task_struct(tsk);
-
-        list_add_tail(&waiter.list, &sem->wait_list);
-
-        /* we don't need to touch the semaphore struct anymore */
-        spin_unlock_irqrestore(&sem->wait_lock, flags);
-
-        /* wait to be given the semaphore */
-        set_task_state(tsk, TASK_UNINTERRUPTIBLE);
-
-        for (;;) {
-                if (list_empty(&waiter.list))
-                        break;
-                schedule();
-                set_task_state(tsk, TASK_UNINTERRUPTIBLE);
-        }
-
-        tsk->state = TASK_RUNNING;
-        semtrace(sem, "Leaving __down");
-}
-
-EXPORT_SYMBOL(__down);
-
-/*
- * interruptibly wait for a token to be granted from a semaphore
- * - entered with lock held and interrupts disabled
- */
-int __down_interruptible(struct semaphore *sem, unsigned long flags)
-{
-        struct task_struct *tsk = current;
-        struct sem_waiter waiter;
-        int ret;
-
-        semtrace(sem,"Entering __down_interruptible");
-
-        /* set up my own style of waitqueue */
-        waiter.task = tsk;
-        get_task_struct(tsk);
-
-        list_add_tail(&waiter.list, &sem->wait_list);
-
-        /* we don't need to touch the semaphore struct anymore */
-        set_task_state(tsk, TASK_INTERRUPTIBLE);
-
-        spin_unlock_irqrestore(&sem->wait_lock, flags);
-
-        /* wait to be given the semaphore */
-        ret = 0;
-        for (;;) {
-                if (list_empty(&waiter.list))
-                        break;
-                if (unlikely(signal_pending(current)))
-                        goto interrupted;
-                schedule();
-                set_task_state(tsk, TASK_INTERRUPTIBLE);
-        }
-
- out:
-        tsk->state = TASK_RUNNING;
-        semtrace(sem, "Leaving __down_interruptible");
-        return ret;
-
- interrupted:
-        spin_lock_irqsave(&sem->wait_lock, flags);
-
-        if (!list_empty(&waiter.list)) {
-                list_del(&waiter.list);
-                ret = -EINTR;
-        }
-
-        spin_unlock_irqrestore(&sem->wait_lock, flags);
-        if (ret == -EINTR)
-                put_task_struct(current);
-        goto out;
-}
-
-EXPORT_SYMBOL(__down_interruptible);
-
-/*
- * release a single token back to a semaphore
- * - entered with lock held and interrupts disabled
- */
-void __up(struct semaphore *sem)
-{
-        struct task_struct *tsk;
-        struct sem_waiter *waiter;
-
-        semtrace(sem,"Entering __up");
-
-        /* grant the token to the process at the front of the queue */
-        waiter = list_entry(sem->wait_list.next, struct sem_waiter, list);
-
-        /* We must be careful not to touch 'waiter' after we set ->task = NULL.
-         * It is allocated on the waiter's stack and may become invalid at
-         * any time after that point (due to a wakeup from another source).
-         */
-        list_del_init(&waiter->list);
-        tsk = waiter->task;
-        mb();
-        waiter->task = NULL;
-        wake_up_process(tsk);
-        put_task_struct(tsk);
-
-        semtrace(sem,"Leaving __up");
-}
-
-EXPORT_SYMBOL(__up);
diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c
index 7089c2428b3..a40df80b2eb 100644
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
@@ -49,7 +49,7 @@ asmlinkage void insn_access_error(unsigned long esfr1, unsigned long epcr0, unsi
         info.si_signo   = SIGSEGV;
         info.si_code    = SEGV_ACCERR;
         info.si_errno   = 0;
-        info.si_addr    = (void *) ((epcr0 & EPCR0_V) ? (epcr0 & EPCR0_PC) : __frame->pc);
+        info.si_addr    = (void __user *) ((epcr0 & EPCR0_V) ? (epcr0 & EPCR0_PC) : __frame->pc);
 
         force_sig_info(info.si_signo, &info, current);
 } /* end insn_access_error() */
@@ -73,7 +73,7 @@ asmlinkage void illegal_instruction(unsigned long esfr1, unsigned long epcr0, un
                       epcr0, esr0, esfr1);
 
         info.si_errno   = 0;
-        info.si_addr    = (void *) ((epcr0 & EPCR0_V) ? (epcr0 & EPCR0_PC) : __frame->pc);
+        info.si_addr    = (void __user *) ((epcr0 & EPCR0_V) ? (epcr0 & EPCR0_PC) : __frame->pc);
 
         switch (__frame->tbr & TBR_TT) {
         case TBR_TT_ILLEGAL_INSTR:
@@ -111,7 +111,8 @@ asmlinkage void atomic_operation(unsigned long esfr1, unsigned long epcr0,
                                  unsigned long esr0)
 {
         static DEFINE_SPINLOCK(atomic_op_lock);
-        unsigned long x, y, z, *p;
+        unsigned long x, y, z;
+        unsigned long __user *p;
         mm_segment_t oldfs;
         siginfo_t info;
         int ret;
@@ -128,7 +129,7 @@ asmlinkage void atomic_operation(unsigned long esfr1, unsigned long epcr0,
                  * u32 __atomic_user_cmpxchg32(u32 *ptr, u32 test, u32 new)
                  */
         case TBR_TT_ATOMIC_CMPXCHG32:
-                p = (unsigned long *) __frame->gr8;
+                p = (unsigned long __user *) __frame->gr8;
                 x = __frame->gr9;
                 y = __frame->gr10;
 
@@ -158,7 +159,7 @@ asmlinkage void atomic_operation(unsigned long esfr1, unsigned long epcr0,
                  * u32 __atomic_kernel_xchg32(void *v, u32 new)
                  */
         case TBR_TT_ATOMIC_XCHG32:
-                p = (unsigned long *) __frame->gr8;
+                p = (unsigned long __user *) __frame->gr8;
                 y = __frame->gr9;
 
                 for (;;) {
@@ -181,7 +182,7 @@ asmlinkage void atomic_operation(unsigned long esfr1, unsigned long epcr0,
                  * ulong __atomic_kernel_XOR_return(ulong i, ulong *v)
                  */
         case TBR_TT_ATOMIC_XOR:
-                p = (unsigned long *) __frame->gr8;
+                p = (unsigned long __user *) __frame->gr8;
                 x = __frame->gr9;
 
                 for (;;) {
@@ -205,7 +206,7 @@ asmlinkage void atomic_operation(unsigned long esfr1, unsigned long epcr0,
                  * ulong __atomic_kernel_OR_return(ulong i, ulong *v)
                  */
         case TBR_TT_ATOMIC_OR:
-                p = (unsigned long *) __frame->gr8;
+                p = (unsigned long __user *) __frame->gr8;
                 x = __frame->gr9;
 
                 for (;;) {
@@ -229,7 +230,7 @@ asmlinkage void atomic_operation(unsigned long esfr1, unsigned long epcr0,
                  * ulong __atomic_kernel_AND_return(ulong i, ulong *v)
                  */
         case TBR_TT_ATOMIC_AND:
-                p = (unsigned long *) __frame->gr8;
+                p = (unsigned long __user *) __frame->gr8;
                 x = __frame->gr9;
 
                 for (;;) {
@@ -253,7 +254,7 @@ asmlinkage void atomic_operation(unsigned long esfr1, unsigned long epcr0,
                  * int __atomic_user_sub_return(atomic_t *v, int i)
                  */
         case TBR_TT_ATOMIC_SUB:
-                p = (unsigned long *) __frame->gr8;
+                p = (unsigned long __user *) __frame->gr8;
                 x = __frame->gr9;
 
                 for (;;) {
@@ -277,7 +278,7 @@ asmlinkage void atomic_operation(unsigned long esfr1, unsigned long epcr0,
                  * int __atomic_user_add_return(atomic_t *v, int i)
                  */
         case TBR_TT_ATOMIC_ADD:
-                p = (unsigned long *) __frame->gr8;
+                p = (unsigned long __user *) __frame->gr8;
                 x = __frame->gr9;
 
                 for (;;) {
@@ -322,7 +323,7 @@ error:
         info.si_signo   = SIGSEGV;
         info.si_code    = SEGV_ACCERR;
         info.si_errno   = 0;
-        info.si_addr    = (void *) __frame->pc;
+        info.si_addr    = (void __user *) __frame->pc;
 
         force_sig_info(info.si_signo, &info, current);
 }
@@ -343,7 +344,7 @@ asmlinkage void media_exception(unsigned long msr0, unsigned long msr1)
         info.si_signo   = SIGFPE;
         info.si_code    = FPE_MDAOVF;
         info.si_errno   = 0;
-        info.si_addr    = (void *) __frame->pc;
+        info.si_addr    = (void __user *) __frame->pc;
 
         force_sig_info(info.si_signo, &info, current);
 } /* end media_exception() */
@@ -383,7 +384,7 @@ asmlinkage void memory_access_exception(unsigned long esr0,
         info.si_addr    = NULL;
 
         if ((esr0 & (ESRx_VALID | ESR0_EAV)) == (ESRx_VALID | ESR0_EAV))
-                info.si_addr = (void *) ear0;
+                info.si_addr = (void __user *) ear0;
 
         force_sig_info(info.si_signo, &info, current);
 
@@ -412,7 +413,7 @@ asmlinkage void data_access_error(unsigned long esfr1, unsigned long esr15, unsi
         info.si_signo   = SIGSEGV;
         info.si_code    = SEGV_ACCERR;
         info.si_errno   = 0;
-        info.si_addr    = (void *)
+        info.si_addr    = (void __user *)
                 (((esr15 & (ESRx_VALID|ESR15_EAV)) == (ESRx_VALID|ESR15_EAV)) ? ear15 : 0);
 
         force_sig_info(info.si_signo, &info, current);
@@ -446,7 +447,7 @@ asmlinkage void division_exception(unsigned long esfr1, unsigned long esr0, unsi
         info.si_signo   = SIGFPE;
         info.si_code    = FPE_INTDIV;
         info.si_errno   = 0;
-        info.si_addr    = (void *) __frame->pc;
+        info.si_addr    = (void __user *) __frame->pc;
 
         force_sig_info(info.si_signo, &info, current);
 } /* end division_exception() */
diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h
index 7481797ab38..0c7bf39dc72 100644
--- a/arch/frv/mb93090-mb00/pci-frv.h
+++ b/arch/frv/mb93090-mb00/pci-frv.h
@@ -17,8 +17,6 @@
 #define PCI_PROBE_BIOS          0x0001
 #define PCI_PROBE_CONF1         0x0002
 #define PCI_PROBE_CONF2         0x0004
-#define PCI_NO_SORT             0x0100
-#define PCI_BIOS_SORT           0x0200
 #define PCI_NO_CHECKS           0x0400
 #define PCI_ASSIGN_ROMS         0x1000
 #define PCI_BIOS_IRQ_SCAN       0x2000
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index 6d51f133fb2..f003cfa68b7 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -199,58 +199,6 @@ static struct pci_ops * __init pci_check_direct(void)
 }
 
 /*
- * Several buggy motherboards address only 16 devices and mirror
- * them to next 16 IDs. We try to detect this `feature' on all
- * primary buses (those containing host bridges as they are
- * expected to be unique) and remove the ghost devices.
- */
-
-static void __init pcibios_fixup_ghosts(struct pci_bus *b)
-{
-        struct list_head *ln, *mn;
-        struct pci_dev *d, *e;
-        int mirror = PCI_DEVFN(16,0);
-        int seen_host_bridge = 0;
-        int i;
-
-        for (ln=b->devices.next; ln != &b->devices; ln=ln->next) {
-                d = pci_dev_b(ln);
-                if ((d->class >> 8) == PCI_CLASS_BRIDGE_HOST)
-                        seen_host_bridge++;
-                for (mn=ln->next; mn != &b->devices; mn=mn->next) {
-                        e = pci_dev_b(mn);
-                        if (e->devfn != d->devfn + mirror ||
-                            e->vendor != d->vendor ||
-                            e->device != d->device ||
-                            e->class != d->class)
-                                continue;
-                        for(i=0; i<PCI_NUM_RESOURCES; i++)
-                                if (e->resource[i].start != d->resource[i].start ||
-                                    e->resource[i].end != d->resource[i].end ||
-                                    e->resource[i].flags != d->resource[i].flags)
-                                        continue;
-                        break;
-                }
-                if (mn == &b->devices)
-                        return;
-        }
-        if (!seen_host_bridge)
-                return;
-        printk("PCI: Ignoring ghost devices on bus %02x\n", b->number);
-
-        ln = &b->devices;
-        while (ln->next != &b->devices) {
-                d = pci_dev_b(ln->next);
-                if (d->devfn >= mirror) {
-                        list_del(&d->global_list);
-                        list_del(&d->bus_list);
-                        kfree(d);
-                } else
-                        ln = ln->next;
-        }
-}
-
-/*
  * Discover remaining PCI buses in case there are peer host bridges.
  * We use the number of last PCI bus provided by the PCI BIOS.
  */
@@ -356,7 +304,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
 #if 0
         printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);
 #endif
-        pcibios_fixup_ghosts(bus);
         pci_read_bridge_bases(bus);
 
         if (bus->number == 0) {
diff --git a/arch/frv/mm/highmem.c b/arch/frv/mm/highmem.c
index 7f77db7fabc..eadd0765807 100644
--- a/arch/frv/mm/highmem.c
+++ b/arch/frv/mm/highmem.c
@@ -36,6 +36,3 @@ struct page *kmap_atomic_to_page(void *ptr)
 {
         return virt_to_page(ptr);
 }
-
-
-EXPORT_SYMBOL(kmap_atomic_to_page);