tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
[Blackfin] arch: current_l1_stack_save is a pointer, so use NULL rather than 0
[Blackfin] arch: fix atomic and32/xor32 comments and ENDPROC markings
[Blackfin] arch: fix bug - allow SDH driver to be used as module
[Blackfin] arch: to kill syscalls missing warning by adding new timerfd syscalls

Linus Torvalds 46fbdf89 a0863130

+17 -12
unified split
+6 -6
arch/blackfin/kernel/fixed_code.S
··· 101 101 102 102 .align 16 103 103 /* 104 - * Atomic ior, 32 bit. 104 + * Atomic and, 32 bit. 105 105 * Inputs: P0: memory address to use 106 - * R0: value to ior 106 + * R0: value to and 107 107 * Outputs: R0: new contents of the memory address. 108 108 * R1: previous contents of the memory address. 109 109 */ ··· 112 112 R0 = R1 & R0; 113 113 [P0] = R0; 114 114 rts; 115 - ENDPROC (_atomic_ior32) 115 + ENDPROC (_atomic_and32) 116 116 117 117 .align 16 118 118 /* 119 - * Atomic ior, 32 bit. 119 + * Atomic xor, 32 bit. 120 120 * Inputs: P0: memory address to use 121 - * R0: value to ior 121 + * R0: value to xor 122 122 * Outputs: R0: new contents of the memory address. 123 123 * R1: previous contents of the memory address. 124 124 */ ··· 127 127 R0 = R1 ^ R0; 128 128 [P0] = R0; 129 129 rts; 130 - ENDPROC (_atomic_ior32) 130 + ENDPROC (_atomic_xor32) 131 131 132 132 .align 16 133 133 /*
+2 -2
arch/blackfin/mach-bf548/boards/ezkit.c
··· 323 323 }; 324 324 #endif 325 325 326 - #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN) 326 + #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE) 327 327 static struct platform_device bf54x_sdh_device = { 328 328 .name = "bfin-sdh", 329 329 .id = 0, ··· 636 636 &bf5xx_nand_device, 637 637 #endif 638 638 639 - #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN) 639 + #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE) 640 640 &bf54x_sdh_device, 641 641 #endif 642 642
+4 -1
arch/blackfin/mach-common/entry.S
··· 1369 1369 .long _sys_epoll_pwait 1370 1370 .long _sys_utimensat 1371 1371 .long _sys_signalfd 1372 - .long _sys_ni_syscall 1372 + .long _sys_timerfd_create 1373 1373 .long _sys_eventfd /* 350 */ 1374 1374 .long _sys_pread64 1375 1375 .long _sys_pwrite64 ··· 1378 1378 .long _sys_get_robust_list /* 355 */ 1379 1379 .long _sys_fallocate 1380 1380 .long _sys_semtimedop 1381 + .long _sys_timerfd_settime 1382 + .long _sys_timerfd_gettime 1383 + 1381 1384 .rept NR_syscalls-(.-_sys_call_table)/4 1382 1385 .long _sys_ni_syscall 1383 1386 .endr
+1 -1
include/asm-blackfin/mmu_context.h
··· 73 73 struct sram_list_struct *tmp; 74 74 75 75 if (current_l1_stack_save == mm->context.l1_stack_save) 76 - current_l1_stack_save = 0; 76 + current_l1_stack_save = NULL; 77 77 if (mm->context.l1_stack_save) 78 78 free_l1stack(); 79 79
+4 -2
include/asm-blackfin/unistd.h
··· 361 361 #define __NR_epoll_pwait 346 362 362 #define __NR_utimensat 347 363 363 #define __NR_signalfd 348 364 - #define __NR_timerfd 349 364 + #define __NR_timerfd_create 349 365 365 #define __NR_eventfd 350 366 366 #define __NR_pread64 351 367 367 #define __NR_pwrite64 352 ··· 370 370 #define __NR_get_robust_list 355 371 371 #define __NR_fallocate 356 372 372 #define __NR_semtimedop 357 373 + #define __NR_timerfd_settime 358 374 + #define __NR_timerfd_gettime 359 373 375 374 - #define __NR_syscall 358 376 + #define __NR_syscall 360 375 377 #define NR_syscalls __NR_syscall 376 378 377 379 /* Old optional stuff no one actually uses */