diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /include/asm-xtensa | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'include/asm-xtensa')
| -rw-r--r-- | include/asm-xtensa/atomic.h | 1 | ||||
| -rw-r--r-- | include/asm-xtensa/mman.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-xtensa/atomic.h b/include/asm-xtensa/atomic.h index 3670cc7695da..e2ce06b101ad 100644 --- a/include/asm-xtensa/atomic.h +++ b/include/asm-xtensa/atomic.h | |||
| @@ -286,6 +286,7 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v) | |||
| 286 | #define smp_mb__before_atomic_inc() barrier() | 286 | #define smp_mb__before_atomic_inc() barrier() |
| 287 | #define smp_mb__after_atomic_inc() barrier() | 287 | #define smp_mb__after_atomic_inc() barrier() |
| 288 | 288 | ||
| 289 | #include <asm-generic/atomic.h> | ||
| 289 | #endif /* __KERNEL__ */ | 290 | #endif /* __KERNEL__ */ |
| 290 | 291 | ||
| 291 | #endif /* _XTENSA_ATOMIC_H */ | 292 | #endif /* _XTENSA_ATOMIC_H */ |
diff --git a/include/asm-xtensa/mman.h b/include/asm-xtensa/mman.h index 9a95a45df996..082a7504925e 100644 --- a/include/asm-xtensa/mman.h +++ b/include/asm-xtensa/mman.h | |||
| @@ -72,6 +72,7 @@ | |||
| 72 | #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ | 72 | #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ |
| 73 | #define MADV_WILLNEED 0x3 /* pre-fault pages */ | 73 | #define MADV_WILLNEED 0x3 /* pre-fault pages */ |
| 74 | #define MADV_DONTNEED 0x4 /* discard these pages */ | 74 | #define MADV_DONTNEED 0x4 /* discard these pages */ |
| 75 | #define MADV_REMOVE 0x5 /* remove these pages & resources */ | ||
| 75 | 76 | ||
| 76 | /* compatibility flags */ | 77 | /* compatibility flags */ |
| 77 | #define MAP_ANON MAP_ANONYMOUS | 78 | #define MAP_ANON MAP_ANONYMOUS |