diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 23:31:35 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 23:32:03 +0100 |
commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/tile/include/asm/unistd.h | |
parent | ARM: DMA: add support for DMA debugging (diff) | |
parent | ARM: TWD: enable one-shot mode (diff) | |
download | linux-4ec3eb13634529c0bc7466658d84d0bbe3244aea.tar.xz linux-4ec3eb13634529c0bc7466658d84d0bbe3244aea.zip |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/tile/include/asm/unistd.h')
-rw-r--r-- | arch/tile/include/asm/unistd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/tile/include/asm/unistd.h b/arch/tile/include/asm/unistd.h index f2e3ff485333..b35c2db71199 100644 --- a/arch/tile/include/asm/unistd.h +++ b/arch/tile/include/asm/unistd.h @@ -41,6 +41,7 @@ __SYSCALL(__NR_cmpxchg_badaddr, sys_cmpxchg_badaddr) #ifdef CONFIG_COMPAT #define __ARCH_WANT_SYS_LLSEEK #endif +#define __ARCH_WANT_SYS_NEWFSTATAT #endif #endif /* _ASM_TILE_UNISTD_H */ |