7 files changed, 76 insertions, 76 deletions

diff --git a/arch/alpha/include/asm/core_t2.h b/arch/alpha/include/asm/core_t2.h
index 46bfff58f670..471c07292e0b 100644
--- a/arch/alpha/include/asm/core_t2.h
+++ b/arch/alpha/include/asm/core_t2.h
@@ -435,7 +435,7 @@ extern inline void t2_outl(u32 b, unsigned long addr)
         set_hae(msb); \
 }
 
-extern spinlock_t t2_hae_lock;
+extern raw_spinlock_t t2_hae_lock;
 
 /*
  * NOTE: take T2_DENSE_MEM off in each readX/writeX routine, since
@@ -448,12 +448,12 @@ __EXTERN_INLINE u8 t2_readb(const volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long result, msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         result = *(vip) ((addr << 5) + T2_SPARSE_MEM + 0x00);
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
         return __kernel_extbl(result, addr & 3);
 }
 
@@ -462,12 +462,12 @@ __EXTERN_INLINE u16 t2_readw(const volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long result, msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         result = *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x08);
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
         return __kernel_extwl(result, addr & 3);
 }
 
@@ -480,12 +480,12 @@ __EXTERN_INLINE u32 t2_readl(const volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long result, msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         result = *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x18);
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
         return result & 0xffffffffUL;
 }
 
@@ -494,14 +494,14 @@ __EXTERN_INLINE u64 t2_readq(const volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long r0, r1, work, msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         work = (addr << 5) + T2_SPARSE_MEM + 0x18;
         r0 = *(vuip)(work);
         r1 = *(vuip)(work + (4 << 5));
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
         return r1 << 32 | r0;
 }
 
@@ -510,13 +510,13 @@ __EXTERN_INLINE void t2_writeb(u8 b, volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long msb, w;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         w = __kernel_insbl(b, addr & 3);
         *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x00) = w;
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
 }
 
 __EXTERN_INLINE void t2_writew(u16 b, volatile void __iomem *xaddr)
@@ -524,13 +524,13 @@ __EXTERN_INLINE void t2_writew(u16 b, volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long msb, w;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         w = __kernel_inswl(b, addr & 3);
         *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x08) = w;
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
 }
 
 /*
@@ -542,12 +542,12 @@ __EXTERN_INLINE void t2_writel(u32 b, volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x18) = b;
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
 }
 
 __EXTERN_INLINE void t2_writeq(u64 b, volatile void __iomem *xaddr)
@@ -555,14 +555,14 @@ __EXTERN_INLINE void t2_writeq(u64 b, volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long msb, work;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         work = (addr << 5) + T2_SPARSE_MEM + 0x18;
         *(vuip)work = b;
         *(vuip)(work + (4 << 5)) = b >> 32;
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
 }
 
 __EXTERN_INLINE void __iomem *t2_ioportmap(unsigned long addr)
diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
index 5c75c1b2352a..9baae8afe8a3 100644
--- a/arch/alpha/include/asm/elf.h
+++ b/arch/alpha/include/asm/elf.h
@@ -81,7 +81,6 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 #define ELF_DATA        ELFDATA2LSB
 #define ELF_ARCH        EM_ALPHA
 
-#define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       8192
 
 /* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
diff --git a/arch/alpha/include/asm/spinlock.h b/arch/alpha/include/asm/spinlock.h
index e38fb95cb335..d0faca1e992d 100644
--- a/arch/alpha/include/asm/spinlock.h
+++ b/arch/alpha/include/asm/spinlock.h
@@ -12,18 +12,18 @@
  * We make no fairness assumptions. They have a cost.
  */
 
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
-#define __raw_spin_is_locked(x) ((x)->lock != 0)
-#define __raw_spin_unlock_wait(x) \
+#define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
+#define arch_spin_is_locked(x)  ((x)->lock != 0)
+#define arch_spin_unlock_wait(x) \
                 do { cpu_relax(); } while ((x)->lock)
 
-static inline void __raw_spin_unlock(raw_spinlock_t * lock)
+static inline void arch_spin_unlock(arch_spinlock_t * lock)
 {
         mb();
         lock->lock = 0;
 }
 
-static inline void __raw_spin_lock(raw_spinlock_t * lock)
+static inline void arch_spin_lock(arch_spinlock_t * lock)
 {
         long tmp;
 
@@ -43,24 +43,24 @@ static inline void __raw_spin_lock(raw_spinlock_t * lock)
         : "m"(lock->lock) : "memory");
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         return !test_and_set_bit(0, &lock->lock);
 }
 
 /***********************************************************/
 
-static inline int __raw_read_can_lock(raw_rwlock_t *lock)
+static inline int arch_read_can_lock(arch_rwlock_t *lock)
 {
         return (lock->lock & 1) == 0;
 }
 
-static inline int __raw_write_can_lock(raw_rwlock_t *lock)
+static inline int arch_write_can_lock(arch_rwlock_t *lock)
 {
         return lock->lock == 0;
 }
 
-static inline void __raw_read_lock(raw_rwlock_t *lock)
+static inline void arch_read_lock(arch_rwlock_t *lock)
 {
         long regx;
 
@@ -80,7 +80,7 @@ static inline void __raw_read_lock(raw_rwlock_t *lock)
         : "m" (*lock) : "memory");
 }
 
-static inline void __raw_write_lock(raw_rwlock_t *lock)
+static inline void arch_write_lock(arch_rwlock_t *lock)
 {
         long regx;
 
@@ -100,7 +100,7 @@ static inline void __raw_write_lock(raw_rwlock_t *lock)
         : "m" (*lock) : "memory");
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t * lock)
+static inline int arch_read_trylock(arch_rwlock_t * lock)
 {
         long regx;
         int success;
@@ -122,7 +122,7 @@ static inline int __raw_read_trylock(raw_rwlock_t * lock)
         return success;
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t * lock)
+static inline int arch_write_trylock(arch_rwlock_t * lock)
 {
         long regx;
         int success;
@@ -144,7 +144,7 @@ static inline int __raw_write_trylock(raw_rwlock_t * lock)
         return success;
 }
 
-static inline void __raw_read_unlock(raw_rwlock_t * lock)
+static inline void arch_read_unlock(arch_rwlock_t * lock)
 {
         long regx;
         __asm__ __volatile__(
@@ -160,17 +160,17 @@ static inline void __raw_read_unlock(raw_rwlock_t * lock)
         : "m" (*lock) : "memory");
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t * lock)
+static inline void arch_write_unlock(arch_rwlock_t * lock)
 {
         mb();
         lock->lock = 0;
 }
 
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /* _ALPHA_SPINLOCK_H */
diff --git a/arch/alpha/include/asm/spinlock_types.h b/arch/alpha/include/asm/spinlock_types.h
index 8141eb5ebf0d..54c2afce0a1d 100644
--- a/arch/alpha/include/asm/spinlock_types.h
+++ b/arch/alpha/include/asm/spinlock_types.h
@@ -7,14 +7,14 @@
 
 typedef struct {
         volatile unsigned int lock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         volatile unsigned int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { 0 }
+#define __ARCH_RW_LOCK_UNLOCKED         { 0 }
 
 #endif
diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c
index d9980d47ab81..e6d90568b65d 100644
--- a/arch/alpha/kernel/core_t2.c
+++ b/arch/alpha/kernel/core_t2.c
@@ -74,7 +74,7 @@
 # define DBG(args)
 #endif
 
-DEFINE_SPINLOCK(t2_hae_lock);
+DEFINE_RAW_SPINLOCK(t2_hae_lock);
 
 static volatile unsigned int t2_mcheck_any_expected;
 static volatile unsigned int t2_mcheck_last_taken;
diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index c0de072b8305..5f2cf23c4648 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -81,7 +81,7 @@ show_interrupts(struct seq_file *p, void *v)
 #endif
 
         if (irq < ACTUAL_NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[irq].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[irq].lock, flags);
                 action = irq_desc[irq].action;
                 if (!action) 
                         goto unlock;
@@ -105,7 +105,7 @@ show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 unlock:
-                spin_unlock_irqrestore(&irq_desc[irq].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[irq].lock, flags);
         } else if (irq == ACTUAL_NR_IRQS) {
 #ifdef CONFIG_SMP
                 seq_puts(p, "IPI: ");
diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c
index d12af472e1c0..dbbf04f9230e 100644
--- a/arch/alpha/kernel/srm_env.c
+++ b/arch/alpha/kernel/srm_env.c
@@ -33,6 +33,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <asm/console.h>
 #include <asm/uaccess.h>
 #include <asm/machvec.h>
@@ -79,42 +80,41 @@ static srm_env_t	srm_named_entries[] = {
 static srm_env_t        srm_numbered_entries[256];
 
 
-static int
-srm_env_read(char *page, char **start, off_t off, int count, int *eof,
-                void *data)
+static int srm_env_proc_show(struct seq_file *m, void *v)
 {
-        int             nbytes;
         unsigned long   ret;
         srm_env_t       *entry;
+        char            *page;
 
-        if (off != 0) {
-                *eof = 1;
-                return 0;
-        }
+        entry = (srm_env_t *)m->private;
+        page = (char *)__get_free_page(GFP_USER);
+        if (!page)
+                return -ENOMEM;
 
-        entry   = (srm_env_t *) data;
-        ret     = callback_getenv(entry->id, page, count);
+        ret = callback_getenv(entry->id, page, PAGE_SIZE);
 
         if ((ret >> 61) == 0) {
-                nbytes = (int) ret;
-                *eof = 1;
+                seq_write(m, page, ret);
+                ret = 0;
         } else
-                nbytes = -EFAULT;
+                ret = -EFAULT;
+        free_page((unsigned long)page);
+        return ret;
+}
 
-        return nbytes;
+static int srm_env_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, srm_env_proc_show, PDE(inode)->data);
 }
 
-static int
-srm_env_write(struct file *file, const char __user *buffer, unsigned long count,
-                void *data)
+static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer,
+                                  size_t count, loff_t *pos)
 {
         int res;
-        srm_env_t       *entry;
+        srm_env_t       *entry = PDE(file->f_path.dentry->d_inode)->data;
         char            *buf = (char *) __get_free_page(GFP_USER);
         unsigned long   ret1, ret2;
 
-        entry = (srm_env_t *) data;
-
         if (!buf)
                 return -ENOMEM;
 
@@ -140,6 +140,15 @@ srm_env_write(struct file *file, const char __user *buffer, unsigned long count,
         return res;
 }
 
+static const struct file_operations srm_env_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = srm_env_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = srm_env_proc_write,
+};
+
 static void
 srm_env_cleanup(void)
 {
@@ -245,15 +254,10 @@ srm_env_init(void)
          */
         entry = srm_named_entries;
         while (entry->name && entry->id) {
-                entry->proc_entry = create_proc_entry(entry->name,
-                                0644, named_dir);
+                entry->proc_entry = proc_create_data(entry->name, 0644, named_dir,
+                                                     &srm_env_proc_fops, entry);
                 if (!entry->proc_entry)
                         goto cleanup;
-
-                entry->proc_entry->data         = (void *) entry;
-                entry->proc_entry->read_proc    = srm_env_read;
-                entry->proc_entry->write_proc   = srm_env_write;
-
                 entry++;
         }
 
@@ -264,15 +268,12 @@ srm_env_init(void)
                 entry = &srm_numbered_entries[var_num];
                 entry->name = number[var_num];
 
-                entry->proc_entry = create_proc_entry(entry->name,
-                                0644, numbered_dir);
+                entry->proc_entry = proc_create_data(entry->name, 0644, numbered_dir,
+                                                     &srm_env_proc_fops, entry);
                 if (!entry->proc_entry)
                         goto cleanup;
 
                 entry->id                       = var_num;
-                entry->proc_entry->data         = (void *) entry;
-                entry->proc_entry->read_proc    = srm_env_read;
-                entry->proc_entry->write_proc   = srm_env_write;
         }
 
         printk(KERN_INFO "%s: version %s loaded successfully\n", NAME,