diff options
author | Linus Torvalds | 2013-07-10 19:16:07 +0200 |
---|---|---|
committer | Linus Torvalds | 2013-07-10 19:16:07 +0200 |
commit | 72c1c2f1be6b6574c434bd60991269786c2431a2 (patch) | |
tree | c86e89ccb964607b906be98dbc3a01b86dcb099a /arch/microblaze/include/asm | |
parent | Merge tag 'metag-fixes-for-v3.11-1' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | xilinx systemace: Fix sparse warnings (diff) | |
download | kernel-qcow2-linux-72c1c2f1be6b6574c434bd60991269786c2431a2.tar.gz kernel-qcow2-linux-72c1c2f1be6b6574c434bd60991269786c2431a2.tar.xz kernel-qcow2-linux-72c1c2f1be6b6574c434bd60991269786c2431a2.zip |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"This Microblaze merge window is quite minimal.
I have also added to my branch one xilinx systemace sparse fix because
haven't got any reply from block maintainer."
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
xilinx systemace: Fix sparse warnings
microblaze: Move __NR_syscalls from uapi
microblaze: Enable KGDB in defconfig
microblaze: Don't mark arch_kgdb_ops as const.
Diffstat (limited to 'arch/microblaze/include/asm')
-rw-r--r-- | arch/microblaze/include/asm/unistd.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h index 6dece2d002dc..b14232b6878f 100644 --- a/arch/microblaze/include/asm/unistd.h +++ b/arch/microblaze/include/asm/unistd.h @@ -38,4 +38,7 @@ #define __ARCH_WANT_SYS_FORK #endif /* __ASSEMBLY__ */ + +#define __NR_syscalls 381 + #endif /* _ASM_MICROBLAZE_UNISTD_H */ |