Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
AVR32: Add missing return instruction in __raw_writesb
AVR32: Wire up sys_epoll_pwait
AVR32: Fix thinko in generic_find_next_zero_le_bit()
AVR32: Get rid of board_early_init

+16 -14
-9
arch/avr32/boards/atstk1000/setup.c
··· 21 21 22 22 struct lcdc_platform_data __initdata atstk1000_fb0_data; 23 23 24 - asmlinkage void __init board_early_init(void) 25 - { 26 - extern void sdram_init(void); 27 - 28 - #ifdef CONFIG_LOADER_STANDALONE 29 - sdram_init(); 30 - #endif 31 - } 32 - 33 24 void __init board_setup_fbmem(unsigned long fbmem_start, 34 25 unsigned long fbmem_size) 35 26 {
-3
arch/avr32/kernel/head.S
··· 30 30 mov r7, 0 31 31 #endif 32 32 33 - /* Set up the PIO, SDRAM controller, early printk, etc. */ 34 - rcall board_early_init 35 - 36 33 /* Start the show */ 37 34 lddpc pc, kernel_start_addr 38 35
+9
arch/avr32/kernel/syscall-stubs.S
··· 100 100 rcall sys_splice 101 101 sub sp, -4 102 102 popm pc 103 + 104 + .global __sys_epoll_pwait 105 + .type __sys_epoll_pwait,@function 106 + __sys_epoll_pwait: 107 + pushm lr 108 + st.w --sp, ARG6 109 + rcall sys_epoll_pwait 110 + sub sp, -4 111 + popm pc
+1
arch/avr32/kernel/syscall_table.S
··· 286 286 .long sys_sync_file_range 287 287 .long sys_tee 288 288 .long sys_vmsplice 289 + .long __sys_epoll_pwait /* 265 */ 289 290 .long sys_ni_syscall /* r8 is saturated at nr_syscalls */
+2 -1
arch/avr32/lib/findbit.S
··· 136 136 /* offset is not word-aligned. Handle the first (32 - r10) bits */ 137 137 ldswp.w r8, r12[0] 138 138 sub r12, -4 139 + com r8 139 140 lsr r8, r8, r10 140 141 brne .L_found 141 142 ··· 147 146 148 147 /* Main loop. offset must be word-aligned */ 149 148 1: ldswp.w r8, r12[0] 150 - cp.w r8, 0 149 + com r8 151 150 brne .L_found 152 151 sub r12, -4 153 152 sub r9, 32
+2
arch/avr32/lib/io-readsb.S
··· 45 45 sub r10, 1 46 46 st.b r11++, r8 47 47 brne 3b 48 + 49 + retal r12
+2 -1
include/asm-avr32/unistd.h
··· 280 280 #define __NR_sync_file_range 262 281 281 #define __NR_tee 263 282 282 #define __NR_vmsplice 264 283 + #define __NR_epoll_pwait 265 283 284 284 285 #ifdef __KERNEL__ 285 - #define NR_syscalls 265 286 + #define NR_syscalls 266 286 287 287 288 288 289 #define __ARCH_WANT_IPC_PARSE_VERSION