Commit d6e59579 authored by Yang Yang's avatar Yang Yang Committed by Matt Turner
Browse files

alpha: replace NR_SYSCALLS by NR_syscalls 

Reference to other arch likes x86_64 or arm64 to do this replacement.
To solve compile error when using NR_syscalls in kernel[1].

[1] https://lore.kernel.org/all/202203270449.WBYQF9X3-lkp@intel.com/



Signed-off-by: default avatarYang Yang <yang.yang29@zte.com.cn>
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
parent 19fa21d7

arch/alpha/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <uapi/asm/unistd.h>



#define NR_SYSCALLS	__NR_syscalls

#define NR_syscalls	__NR_syscalls



#define __ARCH_WANT_NEW_STAT

#define __ARCH_WANT_OLD_READDIR

arch/alpha/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ entSys: 
	SAVE_ALL

	lda	$8, 0x3fff

	bic	$sp, $8, $8

	lda	$4, NR_SYSCALLS($31)

	lda	$4, NR_syscalls($31)

	stq	$16, SP_OFF+24($sp)

	lda	$5, sys_call_table

	lda	$27, sys_ni_syscall
@@ -583,7 +583,7 @@ strace: 
	ldq	$21, 88($sp)



	/* get the system call pointer.. */

	lda	$1, NR_SYSCALLS($31)

	lda	$1, NR_syscalls($31)

	lda	$2, sys_call_table

	lda	$27, sys_ni_syscall

	cmpult	$0, $1, $1

kernel/trace/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "pid_list.h"



#ifdef CONFIG_FTRACE_SYSCALLS

#include <asm/unistd.h>		/* For NR_SYSCALLS	     */

#include <asm/unistd.h>		/* For NR_syscalls	     */

#include <asm/syscall.h>	/* some archs define it here */

#endif