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

Commit dd93938a authored by Kyle Huey's avatar Kyle Huey Committed by Thomas Gleixner
Browse files

x86/arch_prctl: Rename 'code' argument to 'option' 



The x86 specific arch_prctl() arbitrarily changed prctl's 'option' to
'code'. Before adding new options, rename it.

Signed-off-by: default avatarKyle Huey <khuey@kylehuey.com>
Cc: Grzegorz Andrejczuk <grzegorz.andrejczuk@intel.com>
Cc: kvm@vger.kernel.org
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: linux-kselftest@vger.kernel.org
Cc: Nadav Amit <nadav.amit@gmail.com>
Cc: Robert O'Callahan <robert@ocallahan.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Len Brown <len.brown@intel.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: user-mode-linux-user@lists.sourceforge.net
Cc: David Matlack <dmatlack@google.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Dmitry Safonov <dsafonov@virtuozzo.com>
Cc: linux-fsdevel@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Link: http://lkml.kernel.org/r/20170320081628.18952-3-khuey@kylehuey.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ab6d9468

arch/um/include/shared/os.h

+2 −2
Original line number Diff line number Diff line
@@ -302,8 +302,8 @@ extern int ignore_sigio_fd(int fd); 
extern void maybe_sigio_broken(int fd, int read);

extern void sigio_broken(int fd, int read);



/* sys-x86_64/prctl.c */

extern int os_arch_prctl(int pid, int code, unsigned long *addr);

/* prctl.c */

extern int os_arch_prctl(int pid, int option, unsigned long *addr);



/* tty.c */

extern int get_pty(void);

arch/x86/include/asm/proto.h

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ void x86_report_nx(void); 


extern int reboot_force;



long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);

long do_arch_prctl(struct task_struct *task, int option, unsigned long addr);



#endif /* _ASM_X86_PROTO_H */

arch/x86/kernel/process_64.c

+4 −4
Original line number Diff line number Diff line
@@ -547,13 +547,13 @@ static long prctl_map_vdso(const struct vdso_image *image, unsigned long addr) 
}

#endif



long do_arch_prctl(struct task_struct *task, int code, unsigned long addr)

long do_arch_prctl(struct task_struct *task, int option, unsigned long addr)

{

	int ret = 0;

	int doit = task == current;

	int cpu;



	switch (code) {

	switch (option) {

	case ARCH_SET_GS:

		if (addr >= TASK_SIZE_MAX)

			return -EPERM;
@@ -621,9 +621,9 @@ long do_arch_prctl(struct task_struct *task, int code, unsigned long addr) 
	return ret;

}



long sys_arch_prctl(int code, unsigned long addr)

long sys_arch_prctl(int option, unsigned long addr)

{

	return do_arch_prctl(current, code, addr);

	return do_arch_prctl(current, option, addr);

}



unsigned long KSTK_ESP(struct task_struct *task)

arch/x86/um/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static inline int ptrace_set_thread_area(struct task_struct *child, int idx, 
        return -ENOSYS;

}



extern long arch_prctl(struct task_struct *task, int code,

extern long arch_prctl(struct task_struct *task, int option,

		       unsigned long __user *addr);



#endif

arch/x86/um/os-Linux/prctl.c

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <sys/ptrace.h>

#include <asm/ptrace.h>



int os_arch_prctl(int pid, int code, unsigned long *addr)

int os_arch_prctl(int pid, int option, unsigned long *addr)

{

        return ptrace(PTRACE_ARCH_PRCTL, pid, (unsigned long) addr, code);

	return ptrace(PTRACE_ARCH_PRCTL, pid, (unsigned long) addr, option);

}