diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 19:12:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 19:12:51 -0700 |
| commit | eee33abe592da1763550e6e55b1cfb7fdc6a9b4c (patch) | |
| tree | 6946db63c346f3aa215546aed47080c1d1b1087a /arch/s390/include | |
| parent | 04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea (diff) | |
| parent | 07606309ff5a9136e340b9ca87c831650c1ec47a (diff) | |
| download | blackbird-op-linux-eee33abe592da1763550e6e55b1cfb7fdc6a9b4c.tar.gz blackbird-op-linux-eee33abe592da1763550e6e55b1cfb7fdc6a9b4c.zip | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] define KTIME_SCALAR for 32-bit s390
[S390] add generic atomic64 support for 31 bit
[S390] improve suspend/resume error messages
[S390] set SCHED_OMIT_FRAME_POINTER for s390
[S390] add __ucmpdi2() helper function
[S390] perf_counter build fix
[S390] shutdown actions: save/return rc from init function
[S390] dasd: correct debugfeature sense dump
[S390] udelay: disable lockdep to avoid false positives
[S390] monreader: fix dev_set_drvdata conversion
[S390] sclp: fix compile error for !SCLP_CONSOLE
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/atomic.h | 7 | ||||
| -rw-r--r-- | arch/s390/include/asm/perf_counter.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h index fca9dffcc669..c7d0abfb0f00 100644 --- a/arch/s390/include/asm/atomic.h +++ b/arch/s390/include/asm/atomic.h @@ -268,7 +268,12 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) #undef __CSG_LOOP -#endif + +#else /* __s390x__ */ + +#include <asm-generic/atomic64.h> + +#endif /* __s390x__ */ #define smp_mb__before_atomic_dec() smp_mb() #define smp_mb__after_atomic_dec() smp_mb() diff --git a/arch/s390/include/asm/perf_counter.h b/arch/s390/include/asm/perf_counter.h index a7205a3828cb..7015188c2cc2 100644 --- a/arch/s390/include/asm/perf_counter.h +++ b/arch/s390/include/asm/perf_counter.h @@ -6,3 +6,5 @@ static inline void set_perf_counter_pending(void) {} static inline void clear_perf_counter_pending(void) {} + +#define PERF_COUNTER_INDEX_OFFSET 0 |
