Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Baruch Siach and committed by
Russell King
bc994c77 10508b20

+10 -11
+10
arch/arm/include/asm/unistd.h
··· 15 15 16 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 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 29 #define __ARM_NR_cmpxchg (__ARM_NR_BASE+0x00fff0) 20 30 21 31 #define __ARCH_WANT_STAT64
-11
arch/arm/include/uapi/asm/unistd.h
··· 411 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 414 * The following SWIs are ARM private. 420 415 */ 421 416 #define __ARM_NR_BASE (__NR_SYSCALL_BASE+0x0f0000) ··· 419 424 #define __ARM_NR_usr26 (__ARM_NR_BASE+3) 420 425 #define __ARM_NR_usr32 (__ARM_NR_BASE+4) 421 426 #define __ARM_NR_set_tls (__ARM_NR_BASE+5) 422 - 423 - /* 424 - * *NOTE*: This is a ghost syscall private to the kernel. Only the 425 - * __kuser_cmpxchg code in entry-armv.S should be aware of its 426 - * existence. Don't ever use this from user code. 427 - */ 428 427 429 428 /* 430 429 * The following syscalls are obsolete and no longer available for EABI.