Skip to content

Commit bc994c7

Browse files
baruchsiachRussell King
authored andcommitted
ARM: 8097/1: unistd.h: relocate comments back to place
Commit cb8db5d (UAPI: (Scripted) Disintegrate arch/arm/include/asm) moved these syscall comments out of their context into the UAPI headers. Fix this. Fixes: cb8db5d ("UAPI: (Scripted) Disintegrate arch/arm/include/asm") Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent 10508b2 commit bc994c7

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

arch/arm/include/asm/unistd.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,17 @@
1515

1616
#include <uapi/asm/unistd.h>
1717

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+
*/
1822
#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+
*/
1929
#define __ARM_NR_cmpxchg (__ARM_NR_BASE+0x00fff0)
2030

2131
#define __ARCH_WANT_STAT64

arch/arm/include/uapi/asm/unistd.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,6 @@
410410
#define __NR_sched_getattr (__NR_SYSCALL_BASE+381)
411411
#define __NR_renameat2 (__NR_SYSCALL_BASE+382)
412412

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-
418413
/*
419414
* The following SWIs are ARM private.
420415
*/
@@ -425,12 +420,6 @@
425420
#define __ARM_NR_usr32 (__ARM_NR_BASE+4)
426421
#define __ARM_NR_set_tls (__ARM_NR_BASE+5)
427422

428-
/*
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-
434423
/*
435424
* The following syscalls are obsolete and no longer available for EABI.
436425
*/

0 commit comments

Comments
 (0)