diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 08:24:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 08:24:28 -0700 |
| commit | 05061bf678de5d69ebaae2c0705bf106e3000b6e (patch) | |
| tree | 8be38692f0dfd4f49c9c04d8eeb974525a84b1b6 /arch/blackfin/include/asm | |
| parent | fdc0ad80a4f27efcb457b49f5dd8455a3d623559 (diff) | |
| parent | de55aa33ca6928881ca5c402bb0f5db242fbcdba (diff) | |
| download | linux-stable-05061bf678de5d69ebaae2c0705bf106e3000b6e.tar.gz linux-stable-05061bf678de5d69ebaae2c0705bf106e3000b6e.tar.bz2 linux-stable-05061bf678de5d69ebaae2c0705bf106e3000b6e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: bf54x: re-enable anomaly 05000353 for all revs
Blackfin: enable atomic64_t support
Blackfin: wire up new syncfs syscall
Blackfin: SMP: flush CoreB cache when shutting down
Diffstat (limited to 'arch/blackfin/include/asm')
| -rw-r--r-- | arch/blackfin/include/asm/atomic.h | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/unistd.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h index d27c6274247d..e48508957160 100644 --- a/arch/blackfin/include/asm/atomic.h +++ b/arch/blackfin/include/asm/atomic.h @@ -121,4 +121,6 @@ static inline int atomic_test_mask(int mask, atomic_t *v) #endif +#include <asm-generic/atomic64.h> + #endif diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h index c97497dd0d19..ff9a9f35d50b 100644 --- a/arch/blackfin/include/asm/unistd.h +++ b/arch/blackfin/include/asm/unistd.h @@ -396,8 +396,9 @@ #define __NR_name_to_handle_at 375 #define __NR_open_by_handle_at 376 #define __NR_clock_adjtime 377 +#define __NR_syncfs 378 -#define __NR_syscall 378 +#define __NR_syscall 379 #define NR_syscalls __NR_syscall /* Old optional stuff no one actually uses */ |