lkml.org 
[lkml]   [2022]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 084/116] um: registers: Rename function names to avoid conflicts and build problems
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ 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>
    ---
    arch/um/include/shared/registers.h | 4 ++--
    arch/um/os-Linux/registers.c | 4 ++--
    arch/um/os-Linux/start_up.c | 2 +-
    arch/x86/um/syscalls_64.c | 3 ++-
    4 files changed, 7 insertions(+), 6 deletions(-)

    diff --git a/arch/um/include/shared/registers.h b/arch/um/include/shared/registers.h
    index 0c50fa6e8a55b..fbb709a222839 100644
    --- a/arch/um/include/shared/registers.h
    +++ b/arch/um/include/shared/registers.h
    @@ -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 restore_fpx_registers(int pid, unsigned long *fp_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 init_registers(int pid);
    +extern int restore_pid_registers(int pid, struct uml_pt_regs *regs);
    +extern int init_pid_registers(int pid);
    extern void get_safe_registers(unsigned long *regs, unsigned long *fp_regs);
    extern unsigned long get_thread_reg(int reg, jmp_buf *buf);
    extern int get_fp_registers(int pid, unsigned long *regs);
    diff --git a/arch/um/os-Linux/registers.c b/arch/um/os-Linux/registers.c
    index 2d9270508e156..b123955be7acc 100644
    --- a/arch/um/os-Linux/registers.c
    +++ b/arch/um/os-Linux/registers.c
    @@ -21,7 +21,7 @@ int save_registers(int pid, struct uml_pt_regs *regs)
    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;

    @@ -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_fp_regs[FP_SIZE];

    -int init_registers(int pid)
    +int init_pid_registers(int pid)
    {
    int err;

    diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
    index f79dc338279e6..b28373a2b8d2d 100644
    --- a/arch/um/os-Linux/start_up.c
    +++ b/arch/um/os-Linux/start_up.c
    @@ -336,7 +336,7 @@ void __init os_early_checks(void)
    check_tmpexec();

    pid = start_ptraced_child();
    - if (init_registers(pid))
    + if (init_pid_registers(pid))
    fatal("Failed to initialize default registers");
    stop_ptraced_child(pid, 1, 1);
    }
    diff --git a/arch/x86/um/syscalls_64.c b/arch/x86/um/syscalls_64.c
    index 58f51667e2e4b..8249685b40960 100644
    --- a/arch/x86/um/syscalls_64.c
    +++ b/arch/x86/um/syscalls_64.c
    @@ -11,6 +11,7 @@
    #include <linux/uaccess.h>
    #include <asm/prctl.h> /* XXX This should get the constants from libc */
    #include <os.h>
    +#include <registers.h>

    long arch_prctl(struct task_struct *task, int option,
    unsigned long __user *arg2)
    @@ -35,7 +36,7 @@ long arch_prctl(struct task_struct *task, int option,
    switch (option) {
    case ARCH_SET_FS:
    case ARCH_SET_GS:
    - ret = restore_registers(pid, &current->thread.regs.regs);
    + ret = restore_pid_registers(pid, &current->thread.regs.regs);
    if (ret)
    return ret;
    break;
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-01-18 04:10    [W:4.081 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site