Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f43194e4 authored by Rashmica Gupta's avatar Rashmica Gupta Committed by Michael Ellerman
Browse files

powerpc: Standardise on NR_syscalls rather than __NR_syscalls. 



Most architectures use NR_syscalls as the #define for the number of syscalls.

We use __NR_syscalls, and then define NR_syscalls as __NR_syscalls.

__NR_syscalls is not used outside arch code, whereas NR_syscalls is. So as
NR_syscalls must be defined and __NR_syscalls does not, replace __NR_syscalls
with NR_syscalls.

Signed-off-by: default avatarRashmica Gupta <rashmicy@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent cdfc8ed6

arch/powerpc/include/asm/unistd.h

+1 −2
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ 
#include <uapi/asm/unistd.h>





#define __NR_syscalls		379

#define NR_syscalls		379



#define __NR__exit __NR_exit

#define NR_syscalls	__NR_syscalls



#ifndef __ASSEMBLY__

arch/powerpc/include/asm/vdso_datapage.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <linux/unistd.h>

#include <linux/time.h>



#define SYSCALL_MAP_SIZE      ((__NR_syscalls + 31) / 32)

#define SYSCALL_MAP_SIZE      ((NR_syscalls + 31) / 32)



/*

 * So here is the ppc64 backward compatible version

arch/powerpc/kernel/systbl_chk.c

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


START_TABLE

#include <asm/systbl.h>

END_TABLE __NR_syscalls
 
END_TABLE NR_syscalls

arch/powerpc/kernel/systbl_chk.sh

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ awk 'BEGIN { num = -1; } # Ignore the beginning of the file 
	/^START_TABLE/ { num = 0; next; }

	/^END_TABLE/ {

		if (num != $2) {

			printf "__NR_syscalls (%s) is not one more than the last syscall (%s)\n",

			printf "NR_syscalls (%s) is not one more than the last syscall (%s)\n",

				$2, num - 1;

			exit(1);

		}

arch/powerpc/kernel/vdso.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static void __init vdso_setup_syscall_map(void) 
	extern unsigned long sys_ni_syscall;





	for (i = 0; i < __NR_syscalls; i++) {

	for (i = 0; i < NR_syscalls; i++) {

#ifdef CONFIG_PPC64

		if (sys_call_table[i*2] != sys_ni_syscall)

			vdso_data->syscall_map_64[i >> 5] |=