um: stop polluting the namespace with registers.h contents

Only one extern in there is needed in processor-generic.h, and it's
not needed anywhere else.  So move it over there and get rid of
the include in processor-generic.h, adding includes of registers.h
to the few files that need the declarations in it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Al Viro 2021-09-20 21:32:50 +00:00 committed by Richard Weinberger
parent 5f174ec3c1
commit dbba7f704a
9 changed files with 8 additions and 3 deletions

View file

@ -11,7 +11,6 @@ struct pt_regs;
struct task_struct; struct task_struct;
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <registers.h>
#include <sysdep/archsetjmp.h> #include <sysdep/archsetjmp.h>
#include <linux/prefetch.h> #include <linux/prefetch.h>
@ -105,6 +104,7 @@ extern struct cpuinfo_um boot_cpu_data;
#define current_cpu_data boot_cpu_data #define current_cpu_data boot_cpu_data
#define cache_line_size() (boot_cpu_data.cache_alignment) #define cache_line_size() (boot_cpu_data.cache_alignment)
extern unsigned long get_thread_reg(int reg, jmp_buf *buf);
#define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) #define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf)
extern unsigned long __get_wchan(struct task_struct *p); extern unsigned long __get_wchan(struct task_struct *p);

View file

@ -7,7 +7,6 @@
#define __REGISTERS_H #define __REGISTERS_H
#include <sysdep/ptrace.h> #include <sysdep/ptrace.h>
#include <sysdep/archsetjmp.h>
extern int save_i387_registers(int pid, unsigned long *fp_regs); extern int save_i387_registers(int pid, unsigned long *fp_regs);
extern int restore_i387_registers(int pid, unsigned long *fp_regs); extern int restore_i387_registers(int pid, unsigned long *fp_regs);
@ -19,7 +18,6 @@ extern int save_registers(int pid, struct uml_pt_regs *regs);
extern int restore_pid_registers(int pid, struct uml_pt_regs *regs); extern int restore_pid_registers(int pid, struct uml_pt_regs *regs);
extern int init_pid_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 int get_fp_registers(int pid, unsigned long *regs); extern int get_fp_registers(int pid, unsigned long *regs);
extern int put_fp_registers(int pid, unsigned long *regs); extern int put_fp_registers(int pid, unsigned long *regs);

View file

@ -16,6 +16,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <as-layout.h> #include <as-layout.h>
#include <mem_user.h> #include <mem_user.h>
#include <registers.h>
#include <skas.h> #include <skas.h>
#include <os.h> #include <os.h>

View file

@ -31,6 +31,7 @@
#include <kern_util.h> #include <kern_util.h>
#include <os.h> #include <os.h>
#include <skas.h> #include <skas.h>
#include <registers.h>
#include <linux/time-internal.h> #include <linux/time-internal.h>
/* /*

View file

@ -15,6 +15,7 @@
#include <sys/uio.h> #include <sys/uio.h>
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#include <linux/elf.h> #include <linux/elf.h>
#include <registers.h>
int have_xstate_support; int have_xstate_support;

View file

@ -7,6 +7,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/ptrace-abi.h> #include <asm/ptrace-abi.h>
#include <registers.h>
#include <skas.h> #include <skas.h>
extern int arch_switch_tls(struct task_struct *to); extern int arch_switch_tls(struct task_struct *to);

View file

@ -11,6 +11,7 @@
#define __FRAME_OFFSETS #define __FRAME_OFFSETS
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <registers.h>
#include <asm/ptrace-abi.h> #include <asm/ptrace-abi.h>
/* /*

View file

@ -12,6 +12,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
#include <frame_kern.h> #include <frame_kern.h>
#include <registers.h>
#include <skas.h> #include <skas.h>
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32

View file

@ -10,6 +10,7 @@
#include <linux/syscalls.h> #include <linux/syscalls.h>
#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 <registers.h>
#include <os.h> #include <os.h>
#include <registers.h> #include <registers.h>