mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 14:13:01 -04:00
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
This commit is contained in:
commit
46fbdf8935
5 changed files with 17 additions and 12 deletions
|
|
@ -73,7 +73,7 @@ static inline void destroy_context(struct mm_struct *mm)
|
|||
struct sram_list_struct *tmp;
|
||||
|
||||
if (current_l1_stack_save == mm->context.l1_stack_save)
|
||||
current_l1_stack_save = 0;
|
||||
current_l1_stack_save = NULL;
|
||||
if (mm->context.l1_stack_save)
|
||||
free_l1stack();
|
||||
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@
|
|||
#define __NR_epoll_pwait 346
|
||||
#define __NR_utimensat 347
|
||||
#define __NR_signalfd 348
|
||||
#define __NR_timerfd 349
|
||||
#define __NR_timerfd_create 349
|
||||
#define __NR_eventfd 350
|
||||
#define __NR_pread64 351
|
||||
#define __NR_pwrite64 352
|
||||
|
|
@ -370,8 +370,10 @@
|
|||
#define __NR_get_robust_list 355
|
||||
#define __NR_fallocate 356
|
||||
#define __NR_semtimedop 357
|
||||
#define __NR_timerfd_settime 358
|
||||
#define __NR_timerfd_gettime 359
|
||||
|
||||
#define __NR_syscall 358
|
||||
#define __NR_syscall 360
|
||||
#define NR_syscalls __NR_syscall
|
||||
|
||||
/* Old optional stuff no one actually uses */
|
||||
|
|
|
|||
Loading…
Reference in a new issue