mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-01 10:45:49 +00:00
um: Move declarations to proper headers
This will address below -Wmissing-prototypes warnings: arch/um/kernel/initrd.c:18:12: warning: no previous prototype for ‘read_initrd’ [-Wmissing-prototypes] arch/um/kernel/um_arch.c:408:19: warning: no previous prototype for ‘read_initrd’ [-Wmissing-prototypes] arch/um/os-Linux/start_up.c:301:12: warning: no previous prototype for ‘parse_iomem’ [-Wmissing-prototypes] arch/x86/um/ptrace_32.c:15:6: warning: no previous prototype for ‘arch_switch_to’ [-Wmissing-prototypes] arch/x86/um/ptrace_32.c:101:5: warning: no previous prototype for ‘poke_user’ [-Wmissing-prototypes] arch/x86/um/ptrace_32.c:153:5: warning: no previous prototype for ‘peek_user’ [-Wmissing-prototypes] arch/x86/um/ptrace_64.c:111:5: warning: no previous prototype for ‘poke_user’ [-Wmissing-prototypes] arch/x86/um/ptrace_64.c:171:5: warning: no previous prototype for ‘peek_user’ [-Wmissing-prototypes] arch/x86/um/syscalls_64.c:48:6: warning: no previous prototype for ‘arch_switch_to’ [-Wmissing-prototypes] arch/x86/um/tls_32.c:184:5: warning: no previous prototype for ‘arch_switch_tls’ [-Wmissing-prototypes] Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com> Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
parent
9ffc6724a3
commit
a4b4382f3e
@ -36,6 +36,9 @@ extern long subarch_ptrace(struct task_struct *child, long request,
|
|||||||
extern unsigned long getreg(struct task_struct *child, int regno);
|
extern unsigned long getreg(struct task_struct *child, int regno);
|
||||||
extern int putreg(struct task_struct *child, int regno, unsigned long value);
|
extern int putreg(struct task_struct *child, int regno, unsigned long value);
|
||||||
|
|
||||||
|
extern int poke_user(struct task_struct *child, long addr, long data);
|
||||||
|
extern int peek_user(struct task_struct *child, long addr, long data);
|
||||||
|
|
||||||
extern int arch_set_tls(struct task_struct *new, unsigned long tls);
|
extern int arch_set_tls(struct task_struct *new, unsigned long tls);
|
||||||
extern void clear_flushed_tls(struct task_struct *task);
|
extern void clear_flushed_tls(struct task_struct *task);
|
||||||
extern int syscall_trace_enter(struct pt_regs *regs);
|
extern int syscall_trace_enter(struct pt_regs *regs);
|
||||||
|
@ -41,6 +41,7 @@ extern void uml_pm_wake(void);
|
|||||||
|
|
||||||
extern int start_uml(void);
|
extern int start_uml(void);
|
||||||
extern void paging_init(void);
|
extern void paging_init(void);
|
||||||
|
extern int parse_iomem(char *str, int *add);
|
||||||
|
|
||||||
extern void uml_cleanup(void);
|
extern void uml_cleanup(void);
|
||||||
extern void do_uml_exitcalls(void);
|
extern void do_uml_exitcalls(void);
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include <as-layout.h>
|
#include <as-layout.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <kern.h>
|
#include <kern.h>
|
||||||
|
#include <kern_util.h>
|
||||||
#include <mem_user.h>
|
#include <mem_user.h>
|
||||||
#include <os.h>
|
#include <os.h>
|
||||||
|
|
||||||
@ -161,8 +162,6 @@ __uml_setup("mem=", uml_mem_setup,
|
|||||||
" Example: mem=64M\n\n"
|
" Example: mem=64M\n\n"
|
||||||
);
|
);
|
||||||
|
|
||||||
extern int __init parse_iomem(char *str, int *add);
|
|
||||||
|
|
||||||
__uml_setup("iomem=", parse_iomem,
|
__uml_setup("iomem=", parse_iomem,
|
||||||
"iomem=<name>,<file>\n"
|
"iomem=<name>,<file>\n"
|
||||||
" Configure <file> as an IO memory region named <name>.\n\n"
|
" Configure <file> as an IO memory region named <name>.\n\n"
|
||||||
|
@ -74,8 +74,6 @@ static inline void set_current(struct task_struct *task)
|
|||||||
{ external_pid(), task });
|
{ external_pid(), task });
|
||||||
}
|
}
|
||||||
|
|
||||||
extern void arch_switch_to(struct task_struct *to);
|
|
||||||
|
|
||||||
struct task_struct *__switch_to(struct task_struct *from, struct task_struct *to)
|
struct task_struct *__switch_to(struct task_struct *from, struct task_struct *to)
|
||||||
{
|
{
|
||||||
to->thread.prev_sched = from;
|
to->thread.prev_sched = from;
|
||||||
|
@ -35,9 +35,6 @@ void ptrace_disable(struct task_struct *child)
|
|||||||
user_disable_single_step(child);
|
user_disable_single_step(child);
|
||||||
}
|
}
|
||||||
|
|
||||||
extern int peek_user(struct task_struct * child, long addr, long data);
|
|
||||||
extern int poke_user(struct task_struct * child, long addr, long data);
|
|
||||||
|
|
||||||
long arch_ptrace(struct task_struct *child, long request,
|
long arch_ptrace(struct task_struct *child, long request,
|
||||||
unsigned long addr, unsigned long data)
|
unsigned long addr, unsigned long data)
|
||||||
{
|
{
|
||||||
|
@ -11,4 +11,6 @@ extern void __init uml_dtb_init(void);
|
|||||||
static inline void uml_dtb_init(void) { }
|
static inline void uml_dtb_init(void) { }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
extern int __init read_initrd(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include <asm/unistd.h>
|
#include <asm/unistd.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <os.h>
|
#include <os.h>
|
||||||
|
#include <kern_util.h>
|
||||||
#include <mem_user.h>
|
#include <mem_user.h>
|
||||||
#include <ptrace_user.h>
|
#include <ptrace_user.h>
|
||||||
#include <registers.h>
|
#include <registers.h>
|
||||||
|
@ -54,6 +54,8 @@ extern int ptrace_get_thread_area(struct task_struct *child, int idx,
|
|||||||
extern int ptrace_set_thread_area(struct task_struct *child, int idx,
|
extern int ptrace_set_thread_area(struct task_struct *child, int idx,
|
||||||
struct user_desc __user *user_desc);
|
struct user_desc __user *user_desc);
|
||||||
|
|
||||||
|
extern int arch_switch_tls(struct task_struct *to);
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#define PT_REGS_R8(r) UPT_R8(&(r)->regs)
|
#define PT_REGS_R8(r) UPT_R8(&(r)->regs)
|
||||||
@ -83,5 +85,9 @@ extern long arch_prctl(struct task_struct *task, int option,
|
|||||||
unsigned long __user *addr);
|
unsigned long __user *addr);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define user_stack_pointer(regs) PT_REGS_SP(regs)
|
#define user_stack_pointer(regs) PT_REGS_SP(regs)
|
||||||
|
|
||||||
|
extern void arch_switch_to(struct task_struct *to);
|
||||||
|
|
||||||
#endif /* __UM_X86_PTRACE_H */
|
#endif /* __UM_X86_PTRACE_H */
|
||||||
|
@ -10,8 +10,6 @@
|
|||||||
#include <registers.h>
|
#include <registers.h>
|
||||||
#include <skas.h>
|
#include <skas.h>
|
||||||
|
|
||||||
extern int arch_switch_tls(struct task_struct *to);
|
|
||||||
|
|
||||||
void arch_switch_to(struct task_struct *to)
|
void arch_switch_to(struct task_struct *to)
|
||||||
{
|
{
|
||||||
int err = arch_switch_tls(to);
|
int err = arch_switch_tls(to);
|
||||||
|
Loading…
Reference in New Issue
Block a user