Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006
  avr32: add default configurations for ATNGW100 mkII and EVKLCD10X
  avr32: add support for ATNGW100 mkII board
  avr32: convert to asm-generic/hardirq.h
  avr32: add two new at91 to cpu.h definition
  avr32: clean up linker script using standard macros.
  avr32: MRMT: correct setup of SPI slaves
  avr32: function for independently setting up SPI slaves
  avr32: re-instate MCI WP/CD pin assignments for ATNGW100

2 files changed, 9 insertions, 64 deletions

diff --git a/arch/avr32/kernel/irq.c b/arch/avr32/kernel/irq.c
index 9f572229d318..09904d22309f 100644
--- a/arch/avr32/kernel/irq.c
+++ b/arch/avr32/kernel/irq.c
@@ -16,15 +16,6 @@
 #include <linux/seq_file.h>
 #include <linux/sysdev.h>
 
-/*
- * 'what should we do if we get a hw irq event on an illegal vector'.
- * each architecture has to answer this themselves.
- */
-void ack_bad_irq(unsigned int irq)
-{
-        printk("unexpected IRQ %u\n", irq);
-}
-
 /* May be overridden by platform code */
 int __weak nmi_enable(void)
 {
diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
index c4b56654349a..9cd2bd91d64a 100644
--- a/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -39,30 +39,10 @@ SECTIONS
                 __tagtable_begin = .;
                         *(.taglist.init)
                 __tagtable_end = .;
-                        INIT_DATA
-                . = ALIGN(16);
-                __setup_start = .;
-                        *(.init.setup)
-                __setup_end = .;
-                . = ALIGN(4);
-                __initcall_start = .;
-                        INITCALLS
-                __initcall_end = .;
-                __con_initcall_start = .;
-                        *(.con_initcall.init)
-                __con_initcall_end = .;
-                __security_initcall_start = .;
-                        *(.security_initcall.init)
-                __security_initcall_end = .;
-#ifdef CONFIG_BLK_DEV_INITRD
-                . = ALIGN(32);
-                __initramfs_start = .;
-                        *(.init.ramfs)
-                __initramfs_end = .;
-#endif
-                . = ALIGN(PAGE_SIZE);
-                __init_end = .;
         }
+        INIT_DATA_SECTION(16)
+        . = ALIGN(PAGE_SIZE);
+        __init_end = .;
 
         .text           : AT(ADDR(.text) - LOAD_OFFSET) {
                 _evba = .;
@@ -78,34 +58,16 @@ SECTIONS
                 _etext = .;
         } = 0xd703d703
 
-        . = ALIGN(4);
-        __ex_table      : AT(ADDR(__ex_table) - LOAD_OFFSET) {
-                __start___ex_table = .;
-                *(__ex_table)
-                __stop___ex_table = .;
-        }
-
+        EXCEPTION_TABLE(4)
         RODATA
 
-        . = ALIGN(THREAD_SIZE);
-
         .data           : AT(ADDR(.data) - LOAD_OFFSET) {
                 _data = .;
                 _sdata = .;
-                /*
-                 * First, the init task union, aligned to an 8K boundary.
-                 */
-                *(.data.init_task)
 
-                /* Then, the page-aligned data */
-                . = ALIGN(PAGE_SIZE);
-                *(.data.page_aligned)
-
-                /* Then, the cacheline aligned data */
-                . = ALIGN(L1_CACHE_BYTES);
-                *(.data.cacheline_aligned)
-
-                /* And the rest... */
+                INIT_TASK_DATA(THREAD_SIZE)
+                PAGE_ALIGNED_DATA(PAGE_SIZE);
+                CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
                 *(.data.rel*)
                 DATA_DATA
                 CONSTRUCTORS
@@ -113,16 +75,8 @@ SECTIONS
                 _edata = .;
         }
 
-
-        . = ALIGN(8);
-        .bss            : AT(ADDR(.bss) - LOAD_OFFSET) {
-                __bss_start = .;
-                *(.bss)
-                *(COMMON)
-                . = ALIGN(8);
-                __bss_stop = .;
-                _end = .;
-        }
+        BSS_SECTION(0, 8, 8)
+        _end = .;
 
         DWARF_DEBUG