Skip to content

Commit 077b732

Browse files
rddunlaprichardweinberger
authored andcommitted
um: registers: Rename function names to avoid conflicts and build problems
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 <[email protected]> Cc: Jeff Dike <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: Anton Ivanov <[email protected]> Cc: [email protected] Signed-off-by: Richard Weinberger <[email protected]>
1 parent 8bd18ef commit 077b732

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

arch/um/include/shared/registers.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ extern int restore_fp_registers(int pid, unsigned long *fp_regs);
1616
extern int save_fpx_registers(int pid, unsigned long *fp_regs);
1717
extern int restore_fpx_registers(int pid, unsigned long *fp_regs);
1818
extern int save_registers(int pid, struct uml_pt_regs *regs);
19-
extern int restore_registers(int pid, struct uml_pt_regs *regs);
20-
extern int init_registers(int pid);
19+
extern int restore_pid_registers(int pid, struct uml_pt_regs *regs);
20+
extern int init_pid_registers(int pid);
2121
extern void get_safe_registers(unsigned long *regs, unsigned long *fp_regs);
2222
extern unsigned long get_thread_reg(int reg, jmp_buf *buf);
2323
extern int get_fp_registers(int pid, unsigned long *regs);

arch/um/os-Linux/registers.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ int save_registers(int pid, struct uml_pt_regs *regs)
2121
return 0;
2222
}
2323

24-
int restore_registers(int pid, struct uml_pt_regs *regs)
24+
int restore_pid_registers(int pid, struct uml_pt_regs *regs)
2525
{
2626
int err;
2727

@@ -36,7 +36,7 @@ int restore_registers(int pid, struct uml_pt_regs *regs)
3636
static unsigned long exec_regs[MAX_REG_NR];
3737
static unsigned long exec_fp_regs[FP_SIZE];
3838

39-
int init_registers(int pid)
39+
int init_pid_registers(int pid)
4040
{
4141
int err;
4242

arch/um/os-Linux/start_up.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ void __init os_early_checks(void)
368368
check_tmpexec();
369369

370370
pid = start_ptraced_child();
371-
if (init_registers(pid))
371+
if (init_pid_registers(pid))
372372
fatal("Failed to initialize default registers");
373373
stop_ptraced_child(pid, 1, 1);
374374
}

arch/x86/um/syscalls_64.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/uaccess.h>
1212
#include <asm/prctl.h> /* XXX This should get the constants from libc */
1313
#include <os.h>
14+
#include <registers.h>
1415

1516
long arch_prctl(struct task_struct *task, int option,
1617
unsigned long __user *arg2)
@@ -35,7 +36,7 @@ long arch_prctl(struct task_struct *task, int option,
3536
switch (option) {
3637
case ARCH_SET_FS:
3738
case ARCH_SET_GS:
38-
ret = restore_registers(pid, &current->thread.regs.regs);
39+
ret = restore_pid_registers(pid, &current->thread.regs.regs);
3940
if (ret)
4041
return ret;
4142
break;

0 commit comments

Comments
 (0)