diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 21:23:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 21:23:57 -0700 |
| commit | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (patch) | |
| tree | 8c0f10ff685126b084cd86da49d07d0b09f62782 /arch | |
| parent | eb3bbf805f8509f03ee479becf8c2f00737e1efb (diff) | |
| parent | a78b2de1e47b66c0f7525057652e99d1592ec77b (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Add latest crop of syscalls
[IA64] Fix 64-bit atomic routines to return "long"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/include/asm/atomic.h | 8 | ||||
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 5 | ||||
| -rw-r--r-- | arch/ia64/kernel/entry.S | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h index 4e1948447a00..446881439675 100644 --- a/arch/ia64/include/asm/atomic.h +++ b/arch/ia64/include/asm/atomic.h @@ -41,7 +41,7 @@ ia64_atomic_add (int i, atomic_t *v) return new; } -static __inline__ int +static __inline__ long ia64_atomic64_add (__s64 i, atomic64_t *v) { __s64 old, new; @@ -69,7 +69,7 @@ ia64_atomic_sub (int i, atomic_t *v) return new; } -static __inline__ int +static __inline__ long ia64_atomic64_sub (__s64 i, atomic64_t *v) { __s64 old, new; @@ -107,7 +107,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) +static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u) { long c, old; c = atomic64_read(v); @@ -158,7 +158,7 @@ atomic_add_negative (int i, atomic_t *v) return atomic_add_return(i, v) < 0; } -static __inline__ int +static __inline__ long atomic64_add_negative (__s64 i, atomic64_t *v) { return atomic64_add_return(i, v) < 0; diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 46f36fc5125f..87f1bd1efc82 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -312,11 +312,14 @@ #define __NR_pwritev 1320 #define __NR_rt_tgsigqueueinfo 1321 #define __NR_recvmmsg 1322 +#define __NR_fanotify_init 1323 +#define __NR_fanotify_mark 1324 +#define __NR_prlimit64 1325 #ifdef __KERNEL__ -#define NR_syscalls 299 /* length of syscall table */ +#define NR_syscalls 302 /* length of syscall table */ /* * The following defines stop scripts/checksyscalls.sh from complaining about diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 9a260b317d8d..244704a174de 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1768,6 +1768,9 @@ sys_call_table: data8 sys_pwritev // 1320 data8 sys_rt_tgsigqueueinfo data8 sys_recvmmsg + data8 sys_fanotify_init + data8 sys_fanotify_mark + data8 sys_prlimit64 // 1325 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |