diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/atomic64.h | 42 | ||||
-rw-r--r-- | include/linux/bio.h | 5 |
2 files changed, 47 insertions, 0 deletions
diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h new file mode 100644 index 000000000000..b18ce4f9ee3d --- /dev/null +++ b/include/asm-generic/atomic64.h | |||
@@ -0,0 +1,42 @@ | |||
1 | /* | ||
2 | * Generic implementation of 64-bit atomics using spinlocks, | ||
3 | * useful on processors that don't have 64-bit atomic instructions. | ||
4 | * | ||
5 | * Copyright © 2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or | ||
8 | * modify it under the terms of the GNU General Public License | ||
9 | * as published by the Free Software Foundation; either version | ||
10 | * 2 of the License, or (at your option) any later version. | ||
11 | */ | ||
12 | #ifndef _ASM_GENERIC_ATOMIC64_H | ||
13 | #define _ASM_GENERIC_ATOMIC64_H | ||
14 | |||
15 | typedef struct { | ||
16 | long long counter; | ||
17 | } atomic64_t; | ||
18 | |||
19 | #define ATOMIC64_INIT(i) { (i) } | ||
20 | |||
21 | extern long long atomic64_read(const atomic64_t *v); | ||
22 | extern void atomic64_set(atomic64_t *v, long long i); | ||
23 | extern void atomic64_add(long long a, atomic64_t *v); | ||
24 | extern long long atomic64_add_return(long long a, atomic64_t *v); | ||
25 | extern void atomic64_sub(long long a, atomic64_t *v); | ||
26 | extern long long atomic64_sub_return(long long a, atomic64_t *v); | ||
27 | extern long long atomic64_dec_if_positive(atomic64_t *v); | ||
28 | extern long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n); | ||
29 | extern long long atomic64_xchg(atomic64_t *v, long long new); | ||
30 | extern int atomic64_add_unless(atomic64_t *v, long long a, long long u); | ||
31 | |||
32 | #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0) | ||
33 | #define atomic64_inc(v) atomic64_add(1LL, (v)) | ||
34 | #define atomic64_inc_return(v) atomic64_add_return(1LL, (v)) | ||
35 | #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0) | ||
36 | #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0) | ||
37 | #define atomic64_dec(v) atomic64_sub(1LL, (v)) | ||
38 | #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v)) | ||
39 | #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0) | ||
40 | #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL) | ||
41 | |||
42 | #endif /* _ASM_GENERIC_ATOMIC64_H */ | ||
diff --git a/include/linux/bio.h b/include/linux/bio.h index 12737be58601..2a04eb54c0dd 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h | |||
@@ -590,6 +590,11 @@ static inline void bio_list_merge_head(struct bio_list *bl, | |||
590 | bl->head = bl2->head; | 590 | bl->head = bl2->head; |
591 | } | 591 | } |
592 | 592 | ||
593 | static inline struct bio *bio_list_peek(struct bio_list *bl) | ||
594 | { | ||
595 | return bl->head; | ||
596 | } | ||
597 | |||
593 | static inline struct bio *bio_list_pop(struct bio_list *bl) | 598 | static inline struct bio *bio_list_pop(struct bio_list *bl) |
594 | { | 599 | { |
595 | struct bio *bio = bl->head; | 600 | struct bio *bio = bl->head; |