lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse Source 
* '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"
This commit is contained in:
Linus Torvalds
2010-08-13 21:23:57 -07:00
parent eb3bbf805f a78b2de1e4
commit 92fa5bd9a9
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/ia64/include/asm/atomic.h
View File

@@ -41,7 +41,7 @@ ia64_atomic_add (int i, atomic_t *v)
return new; return new;
} }
static __inline__ int static __inline__ long
ia64_atomic64_add (__s64 i, atomic64_t *v) ia64_atomic64_add (__s64 i, atomic64_t *v)
{ {
__s64 old, new; __s64 old, new;
@@ -69,7 +69,7 @@ ia64_atomic_sub (int i, atomic_t *v)
return new; return new;
} }
static __inline__ int static __inline__ long
ia64_atomic64_sub (__s64 i, atomic64_t *v) ia64_atomic64_sub (__s64 i, atomic64_t *v)
{ {
__s64 old, new; __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) #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; long c, old;
c = atomic64_read(v); c = atomic64_read(v);
@@ -158,7 +158,7 @@ atomic_add_negative (int i, atomic_t *v)
return atomic_add_return(i, v) < 0; return atomic_add_return(i, v) < 0;
} }
static __inline__ int static __inline__ long
atomic64_add_negative (__s64 i, atomic64_t *v) atomic64_add_negative (__s64 i, atomic64_t *v)
{ {
return atomic64_add_return(i, v) < 0; return atomic64_add_return(i, v) < 0;

5
arch/ia64/include/asm/unistd.h
View File

@@ -312,11 +312,14 @@
#define __NR_pwritev 1320 #define __NR_pwritev 1320
#define __NR_rt_tgsigqueueinfo 1321 #define __NR_rt_tgsigqueueinfo 1321
#define __NR_recvmmsg 1322 #define __NR_recvmmsg 1322
#define __NR_fanotify_init 1323
#define __NR_fanotify_mark 1324
#define __NR_prlimit64 1325
#ifdef __KERNEL__ #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 * The following defines stop scripts/checksyscalls.sh from complaining about

3
arch/ia64/kernel/entry.S
View File

@@ -1768,6 +1768,9 @@ sys_call_table:
data8 sys_pwritev // 1320 data8 sys_pwritev // 1320
data8 sys_rt_tgsigqueueinfo data8 sys_rt_tgsigqueueinfo
data8 sys_recvmmsg 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 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */