diff options
author | Baruch Siach <baruch@tkos.co.il> | 2014-07-09 08:33:13 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-18 07:29:31 -0400 |
commit | bc994c77ce82576209dcf08f71de9ae51b0b100f (patch) | |
tree | 74c6f2ff96c44ddb35c9bae4946cf35285219ccf | |
parent | 10508b204c190471fe849a3e68f221277488c155 (diff) |
ARM: 8097/1: unistd.h: relocate comments back to place
Commit cb8db5d45 (UAPI: (Scripted) Disintegrate arch/arm/include/asm) moved
these syscall comments out of their context into the UAPI headers. Fix this.
Fixes: cb8db5d4578a ("UAPI: (Scripted) Disintegrate arch/arm/include/asm")
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/include/asm/unistd.h | 10 | ||||
-rw-r--r-- | arch/arm/include/uapi/asm/unistd.h | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h index 43876245fc57..21ca0cebcab0 100644 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h | |||
@@ -15,7 +15,17 @@ | |||
15 | 15 | ||
16 | #include <uapi/asm/unistd.h> | 16 | #include <uapi/asm/unistd.h> |
17 | 17 | ||
18 | /* | ||
19 | * This may need to be greater than __NR_last_syscall+1 in order to | ||
20 | * account for the padding in the syscall table | ||
21 | */ | ||
18 | #define __NR_syscalls (384) | 22 | #define __NR_syscalls (384) |
23 | |||
24 | /* | ||
25 | * *NOTE*: This is a ghost syscall private to the kernel. Only the | ||
26 | * __kuser_cmpxchg code in entry-armv.S should be aware of its | ||
27 | * existence. Don't ever use this from user code. | ||
28 | */ | ||
19 | #define __ARM_NR_cmpxchg (__ARM_NR_BASE+0x00fff0) | 29 | #define __ARM_NR_cmpxchg (__ARM_NR_BASE+0x00fff0) |
20 | 30 | ||
21 | #define __ARCH_WANT_STAT64 | 31 | #define __ARCH_WANT_STAT64 |
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h index ba94446c72d9..acd5b66ea3aa 100644 --- a/arch/arm/include/uapi/asm/unistd.h +++ b/arch/arm/include/uapi/asm/unistd.h | |||
@@ -411,11 +411,6 @@ | |||
411 | #define __NR_renameat2 (__NR_SYSCALL_BASE+382) | 411 | #define __NR_renameat2 (__NR_SYSCALL_BASE+382) |
412 | 412 | ||
413 | /* | 413 | /* |
414 | * This may need to be greater than __NR_last_syscall+1 in order to | ||
415 | * account for the padding in the syscall table | ||
416 | */ | ||
417 | |||
418 | /* | ||
419 | * The following SWIs are ARM private. | 414 | * The following SWIs are ARM private. |
420 | */ | 415 | */ |
421 | #define __ARM_NR_BASE (__NR_SYSCALL_BASE+0x0f0000) | 416 | #define __ARM_NR_BASE (__NR_SYSCALL_BASE+0x0f0000) |
@@ -426,12 +421,6 @@ | |||
426 | #define __ARM_NR_set_tls (__ARM_NR_BASE+5) | 421 | #define __ARM_NR_set_tls (__ARM_NR_BASE+5) |
427 | 422 | ||
428 | /* | 423 | /* |
429 | * *NOTE*: This is a ghost syscall private to the kernel. Only the | ||
430 | * __kuser_cmpxchg code in entry-armv.S should be aware of its | ||
431 | * existence. Don't ever use this from user code. | ||
432 | */ | ||
433 | |||
434 | /* | ||
435 | * The following syscalls are obsolete and no longer available for EABI. | 424 | * The following syscalls are obsolete and no longer available for EABI. |
436 | */ | 425 | */ |
437 | #if !defined(__KERNEL__) | 426 | #if !defined(__KERNEL__) |