aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 00:23:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 00:23:57 -0400
commit92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (patch)
tree8c0f10ff685126b084cd86da49d07d0b09f62782 /arch
parenteb3bbf805f8509f03ee479becf8c2f00737e1efb (diff)
parenta78b2de1e47b66c0f7525057652e99d1592ec77b (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.h8
-rw-r--r--arch/ia64/include/asm/unistd.h5
-rw-r--r--arch/ia64/kernel/entry.S3
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)
41 return new; 41 return new;
42} 42}
43 43
44static __inline__ int 44static __inline__ long
45ia64_atomic64_add (__s64 i, atomic64_t *v) 45ia64_atomic64_add (__s64 i, atomic64_t *v)
46{ 46{
47 __s64 old, new; 47 __s64 old, new;
@@ -69,7 +69,7 @@ ia64_atomic_sub (int i, atomic_t *v)
69 return new; 69 return new;
70} 70}
71 71
72static __inline__ int 72static __inline__ long
73ia64_atomic64_sub (__s64 i, atomic64_t *v) 73ia64_atomic64_sub (__s64 i, atomic64_t *v)
74{ 74{
75 __s64 old, new; 75 __s64 old, new;
@@ -107,7 +107,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
107 107
108#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) 108#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
109 109
110static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) 110static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u)
111{ 111{
112 long c, old; 112 long c, old;
113 c = atomic64_read(v); 113 c = atomic64_read(v);
@@ -158,7 +158,7 @@ atomic_add_negative (int i, atomic_t *v)
158 return atomic_add_return(i, v) < 0; 158 return atomic_add_return(i, v) < 0;
159} 159}
160 160
161static __inline__ int 161static __inline__ long
162atomic64_add_negative (__s64 i, atomic64_t *v) 162atomic64_add_negative (__s64 i, atomic64_t *v)
163{ 163{
164 return atomic64_add_return(i, v) < 0; 164 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 @@
312#define __NR_pwritev 1320 312#define __NR_pwritev 1320
313#define __NR_rt_tgsigqueueinfo 1321 313#define __NR_rt_tgsigqueueinfo 1321
314#define __NR_recvmmsg 1322 314#define __NR_recvmmsg 1322
315#define __NR_fanotify_init 1323
316#define __NR_fanotify_mark 1324
317#define __NR_prlimit64 1325
315 318
316#ifdef __KERNEL__ 319#ifdef __KERNEL__
317 320
318 321
319#define NR_syscalls 299 /* length of syscall table */ 322#define NR_syscalls 302 /* length of syscall table */
320 323
321/* 324/*
322 * The following defines stop scripts/checksyscalls.sh from complaining about 325 * 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:
1768 data8 sys_pwritev // 1320 1768 data8 sys_pwritev // 1320
1769 data8 sys_rt_tgsigqueueinfo 1769 data8 sys_rt_tgsigqueueinfo
1770 data8 sys_recvmmsg 1770 data8 sys_recvmmsg
1771 data8 sys_fanotify_init
1772 data8 sys_fanotify_mark
1773 data8 sys_prlimit64 // 1325
1771 1774
1772 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1775 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
1773#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ 1776#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */