11 files changed, 37 insertions, 93 deletions

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index e9d689b7c83..197e96f7040 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -10,6 +10,7 @@ config AVR32
         select GENERIC_IRQ_PROBE
         select HARDIRQS_SW_RESEND
         select GENERIC_IRQ_SHOW
+        select ARCH_HAVE_NMI_SAFE_CMPXCHG
         help
           AVR32 is a high-performance 32-bit RISC microprocessor core,
           designed for cost-sensitive embedded applications, with particular
diff --git a/arch/avr32/include/asm/atomic.h b/arch/avr32/include/asm/atomic.h
index bbce6a1c6bb..e0ac2631c87 100644
--- a/arch/avr32/include/asm/atomic.h
+++ b/arch/avr32/include/asm/atomic.h
@@ -78,70 +78,63 @@ static inline int atomic_add_return(int i, atomic_t *v)
 /*
  * atomic_sub_unless - sub unless the number is a given value
  * @v: pointer of type atomic_t
- * @a: the amount to add to v...
+ * @a: the amount to subtract from v...
  * @u: ...unless v is equal to u.
  *
- * If the atomic value v is not equal to u, this function subtracts a
- * from v, and returns non zero. If v is equal to u then it returns
- * zero. This is done as an atomic operation.
+ * Atomically subtract @a from @v, so long as it was not @u.
+ * Returns the old value of @v.
 */
-static inline int atomic_sub_unless(atomic_t *v, int a, int u)
+static inline void atomic_sub_unless(atomic_t *v, int a, int u)
 {
-        int tmp, result = 0;
+        int tmp;
 
         asm volatile(
                 "/* atomic_sub_unless */\n"
                 "1:     ssrf    5\n"
-                "       ld.w    %0, %3\n"
-                "       cp.w    %0, %5\n"
+                "       ld.w    %0, %2\n"
+                "       cp.w    %0, %4\n"
                 "       breq    1f\n"
-                "       sub     %0, %4\n"
-                "       stcond  %2, %0\n"
+                "       sub     %0, %3\n"
+                "       stcond  %1, %0\n"
                 "       brne    1b\n"
-                "       mov     %1, 1\n"
                 "1:"
-                : "=&r"(tmp), "=&r"(result), "=o"(v->counter)
-                : "m"(v->counter), "rKs21"(a), "rKs21"(u), "1"(result)
+                : "=&r"(tmp), "=o"(v->counter)
+                : "m"(v->counter), "rKs21"(a), "rKs21"(u)
                 : "cc", "memory");
-
-        return result;
 }
 
 /*
- * atomic_add_unless - add unless the number is a given value
+ * __atomic_add_unless - add unless the number is a given value
  * @v: pointer of type atomic_t
  * @a: the amount to add to v...
  * @u: ...unless v is equal to u.
  *
- * If the atomic value v is not equal to u, this function adds a to v,
- * and returns non zero. If v is equal to u then it returns zero. This
- * is done as an atomic operation.
+ * Atomically adds @a to @v, so long as it was not @u.
+ * Returns the old value of @v.
 */
-static inline int atomic_add_unless(atomic_t *v, int a, int u)
+static inline int __atomic_add_unless(atomic_t *v, int a, int u)
 {
-        int tmp, result;
+        int tmp, old = atomic_read(v);
 
         if (__builtin_constant_p(a) && (a >= -1048575) && (a <= 1048576))
-                result = atomic_sub_unless(v, -a, u);
+                atomic_sub_unless(v, -a, u);
         else {
-                result = 0;
                 asm volatile(
-                        "/* atomic_add_unless */\n"
+                        "/* __atomic_add_unless */\n"
                         "1:     ssrf    5\n"
-                        "       ld.w    %0, %3\n"
-                        "       cp.w    %0, %5\n"
+                        "       ld.w    %0, %2\n"
+                        "       cp.w    %0, %4\n"
                         "       breq    1f\n"
-                        "       add     %0, %4\n"
-                        "       stcond  %2, %0\n"
+                        "       add     %0, %3\n"
+                        "       stcond  %1, %0\n"
                         "       brne    1b\n"
-                        "       mov     %1, 1\n"
                         "1:"
-                        : "=&r"(tmp), "=&r"(result), "=o"(v->counter)
-                        : "m"(v->counter), "r"(a), "ir"(u), "1"(result)
+                        : "=&r"(tmp), "=o"(v->counter)
+                        : "m"(v->counter), "r"(a), "ir"(u)
                         : "cc", "memory");
         }
 
-        return result;
+        return old;
 }
 
 /*
@@ -188,7 +181,6 @@ static inline int atomic_sub_if_positive(int i, atomic_t *v)
 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
 
-#define atomic_inc_not_zero(v)  atomic_add_unless(v, 1, 0)
 #define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)
 
 #define smp_mb__before_atomic_dec()     barrier()
@@ -196,6 +188,4 @@ static inline int atomic_sub_if_positive(int i, atomic_t *v)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
 
-#include <asm-generic/atomic-long.h>
-
 #endif /*  __ASM_AVR32_ATOMIC_H */
diff --git a/arch/avr32/include/asm/delay.h b/arch/avr32/include/asm/delay.h
index a0ed9a9839a..9670e127b7b 100644
--- a/arch/avr32/include/asm/delay.h
+++ b/arch/avr32/include/asm/delay.h
@@ -1,26 +1 @@
-#ifndef __ASM_AVR32_DELAY_H
-#define __ASM_AVR32_DELAY_H
-
-/*
- * Copyright (C) 1993 Linus Torvalds
- *
- * Delay routines calling functions in arch/avr32/lib/delay.c
- */
-
-extern void __bad_udelay(void);
-extern void __bad_ndelay(void);
-
-extern void __udelay(unsigned long usecs);
-extern void __ndelay(unsigned long nsecs);
-extern void __const_udelay(unsigned long xloops);
-extern void __delay(unsigned long loops);
-
-#define udelay(n) (__builtin_constant_p(n) ? \
-        ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \
-        __udelay(n))
-
-#define ndelay(n) (__builtin_constant_p(n) ? \
-        ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
-        __ndelay(n))
-
-#endif /* __ASM_AVR32_DELAY_H */
+#include <asm-generic/delay.h>
diff --git a/arch/avr32/include/asm/ptrace.h b/arch/avr32/include/asm/ptrace.h
index e53dd0d900f..c67a007f672 100644
--- a/arch/avr32/include/asm/ptrace.h
+++ b/arch/avr32/include/asm/ptrace.h
@@ -132,8 +132,6 @@ struct pt_regs {
 #define instruction_pointer(regs)       ((regs)->pc)
 #define profile_pc(regs)                instruction_pointer(regs)
 
-extern void show_regs (struct pt_regs *);
-
 static __inline__ int valid_user_regs(struct pt_regs *regs)
 {
         /*
diff --git a/arch/avr32/kernel/module.c b/arch/avr32/kernel/module.c
index a727f54d64d..596f7305d93 100644
--- a/arch/avr32/kernel/module.c
+++ b/arch/avr32/kernel/module.c
@@ -19,13 +19,6 @@
 #include <linux/moduleloader.h>
 #include <linux/vmalloc.h>
 
-void *module_alloc(unsigned long size)
-{
-        if (size == 0)
-                return NULL;
-        return vmalloc(size);
-}
-
 void module_free(struct module *mod, void *module_region)
 {
         vfree(mod->arch.syminfo);
@@ -299,15 +292,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
         return ret;
 }
 
-int apply_relocate(Elf32_Shdr *sechdrs, const char *strtab,
-                   unsigned int symindex, unsigned int relindex,
-                   struct module *module)
-{
-        printk(KERN_ERR "module %s: REL relocations are not supported\n",
-                module->name);
-        return -ENOEXEC;
-}
-
 int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
                     struct module *module)
 {
@@ -316,7 +300,3 @@ int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
 
         return 0;
 }
-
-void module_arch_cleanup(struct module *module)
-{
-}
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index bb0974cce4a..b4247f47806 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -444,7 +444,7 @@ static unsigned long __init
 find_bootmap_pfn(const struct resource *mem)
 {
         unsigned long bootmap_pages, bootmap_len;
-        unsigned long node_pages = PFN_UP(mem->end - mem->start + 1);
+        unsigned long node_pages = PFN_UP(resource_size(mem));
         unsigned long bootmap_start;
 
         bootmap_pages = bootmem_bootmap_pages(node_pages);
@@ -541,10 +541,10 @@ static void __init setup_bootmem(void)
                          */
                         if (res->start >= PFN_PHYS(first_pfn)
                             && res->end < PFN_PHYS(max_pfn))
-                                reserve_bootmem_node(
-                                        NODE_DATA(node), res->start,
-                                        res->end - res->start + 1,
-                                        BOOTMEM_DEFAULT);
+                                reserve_bootmem_node(NODE_DATA(node),
+                                                     res->start,
+                                                     resource_size(res),
+                                                     BOOTMEM_DEFAULT);
                 }
 
                 node_set_online(node);
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index c7fd394d28a..6eba53530d1 100644
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -158,7 +158,7 @@ sys_call_table:
         .long   sys_sched_rr_get_interval
         .long   sys_nanosleep
         .long   sys_poll
-        .long   sys_nfsservctl          /* 145 */
+        .long   sys_ni_syscall          /* 145 was nfsservctl */
         .long   sys_setresgid
         .long   sys_getresgid
         .long   sys_prctl
diff --git a/arch/avr32/mach-at32ap/extint.c b/arch/avr32/mach-at32ap/extint.c
index fbc2aeaebdd..cfb298d6630 100644
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
@@ -204,7 +204,7 @@ static int __init eic_probe(struct platform_device *pdev)
         }
 
         eic->first_irq = EIM_IRQ_BASE + 32 * pdev->id;
-        eic->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        eic->regs = ioremap(regs->start, resource_size(regs));
         if (!eic->regs) {
                 dev_dbg(&pdev->dev, "failed to map regs\n");
                 goto err_ioremap;
diff --git a/arch/avr32/mach-at32ap/hsmc.c b/arch/avr32/mach-at32ap/hsmc.c
index f7672d3e86b..f66245e6e63 100644
--- a/arch/avr32/mach-at32ap/hsmc.c
+++ b/arch/avr32/mach-at32ap/hsmc.c
@@ -245,7 +245,7 @@ static int hsmc_probe(struct platform_device *pdev)
 
         hsmc->pclk = pclk;
         hsmc->mck = mck;
-        hsmc->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        hsmc->regs = ioremap(regs->start, resource_size(regs));
         if (!hsmc->regs)
                 goto out_disable_clocks;
 
diff --git a/arch/avr32/mach-at32ap/intc.c b/arch/avr32/mach-at32ap/intc.c
index c9ac2f8e8f6..258682bc127 100644
--- a/arch/avr32/mach-at32ap/intc.c
+++ b/arch/avr32/mach-at32ap/intc.c
@@ -107,7 +107,7 @@ void __init init_IRQ(void)
 
         clk_enable(pclk);
 
-        intc0.regs = ioremap(regs->start, regs->end - regs->start + 1);
+        intc0.regs = ioremap(regs->start, resource_size(regs));
         if (!intc0.regs) {
                 printk(KERN_EMERG "intc: failed to map registers (0x%08lx)\n",
                        (unsigned long)regs->start);
diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index 2e0aa853a4b..9b39dea6682 100644
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -461,7 +461,7 @@ void __init at32_init_pio(struct platform_device *pdev)
                 clk_enable(pio->clk);
 
         pio->pdev = pdev;
-        pio->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        pio->regs = ioremap(regs->start, resource_size(regs));
 
         /* start with irqs disabled and acked */
         pio_writel(pio, IDR, ~0UL);