diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-02 02:29:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-02 02:31:54 -0400 |
| commit | 3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01 (patch) | |
| tree | a1a8cc85948c086aa12a1d8014151a7ca7c04ea8 /arch/mips/include/asm | |
| parent | 9fc3af467d0749989518a23f7289a6f44e5cb214 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c
Merge reason: Resolve the conflicts and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/include/asm')
| -rw-r--r-- | arch/mips/include/asm/atomic.h | 24 | ||||
| -rw-r--r-- | arch/mips/include/asm/unistd.h | 5 |
2 files changed, 15 insertions, 14 deletions
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h index 59dc0c7ef733..c63c56bfd184 100644 --- a/arch/mips/include/asm/atomic.h +++ b/arch/mips/include/asm/atomic.h | |||
| @@ -434,7 +434,7 @@ static __inline__ void atomic64_add(long i, atomic64_t * v) | |||
| 434 | __asm__ __volatile__( | 434 | __asm__ __volatile__( |
| 435 | " .set mips3 \n" | 435 | " .set mips3 \n" |
| 436 | "1: lld %0, %1 # atomic64_add \n" | 436 | "1: lld %0, %1 # atomic64_add \n" |
| 437 | " addu %0, %2 \n" | 437 | " daddu %0, %2 \n" |
| 438 | " scd %0, %1 \n" | 438 | " scd %0, %1 \n" |
| 439 | " beqzl %0, 1b \n" | 439 | " beqzl %0, 1b \n" |
| 440 | " .set mips0 \n" | 440 | " .set mips0 \n" |
| @@ -446,7 +446,7 @@ static __inline__ void atomic64_add(long i, atomic64_t * v) | |||
| 446 | __asm__ __volatile__( | 446 | __asm__ __volatile__( |
| 447 | " .set mips3 \n" | 447 | " .set mips3 \n" |
| 448 | "1: lld %0, %1 # atomic64_add \n" | 448 | "1: lld %0, %1 # atomic64_add \n" |
| 449 | " addu %0, %2 \n" | 449 | " daddu %0, %2 \n" |
| 450 | " scd %0, %1 \n" | 450 | " scd %0, %1 \n" |
| 451 | " beqz %0, 2f \n" | 451 | " beqz %0, 2f \n" |
| 452 | " .subsection 2 \n" | 452 | " .subsection 2 \n" |
| @@ -479,7 +479,7 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v) | |||
| 479 | __asm__ __volatile__( | 479 | __asm__ __volatile__( |
| 480 | " .set mips3 \n" | 480 | " .set mips3 \n" |
| 481 | "1: lld %0, %1 # atomic64_sub \n" | 481 | "1: lld %0, %1 # atomic64_sub \n" |
| 482 | " subu %0, %2 \n" | 482 | " dsubu %0, %2 \n" |
| 483 | " scd %0, %1 \n" | 483 | " scd %0, %1 \n" |
| 484 | " beqzl %0, 1b \n" | 484 | " beqzl %0, 1b \n" |
| 485 | " .set mips0 \n" | 485 | " .set mips0 \n" |
| @@ -491,7 +491,7 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v) | |||
| 491 | __asm__ __volatile__( | 491 | __asm__ __volatile__( |
| 492 | " .set mips3 \n" | 492 | " .set mips3 \n" |
| 493 | "1: lld %0, %1 # atomic64_sub \n" | 493 | "1: lld %0, %1 # atomic64_sub \n" |
| 494 | " subu %0, %2 \n" | 494 | " dsubu %0, %2 \n" |
| 495 | " scd %0, %1 \n" | 495 | " scd %0, %1 \n" |
| 496 | " beqz %0, 2f \n" | 496 | " beqz %0, 2f \n" |
| 497 | " .subsection 2 \n" | 497 | " .subsection 2 \n" |
| @@ -524,10 +524,10 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v) | |||
| 524 | __asm__ __volatile__( | 524 | __asm__ __volatile__( |
| 525 | " .set mips3 \n" | 525 | " .set mips3 \n" |
| 526 | "1: lld %1, %2 # atomic64_add_return \n" | 526 | "1: lld %1, %2 # atomic64_add_return \n" |
| 527 | " addu %0, %1, %3 \n" | 527 | " daddu %0, %1, %3 \n" |
| 528 | " scd %0, %2 \n" | 528 | " scd %0, %2 \n" |
| 529 | " beqzl %0, 1b \n" | 529 | " beqzl %0, 1b \n" |
| 530 | " addu %0, %1, %3 \n" | 530 | " daddu %0, %1, %3 \n" |
| 531 | " .set mips0 \n" | 531 | " .set mips0 \n" |
| 532 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) | 532 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) |
| 533 | : "Ir" (i), "m" (v->counter) | 533 | : "Ir" (i), "m" (v->counter) |
| @@ -538,10 +538,10 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v) | |||
| 538 | __asm__ __volatile__( | 538 | __asm__ __volatile__( |
| 539 | " .set mips3 \n" | 539 | " .set mips3 \n" |
| 540 | "1: lld %1, %2 # atomic64_add_return \n" | 540 | "1: lld %1, %2 # atomic64_add_return \n" |
| 541 | " addu %0, %1, %3 \n" | 541 | " daddu %0, %1, %3 \n" |
| 542 | " scd %0, %2 \n" | 542 | " scd %0, %2 \n" |
| 543 | " beqz %0, 2f \n" | 543 | " beqz %0, 2f \n" |
| 544 | " addu %0, %1, %3 \n" | 544 | " daddu %0, %1, %3 \n" |
| 545 | " .subsection 2 \n" | 545 | " .subsection 2 \n" |
| 546 | "2: b 1b \n" | 546 | "2: b 1b \n" |
| 547 | " .previous \n" | 547 | " .previous \n" |
| @@ -576,10 +576,10 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) | |||
| 576 | __asm__ __volatile__( | 576 | __asm__ __volatile__( |
| 577 | " .set mips3 \n" | 577 | " .set mips3 \n" |
| 578 | "1: lld %1, %2 # atomic64_sub_return \n" | 578 | "1: lld %1, %2 # atomic64_sub_return \n" |
| 579 | " subu %0, %1, %3 \n" | 579 | " dsubu %0, %1, %3 \n" |
| 580 | " scd %0, %2 \n" | 580 | " scd %0, %2 \n" |
| 581 | " beqzl %0, 1b \n" | 581 | " beqzl %0, 1b \n" |
| 582 | " subu %0, %1, %3 \n" | 582 | " dsubu %0, %1, %3 \n" |
| 583 | " .set mips0 \n" | 583 | " .set mips0 \n" |
| 584 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) | 584 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) |
| 585 | : "Ir" (i), "m" (v->counter) | 585 | : "Ir" (i), "m" (v->counter) |
| @@ -590,10 +590,10 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) | |||
| 590 | __asm__ __volatile__( | 590 | __asm__ __volatile__( |
| 591 | " .set mips3 \n" | 591 | " .set mips3 \n" |
| 592 | "1: lld %1, %2 # atomic64_sub_return \n" | 592 | "1: lld %1, %2 # atomic64_sub_return \n" |
| 593 | " subu %0, %1, %3 \n" | 593 | " dsubu %0, %1, %3 \n" |
| 594 | " scd %0, %2 \n" | 594 | " scd %0, %2 \n" |
| 595 | " beqz %0, 2f \n" | 595 | " beqz %0, 2f \n" |
| 596 | " subu %0, %1, %3 \n" | 596 | " dsubu %0, %1, %3 \n" |
| 597 | " .subsection 2 \n" | 597 | " .subsection 2 \n" |
| 598 | "2: b 1b \n" | 598 | "2: b 1b \n" |
| 599 | " .previous \n" | 599 | " .previous \n" |
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h index 1b5a6648eb86..baa318a59c97 100644 --- a/arch/mips/include/asm/unistd.h +++ b/arch/mips/include/asm/unistd.h | |||
| @@ -984,16 +984,17 @@ | |||
| 984 | #define __NR_perf_event_open (__NR_Linux + 296) | 984 | #define __NR_perf_event_open (__NR_Linux + 296) |
| 985 | #define __NR_accept4 (__NR_Linux + 297) | 985 | #define __NR_accept4 (__NR_Linux + 297) |
| 986 | #define __NR_recvmmsg (__NR_Linux + 298) | 986 | #define __NR_recvmmsg (__NR_Linux + 298) |
| 987 | #define __NR_getdents64 (__NR_Linux + 299) | ||
| 987 | 988 | ||
| 988 | /* | 989 | /* |
| 989 | * Offset of the last N32 flavoured syscall | 990 | * Offset of the last N32 flavoured syscall |
| 990 | */ | 991 | */ |
| 991 | #define __NR_Linux_syscalls 298 | 992 | #define __NR_Linux_syscalls 299 |
| 992 | 993 | ||
| 993 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 994 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
| 994 | 995 | ||
| 995 | #define __NR_N32_Linux 6000 | 996 | #define __NR_N32_Linux 6000 |
| 996 | #define __NR_N32_Linux_syscalls 298 | 997 | #define __NR_N32_Linux_syscalls 299 |
| 997 | 998 | ||
| 998 | #ifdef __KERNEL__ | 999 | #ifdef __KERNEL__ |
| 999 | 1000 | ||