diff options
| author | Linus Torvalds | 2008-03-06 19:32:05 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2008-03-06 19:32:05 -0800 |
| commit | 46fbdf8935544dcde440bd807b50e52ed2ca7f3b (patch) | |
| tree | 9d1e7838206771f830333036ebaf961894c0c6e3 /include | |
| parent | a0863130757f32df602c1c60326530c0152b626b (diff) | |
| parent | 9821b1f4a145b20db08108362f0b4caf4f0832a1 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-blackfin/mmu_context.h | 2 | ||||
| -rw-r--r-- | include/asm-blackfin/unistd.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-blackfin/mmu_context.h b/include/asm-blackfin/mmu_context.h index b5eb67596ad5..f55ec3c23a92 100644 --- a/include/asm-blackfin/mmu_context.h +++ b/include/asm-blackfin/mmu_context.h @@ -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(); diff --git a/include/asm-blackfin/unistd.h b/include/asm-blackfin/unistd.h index e98167358d26..c18a399f6e3e 100644 --- a/include/asm-blackfin/unistd.h +++ b/include/asm-blackfin/unistd.h @@ -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 */ |