diff options
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/atomic.h | 1 | ||||
-rw-r--r-- | include/asm-sh/bitops.h | 1 | ||||
-rw-r--r-- | include/asm-sh/mman.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-sh/atomic.h b/include/asm-sh/atomic.h index aabfd334462c..618d8e0de348 100644 --- a/include/asm-sh/atomic.h +++ b/include/asm-sh/atomic.h | |||
@@ -140,4 +140,5 @@ static __inline__ void atomic_set_mask(unsigned int mask, atomic_t *v) | |||
140 | #define smp_mb__before_atomic_inc() barrier() | 140 | #define smp_mb__before_atomic_inc() barrier() |
141 | #define smp_mb__after_atomic_inc() barrier() | 141 | #define smp_mb__after_atomic_inc() barrier() |
142 | 142 | ||
143 | #include <asm-generic/atomic.h> | ||
143 | #endif /* __ASM_SH_ATOMIC_H */ | 144 | #endif /* __ASM_SH_ATOMIC_H */ |
diff --git a/include/asm-sh/bitops.h b/include/asm-sh/bitops.h index 5163d1ff2f1b..1c5260860045 100644 --- a/include/asm-sh/bitops.h +++ b/include/asm-sh/bitops.h | |||
@@ -470,6 +470,7 @@ found_middle: | |||
470 | */ | 470 | */ |
471 | 471 | ||
472 | #define fls(x) generic_fls(x) | 472 | #define fls(x) generic_fls(x) |
473 | #define fls64(x) generic_fls64(x) | ||
473 | 474 | ||
474 | #endif /* __KERNEL__ */ | 475 | #endif /* __KERNEL__ */ |
475 | 476 | ||
diff --git a/include/asm-sh/mman.h b/include/asm-sh/mman.h index 3ebab5f79db7..693bd55a3710 100644 --- a/include/asm-sh/mman.h +++ b/include/asm-sh/mman.h | |||
@@ -35,6 +35,7 @@ | |||
35 | #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ | 35 | #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ |
36 | #define MADV_WILLNEED 0x3 /* pre-fault pages */ | 36 | #define MADV_WILLNEED 0x3 /* pre-fault pages */ |
37 | #define MADV_DONTNEED 0x4 /* discard these pages */ | 37 | #define MADV_DONTNEED 0x4 /* discard these pages */ |
38 | #define MADV_REMOVE 0x5 /* remove these pages & resources */ | ||
38 | 39 | ||
39 | /* compatibility flags */ | 40 | /* compatibility flags */ |
40 | #define MAP_ANON MAP_ANONYMOUS | 41 | #define MAP_ANON MAP_ANONYMOUS |