aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2013-03-05 20:56:22 -0600
committerLinus Torvalds2013-03-05 20:56:22 -0600
commit9f225788cc047fb7c2ef2326eb4f86dee890e2ef (patch)
treee7571bb7ccc674ec166efb940ad4908bf88b6037 /arch/powerpc/include/asm/unistd.h
parentd7b815d4daac154a029faf4e8b687a75530d43be (diff)
parent54c9b2253d34e8998e4bff9ac2d7a3ba0b861d52 (diff)
downloadam43-linux-kernel-9f225788cc047fb7c2ef2326eb4f86dee890e2ef.tar.gz
am43-linux-kernel-9f225788cc047fb7c2ef2326eb4f86dee890e2ef.tar.xz
am43-linux-kernel-9f225788cc047fb7c2ef2326eb4f86dee890e2ef.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpcHEADmaster
Pull powerpc fixes from Ben Herrenschmidt: "Here are a few powerpc bits & fixes for rc1. A couple of str*cpy fixes, some fixes in handling the FSCR register on Power8 (controls the enabling of processor features), a 32-bit build fix and a couple more nits." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Set DSCR bit in FSCR setup powerpc: Add DSCR FSCR register bit definition powerpc: Fix setting FSCR for HV=0 and on secondary CPUs powerpc: Wireup the kcmp syscall to sys_ni powerpc: Remove unused BITOP_LE_SWIZZLE macro powerpc: Avoid link stack corruption in MMU on syscall entry path drivers/tty/hvc: Use strlcpy instead of strncpy powerpc/pseries/hvcserver: Fix strncpy buffer limit in location code powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit
Diffstat (limited to 'arch/powerpc/include/asm/unistd.h')
-rw-r--r--arch/powerpc/include/asm/unistd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index f25b5c45c43..1487f0f1229 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -12,7 +12,7 @@
12#include <uapi/asm/unistd.h> 12#include <uapi/asm/unistd.h>
13 13
14 14
15#define __NR_syscalls 354 15#define __NR_syscalls 355
16 16
17#define __NR__exit __NR_exit 17#define __NR__exit __NR_exit
18#define NR_syscalls __NR_syscalls 18#define NR_syscalls __NR_syscalls