Merge remote-tracking branch 'linus/master' into testing

8 files changed, 17 insertions, 51 deletions

diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c
index f91431963452..7de083d19b7e 100644
--- a/arch/avr32/boards/atngw100/mrmt.c
+++ b/arch/avr32/boards/atngw100/mrmt.c
@@ -150,7 +150,6 @@ static struct ac97c_platform_data __initdata ac97c0_data = {
 static struct platform_device rmt_ts_device = {
         .name   = "ucb1400_ts",
         .id     = -1,
-        }
 };
 #endif
 
diff --git a/arch/avr32/include/asm/pgtable.h b/arch/avr32/include/asm/pgtable.h
index 6fbfea61f7bb..4beff97e2033 100644
--- a/arch/avr32/include/asm/pgtable.h
+++ b/arch/avr32/include/asm/pgtable.h
@@ -362,9 +362,6 @@ typedef pte_t *pte_addr_t;
 
 #define kern_addr_valid(addr)   (1)
 
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
-        remap_pfn_range(vma, vaddr, pfn, size, prot)
-
 /* No page table caches to initialize (?) */
 #define pgtable_cache_init()    do { } while(0)
 
diff --git a/arch/avr32/include/uapi/asm/socket.h b/arch/avr32/include/uapi/asm/socket.h
index 37401f535126..11c4259c62fb 100644
--- a/arch/avr32/include/uapi/asm/socket.h
+++ b/arch/avr32/include/uapi/asm/socket.h
@@ -74,4 +74,6 @@
 
 #define SO_SELECT_ERR_QUEUE     45
 
+#define SO_BUSY_POLL            46
+
 #endif /* __ASM_AVR32_SOCKET_H */
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index e7b61494c312..c2731003edef 100644
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -341,7 +341,7 @@ unsigned long get_wchan(struct task_struct *p)
                  * is actually quite ugly. It might be possible to
                  * determine the frame size automatically at build
                  * time by doing this:
-                 *   - compile sched.c
+                 *   - compile sched/core.c
                  *   - disassemble the resulting sched.o
                  *   - look for 'sub sp,??' shortly after '<schedule>:'
                  */
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index b4247f478065..209ae5ad3495 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -555,7 +555,7 @@ void __init setup_arch (char **cmdline_p)
 {
         struct clk *cpu_clk;
 
-        init_mm.start_code = (unsigned long)_text;
+        init_mm.start_code = (unsigned long)_stext;
         init_mm.end_code = (unsigned long)_etext;
         init_mm.end_data = (unsigned long)_edata;
         init_mm.brk = (unsigned long)_end;
diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
index 9cd2bd91d64a..a4589176bed5 100644
--- a/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -23,7 +23,7 @@ SECTIONS
 {
         . = CONFIG_ENTRY_ADDRESS;
         .init           : AT(ADDR(.init) - LOAD_OFFSET) {
-                _stext = .;
+                _text = .;
                 __init_begin = .;
                         _sinittext = .;
                         *(.text.reset)
@@ -46,7 +46,7 @@ SECTIONS
 
         .text           : AT(ADDR(.text) - LOAD_OFFSET) {
                 _evba = .;
-                _text = .;
+                _stext = .;
                 *(.ex.text)
                 *(.irq.text)
                 KPROBES_TEXT
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 7c2f6685bf43..7f8759a8a92a 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1060,7 +1060,9 @@ struct platform_device *__init at32_add_device_usart(unsigned int id)
 
 void __init at32_setup_serial_console(unsigned int usart_id)
 {
+#ifdef CONFIG_SERIAL_ATMEL
         atmel_default_console_device = at32_usarts[usart_id];
+#endif
 }
 
 /* --------------------------------------------------------------------
diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index e66e8406f992..def5391d927a 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -100,60 +100,26 @@ void __init paging_init(void)
 
 void __init mem_init(void)
 {
-        int codesize, reservedpages, datasize, initsize;
-        int nid, i;
+        pg_data_t *pgdat;
 
-        reservedpages = 0;
         high_memory = NULL;
+        for_each_online_pgdat(pgdat)
+                high_memory = max_t(void *, high_memory,
+                                    __va(pgdat_end_pfn(pgdat) << PAGE_SHIFT));
 
-        /* this will put all low memory onto the freelists */
-        for_each_online_node(nid) {
-                pg_data_t *pgdat = NODE_DATA(nid);
-                unsigned long node_pages = 0;
-                void *node_high_memory;
-
-                num_physpages += pgdat->node_present_pages;
-
-                if (pgdat->node_spanned_pages != 0)
-                        node_pages = free_all_bootmem_node(pgdat);
-
-                totalram_pages += node_pages;
-
-                for (i = 0; i < node_pages; i++)
-                        if (PageReserved(pgdat->node_mem_map + i))
-                                reservedpages++;
-
-                node_high_memory = (void *)((pgdat->node_start_pfn
-                                             + pgdat->node_spanned_pages)
-                                            << PAGE_SHIFT);
-                if (node_high_memory > high_memory)
-                        high_memory = node_high_memory;
-        }
-
-        max_mapnr = MAP_NR(high_memory);
-
-        codesize = (unsigned long)_etext - (unsigned long)_text;
-        datasize = (unsigned long)_edata - (unsigned long)_data;
-        initsize = (unsigned long)__init_end - (unsigned long)__init_begin;
-
-        printk ("Memory: %luk/%luk available (%dk kernel code, "
-                "%dk reserved, %dk data, %dk init)\n",
-                nr_free_pages() << (PAGE_SHIFT - 10),
-                totalram_pages << (PAGE_SHIFT - 10),
-                codesize >> 10,
-                reservedpages << (PAGE_SHIFT - 10),
-                datasize >> 10,
-                initsize >> 10);
+        set_max_mapnr(MAP_NR(high_memory));
+        free_all_bootmem();
+        mem_init_print_info(NULL);
 }
 
 void free_initmem(void)
 {
-        free_initmem_default(0);
+        free_initmem_default(-1);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_reserved_area(start, end, 0, "initrd");
+        free_reserved_area((void *)start, (void *)end, -1, "initrd");
 }
 #endif