xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

um: registers: Rename function names to avoid conflicts and build problems

Browse Source 
[ Upstream commit 077b7320942b64b0da182aefd83c374462a65535 ]

The function names init_registers() and restore_registers() are used
in several net/ethernet/ and gpu/drm/ drivers for other purposes (not
calls to UML functions), so rename them.

This fixes multiple build errors.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: linux-um@lists.infradead.org
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Randy Dunlap
2021-09-12 23:12:52 -07:00
committed by Greg Kroah-Hartman
parent d817d10f7a
commit 756a7188b2
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/um/include/shared/registers.h
View File

@@ -16,8 +16,8 @@ extern int restore_fp_registers(int pid, unsigned long *fp_regs);
extern int save_fpx_registers(int pid, unsigned long *fp_regs); extern int save_fpx_registers(int pid, unsigned long *fp_regs);
extern int restore_fpx_registers(int pid, unsigned long *fp_regs); extern int restore_fpx_registers(int pid, unsigned long *fp_regs);
extern int save_registers(int pid, struct uml_pt_regs *regs); extern int save_registers(int pid, struct uml_pt_regs *regs);
extern int restore_registers(int pid, struct uml_pt_regs *regs); extern int restore_pid_registers(int pid, struct uml_pt_regs *regs);
extern int init_registers(int pid); extern int init_pid_registers(int pid);
extern void get_safe_registers(unsigned long *regs, unsigned long *fp_regs); extern void get_safe_registers(unsigned long *regs, unsigned long *fp_regs);
extern unsigned long get_thread_reg(int reg, jmp_buf *buf); extern unsigned long get_thread_reg(int reg, jmp_buf *buf);
extern int get_fp_registers(int pid, unsigned long *regs); extern int get_fp_registers(int pid, unsigned long *regs);

4
arch/um/os-Linux/registers.c
View File

@@ -21,7 +21,7 @@ int save_registers(int pid, struct uml_pt_regs *regs)
return 0; return 0;
} }
int restore_registers(int pid, struct uml_pt_regs *regs) int restore_pid_registers(int pid, struct uml_pt_regs *regs)
{ {
int err; int err;
@@ -36,7 +36,7 @@ int restore_registers(int pid, struct uml_pt_regs *regs)
static unsigned long exec_regs[MAX_REG_NR]; static unsigned long exec_regs[MAX_REG_NR];
static unsigned long exec_fp_regs[FP_SIZE]; static unsigned long exec_fp_regs[FP_SIZE];
int init_registers(int pid) int init_pid_registers(int pid)
{ {
int err; int err;

2
arch/um/os-Linux/start_up.c
View File

@@ -336,7 +336,7 @@ void __init os_early_checks(void)
check_tmpexec(); check_tmpexec();
pid = start_ptraced_child(); pid = start_ptraced_child();
if (init_registers(pid)) if (init_pid_registers(pid))
fatal("Failed to initialize default registers"); fatal("Failed to initialize default registers");
stop_ptraced_child(pid, 1, 1); stop_ptraced_child(pid, 1, 1);
} }

3
arch/x86/um/syscalls_64.c
View File

@@ -11,6 +11,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/prctl.h> /* XXX This should get the constants from libc */ #include <asm/prctl.h> /* XXX This should get the constants from libc */
#include <os.h> #include <os.h>
#include <registers.h>
long arch_prctl(struct task_struct *task, int option, long arch_prctl(struct task_struct *task, int option,
unsigned long __user *arg2) unsigned long __user *arg2)
@@ -35,7 +36,7 @@ long arch_prctl(struct task_struct *task, int option,
switch (option) { switch (option) {
case ARCH_SET_FS: case ARCH_SET_FS:
case ARCH_SET_GS: case ARCH_SET_GS:
ret = restore_registers(pid, &current->thread.regs.regs); ret = restore_pid_registers(pid, &current->thread.regs.regs);
if (ret) if (ret)
return ret; return ret;
break; break;