7 files changed, 32 insertions, 390 deletions

diff --git a/arch/sparc64/kernel/asm-offsets.c b/arch/sparc64/kernel/asm-offsets.c
new file mode 100644
index 000000000000..9e263112a6e2
--- /dev/null
+++ b/arch/sparc64/kernel/asm-offsets.c
@@ -0,0 +1 @@
+/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 66255434128a..7d10b0397091 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -607,11 +607,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
         struct thread_info *t = p->thread_info;
         char *child_trap_frame;
 
-#ifdef CONFIG_DEBUG_SPINLOCK
-        p->thread.smp_lock_count = 0;
-        p->thread.smp_lock_pc = 0;
-#endif
-
         /* Calculate offset to stack_frame & pt_regs */
         child_trap_frame = ((char *)t) + (THREAD_SIZE - (TRACEREG_SZ+STACKFRAME_SZ));
         memcpy(child_trap_frame, (((struct sparc_stackf *)regs)-1), (TRACEREG_SZ+STACKFRAME_SZ));
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 7d9a0f6c437d..cbb5e59824e5 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -115,17 +115,12 @@ EXPORT_PER_CPU_SYMBOL(__cpu_data);
 
 /* used by various drivers */
 #ifdef CONFIG_SMP
-#ifndef CONFIG_DEBUG_SPINLOCK
 /* Out of line rw-locking implementation. */
 EXPORT_SYMBOL(__read_lock);
 EXPORT_SYMBOL(__read_unlock);
 EXPORT_SYMBOL(__write_lock);
 EXPORT_SYMBOL(__write_unlock);
 EXPORT_SYMBOL(__write_trylock);
-/* Out of line spin-locking implementation. */
-EXPORT_SYMBOL(_raw_spin_lock);
-EXPORT_SYMBOL(_raw_spin_lock_flags);
-#endif
 
 /* Hard IRQ locking */
 EXPORT_SYMBOL(synchronize_irq);
diff --git a/arch/sparc64/lib/Makefile b/arch/sparc64/lib/Makefile
index 40dbeec7e5d6..d968aebe83b2 100644
--- a/arch/sparc64/lib/Makefile
+++ b/arch/sparc64/lib/Makefile
@@ -14,7 +14,6 @@ lib-y := PeeCeeI.o copy_page.o clear_page.o strlen.o strncmp.o \
          copy_in_user.o user_fixup.o memmove.o \
          mcount.o ipcsum.o rwsem.o xor.o find_bit.o delay.o
 
-lib-$(CONFIG_DEBUG_SPINLOCK) += debuglocks.o
 lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
 
 obj-y += iomap.o
diff --git a/arch/sparc64/lib/debuglocks.c b/arch/sparc64/lib/debuglocks.c
deleted file mode 100644
index f5f0b5586f01..000000000000
--- a/arch/sparc64/lib/debuglocks.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/* $Id: debuglocks.c,v 1.9 2001/11/17 00:10:48 davem Exp $
- * debuglocks.c: Debugging versions of SMP locking primitives.
- *
- * Copyright (C) 1998 David S. Miller (davem@redhat.com)
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <asm/system.h>
-
-#ifdef CONFIG_SMP
-
-static inline void show (char *str, spinlock_t *lock, unsigned long caller)
-{
-        int cpu = smp_processor_id();
-
-        printk("%s(%p) CPU#%d stuck at %08x, owner PC(%08x):CPU(%x)\n",
-               str, lock, cpu, (unsigned int) caller,
-               lock->owner_pc, lock->owner_cpu);
-}
-
-static inline void show_read (char *str, rwlock_t *lock, unsigned long caller)
-{
-        int cpu = smp_processor_id();
-
-        printk("%s(%p) CPU#%d stuck at %08x, writer PC(%08x):CPU(%x)\n",
-               str, lock, cpu, (unsigned int) caller,
-               lock->writer_pc, lock->writer_cpu);
-}
-
-static inline void show_write (char *str, rwlock_t *lock, unsigned long caller)
-{
-        int cpu = smp_processor_id();
-        int i;
-
-        printk("%s(%p) CPU#%d stuck at %08x\n",
-               str, lock, cpu, (unsigned int) caller);
-        printk("Writer: PC(%08x):CPU(%x)\n",
-               lock->writer_pc, lock->writer_cpu);
-        printk("Readers:");
-        for (i = 0; i < NR_CPUS; i++)
-                if (lock->reader_pc[i])
-                        printk(" %d[%08x]", i, lock->reader_pc[i]);
-        printk("\n");
-}
-
-#undef INIT_STUCK
-#define INIT_STUCK 100000000
-
-void _do_spin_lock(spinlock_t *lock, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int cpu = get_cpu();
-        int shown = 0;
-
-again:
-        __asm__ __volatile__("ldstub [%1], %0"
-                             : "=r" (val)
-                             : "r" (&(lock->lock))
-                             : "memory");
-        membar_storeload_storestore();
-        if (val) {
-                while (lock->lock) {
-                        if (!--stuck) {
-                                if (shown++ <= 2)
-                                        show(str, lock, caller);
-                                stuck = INIT_STUCK;
-                        }
-                        rmb();
-                }
-                goto again;
-        }
-        lock->owner_pc = ((unsigned int)caller);
-        lock->owner_cpu = cpu;
-        current->thread.smp_lock_count++;
-        current->thread.smp_lock_pc = ((unsigned int)caller);
-
-        put_cpu();
-}
-
-int _do_spin_trylock(spinlock_t *lock, unsigned long caller)
-{
-        unsigned long val;
-        int cpu = get_cpu();
-
-        __asm__ __volatile__("ldstub [%1], %0"
-                             : "=r" (val)
-                             : "r" (&(lock->lock))
-                             : "memory");
-        membar_storeload_storestore();
-        if (!val) {
-                lock->owner_pc = ((unsigned int)caller);
-                lock->owner_cpu = cpu;
-                current->thread.smp_lock_count++;
-                current->thread.smp_lock_pc = ((unsigned int)caller);
-        }
-
-        put_cpu();
-
-        return val == 0;
-}
-
-void _do_spin_unlock(spinlock_t *lock)
-{
-        lock->owner_pc = 0;
-        lock->owner_cpu = NO_PROC_ID;
-        membar_storestore_loadstore();
-        lock->lock = 0;
-        current->thread.smp_lock_count--;
-}
-
-/* Keep INIT_STUCK the same... */
-
-void _do_read_lock(rwlock_t *rw, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int cpu = get_cpu();
-        int shown = 0;
-
-wlock_again:
-        /* Wait for any writer to go away.  */
-        while (((long)(rw->lock)) < 0) {
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_read(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                rmb();
-        }
-        /* Try once to increment the counter.  */
-        __asm__ __volatile__(
-"       ldx             [%0], %%g1\n"
-"       brlz,a,pn       %%g1, 2f\n"
-"        mov            1, %0\n"
-"       add             %%g1, 1, %%g7\n"
-"       casx            [%0], %%g1, %%g7\n"
-"       sub             %%g1, %%g7, %0\n"
-"2:"    : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g1", "g7", "memory");
-        membar_storeload_storestore();
-        if (val)
-                goto wlock_again;
-        rw->reader_pc[cpu] = ((unsigned int)caller);
-        current->thread.smp_lock_count++;
-        current->thread.smp_lock_pc = ((unsigned int)caller);
-
-        put_cpu();
-}
-
-void _do_read_unlock(rwlock_t *rw, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int cpu = get_cpu();
-        int shown = 0;
-
-        /* Drop our identity _first_. */
-        rw->reader_pc[cpu] = 0;
-        current->thread.smp_lock_count--;
-runlock_again:
-        /* Spin trying to decrement the counter using casx.  */
-        __asm__ __volatile__(
-"       membar  #StoreLoad | #LoadLoad\n"
-"       ldx     [%0], %%g1\n"
-"       sub     %%g1, 1, %%g7\n"
-"       casx    [%0], %%g1, %%g7\n"
-"       membar  #StoreLoad | #StoreStore\n"
-"       sub     %%g1, %%g7, %0\n"
-        : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g1", "g7", "memory");
-        if (val) {
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_read(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                goto runlock_again;
-        }
-
-        put_cpu();
-}
-
-void _do_write_lock(rwlock_t *rw, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int cpu = get_cpu();
-        int shown = 0;
-
-wlock_again:
-        /* Spin while there is another writer. */
-        while (((long)rw->lock) < 0) {
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_write(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                rmb();
-        }
-
-        /* Try to acuire the write bit.  */
-        __asm__ __volatile__(
-"       mov     1, %%g3\n"
-"       sllx    %%g3, 63, %%g3\n"
-"       ldx     [%0], %%g1\n"
-"       brlz,pn %%g1, 1f\n"
-"        or     %%g1, %%g3, %%g7\n"
-"       casx    [%0], %%g1, %%g7\n"
-"       membar  #StoreLoad | #StoreStore\n"
-"       ba,pt   %%xcc, 2f\n"
-"        sub    %%g1, %%g7, %0\n"
-"1:     mov     1, %0\n"
-"2:"    : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g3", "g1", "g7", "memory");
-        if (val) {
-                /* We couldn't get the write bit. */
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_write(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                goto wlock_again;
-        }
-        if ((rw->lock & ((1UL<<63)-1UL)) != 0UL) {
-                /* Readers still around, drop the write
-                 * lock, spin, and try again.
-                 */
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_write(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                __asm__ __volatile__(
-"               mov     1, %%g3\n"
-"               sllx    %%g3, 63, %%g3\n"
-"1:             ldx     [%0], %%g1\n"
-"               andn    %%g1, %%g3, %%g7\n"
-"               casx    [%0], %%g1, %%g7\n"
-"               cmp     %%g1, %%g7\n"
-"               membar  #StoreLoad | #StoreStore\n"
-"               bne,pn  %%xcc, 1b\n"
-"                nop"
-                : /* no outputs */
-                : "r" (&(rw->lock))
-                : "g3", "g1", "g7", "cc", "memory");
-                while(rw->lock != 0) {
-                        if (!--stuck) {
-                                if (shown++ <= 2)
-                                        show_write(str, rw, caller);
-                                stuck = INIT_STUCK;
-                        }
-                        rmb();
-                }
-                goto wlock_again;
-        }
-
-        /* We have it, say who we are. */
-        rw->writer_pc = ((unsigned int)caller);
-        rw->writer_cpu = cpu;
-        current->thread.smp_lock_count++;
-        current->thread.smp_lock_pc = ((unsigned int)caller);
-
-        put_cpu();
-}
-
-void _do_write_unlock(rwlock_t *rw, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int shown = 0;
-
-        /* Drop our identity _first_ */
-        rw->writer_pc = 0;
-        rw->writer_cpu = NO_PROC_ID;
-        current->thread.smp_lock_count--;
-wlock_again:
-        __asm__ __volatile__(
-"       membar  #StoreLoad | #LoadLoad\n"
-"       mov     1, %%g3\n"
-"       sllx    %%g3, 63, %%g3\n"
-"       ldx     [%0], %%g1\n"
-"       andn    %%g1, %%g3, %%g7\n"
-"       casx    [%0], %%g1, %%g7\n"
-"       membar  #StoreLoad | #StoreStore\n"
-"       sub     %%g1, %%g7, %0\n"
-        : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g3", "g1", "g7", "memory");
-        if (val) {
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_write("write_unlock", rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                goto wlock_again;
-        }
-}
-
-int _do_write_trylock(rwlock_t *rw, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int cpu = get_cpu();
-
-        /* Try to acuire the write bit.  */
-        __asm__ __volatile__(
-"       mov     1, %%g3\n"
-"       sllx    %%g3, 63, %%g3\n"
-"       ldx     [%0], %%g1\n"
-"       brlz,pn %%g1, 1f\n"
-"        or     %%g1, %%g3, %%g7\n"
-"       casx    [%0], %%g1, %%g7\n"
-"       membar  #StoreLoad | #StoreStore\n"
-"       ba,pt   %%xcc, 2f\n"
-"        sub    %%g1, %%g7, %0\n"
-"1:     mov     1, %0\n"
-"2:"    : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g3", "g1", "g7", "memory");
-
-        if (val) {
-                put_cpu();
-                return 0;
-        }
-
-        if ((rw->lock & ((1UL<<63)-1UL)) != 0UL) {
-                /* Readers still around, drop the write
-                 * lock, return failure.
-                 */
-                __asm__ __volatile__(
-"               mov     1, %%g3\n"
-"               sllx    %%g3, 63, %%g3\n"
-"1:             ldx     [%0], %%g1\n"
-"               andn    %%g1, %%g3, %%g7\n"
-"               casx    [%0], %%g1, %%g7\n"
-"               cmp     %%g1, %%g7\n"
-"               membar  #StoreLoad | #StoreStore\n"
-"               bne,pn  %%xcc, 1b\n"
-"                nop"
-                : /* no outputs */
-                : "r" (&(rw->lock))
-                : "g3", "g1", "g7", "cc", "memory");
-
-                put_cpu();
-
-                return 0;
-        }
-
-        /* We have it, say who we are. */
-        rw->writer_pc = ((unsigned int)caller);
-        rw->writer_cpu = cpu;
-        current->thread.smp_lock_count++;
-        current->thread.smp_lock_pc = ((unsigned int)caller);
-
-        put_cpu();
-
-        return 1;
-}
-
-#endif /* CONFIG_SMP */
diff --git a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c
index cac0a1cf0050..be0a054e3ed6 100644
--- a/arch/sparc64/solaris/ioctl.c
+++ b/arch/sparc64/solaris/ioctl.c
@@ -24,6 +24,7 @@
 #include <linux/netdevice.h>
 #include <linux/mtio.h>
 #include <linux/time.h>
+#include <linux/rcupdate.h>
 #include <linux/compat.h>
 
 #include <net/sock.h>
@@ -293,16 +294,18 @@ static struct module_info {
 static inline int solaris_sockmod(unsigned int fd, unsigned int cmd, u32 arg)
 {
         struct inode *ino;
+        struct fdtable *fdt;
         /* I wonder which of these tests are superfluous... --patrik */
-        spin_lock(&current->files->file_lock);
-        if (! current->files->fd[fd] ||
-            ! current->files->fd[fd]->f_dentry ||
-            ! (ino = current->files->fd[fd]->f_dentry->d_inode) ||
+        rcu_read_lock();
+        fdt = files_fdtable(current->files);
+        if (! fdt->fd[fd] ||
+            ! fdt->fd[fd]->f_dentry ||
+            ! (ino = fdt->fd[fd]->f_dentry->d_inode) ||
             ! S_ISSOCK(ino->i_mode)) {
-                spin_unlock(&current->files->file_lock);
+                rcu_read_unlock();
                 return TBADF;
         }
-        spin_unlock(&current->files->file_lock);
+        rcu_read_unlock();
         
         switch (cmd & 0xff) {
         case 109: /* SI_SOCKPARAMS */
diff --git a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
index 022c80f43392..aaad29c35c83 100644
--- a/arch/sparc64/solaris/timod.c
+++ b/arch/sparc64/solaris/timod.c
@@ -143,9 +143,11 @@ static struct T_primsg *timod_mkctl(int size)
 static void timod_wake_socket(unsigned int fd)
 {
         struct socket *sock;
+        struct fdtable *fdt;
 
         SOLD("wakeing socket");
-        sock = SOCKET_I(current->files->fd[fd]->f_dentry->d_inode);
+        fdt = files_fdtable(current->files);
+        sock = SOCKET_I(fdt->fd[fd]->f_dentry->d_inode);
         wake_up_interruptible(&sock->wait);
         read_lock(&sock->sk->sk_callback_lock);
         if (sock->fasync_list && !test_bit(SOCK_ASYNC_WAITDATA, &sock->flags))
@@ -157,9 +159,11 @@ static void timod_wake_socket(unsigned int fd)
 static void timod_queue(unsigned int fd, struct T_primsg *it)
 {
         struct sol_socket_struct *sock;
+        struct fdtable *fdt;
 
         SOLD("queuing primsg");
-        sock = (struct sol_socket_struct *)current->files->fd[fd]->private_data;
+        fdt = files_fdtable(current->files);
+        sock = (struct sol_socket_struct *)fdt->fd[fd]->private_data;
         it->next = sock->pfirst;
         sock->pfirst = it;
         if (!sock->plast)
@@ -171,9 +175,11 @@ static void timod_queue(unsigned int fd, struct T_primsg *it)
 static void timod_queue_end(unsigned int fd, struct T_primsg *it)
 {
         struct sol_socket_struct *sock;
+        struct fdtable *fdt;
 
         SOLD("queuing primsg at end");
-        sock = (struct sol_socket_struct *)current->files->fd[fd]->private_data;
+        fdt = files_fdtable(current->files);
+        sock = (struct sol_socket_struct *)fdt->fd[fd]->private_data;
         it->next = NULL;
         if (sock->plast)
                 sock->plast->next = it;
@@ -344,6 +350,7 @@ int timod_putmsg(unsigned int fd, char __user *ctl_buf, int ctl_len,
         char *buf;
         struct file *filp;
         struct inode *ino;
+        struct fdtable *fdt;
         struct sol_socket_struct *sock;
         mm_segment_t old_fs = get_fs();
         long args[6];
@@ -351,7 +358,9 @@ int timod_putmsg(unsigned int fd, char __user *ctl_buf, int ctl_len,
                 (int (*)(int, unsigned long __user *))SYS(socketcall);
         int (*sys_sendto)(int, void __user *, size_t, unsigned, struct sockaddr __user *, int) =
                 (int (*)(int, void __user *, size_t, unsigned, struct sockaddr __user *, int))SYS(sendto);
-        filp = current->files->fd[fd];
+
+        fdt = files_fdtable(current->files);
+        filp = fdt->fd[fd];
         ino = filp->f_dentry->d_inode;
         sock = (struct sol_socket_struct *)filp->private_data;
         SOLD("entry");
@@ -620,6 +629,7 @@ int timod_getmsg(unsigned int fd, char __user *ctl_buf, int ctl_maxlen, s32 __us
         int oldflags;
         struct file *filp;
         struct inode *ino;
+        struct fdtable *fdt;
         struct sol_socket_struct *sock;
         struct T_unitdata_ind udi;
         mm_segment_t old_fs = get_fs();
@@ -632,7 +642,8 @@ int timod_getmsg(unsigned int fd, char __user *ctl_buf, int ctl_maxlen, s32 __us
         
         SOLD("entry");
         SOLDD(("%u %p %d %p %p %d %p %d\n", fd, ctl_buf, ctl_maxlen, ctl_len, data_buf, data_maxlen, data_len, *flags_p));
-        filp = current->files->fd[fd];
+        fdt = files_fdtable(current->files);
+        filp = fdt->fd[fd];
         ino = filp->f_dentry->d_inode;
         sock = (struct sol_socket_struct *)filp->private_data;
         SOLDD(("%p %p\n", sock->pfirst, sock->pfirst ? sock->pfirst->next : NULL));
@@ -844,12 +855,14 @@ asmlinkage int solaris_getmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
         int __user *flgptr;
         int flags;
         int error = -EBADF;
+        struct fdtable *fdt;
 
         SOLD("entry");
         lock_kernel();
         if(fd >= NR_OPEN) goto out;
 
-        filp = current->files->fd[fd];
+        fdt = files_fdtable(current->files);
+        filp = fdt->fd[fd];
         if(!filp) goto out;
 
         ino = filp->f_dentry->d_inode;
@@ -910,12 +923,14 @@ asmlinkage int solaris_putmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
         struct strbuf ctl, dat;
         int flags = (int) arg3;
         int error = -EBADF;
+        struct fdtable *fdt;
 
         SOLD("entry");
         lock_kernel();
         if(fd >= NR_OPEN) goto out;
 
-        filp = current->files->fd[fd];
+        fdt = files_fdtable(current->files);
+        filp = fdt->fd[fd];
         if(!filp) goto out;
 
         ino = filp->f_dentry->d_inode;