Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Al Viro and committed by
Richard Weinberger
dbba7f70 5f174ec3

+8 -3
+1 -1
arch/um/include/asm/processor-generic.h
··· 11 11 struct task_struct; 12 12 13 13 #include <asm/ptrace.h> 14 - #include <registers.h> 15 14 #include <sysdep/archsetjmp.h> 16 15 17 16 #include <linux/prefetch.h> ··· 104 105 #define current_cpu_data boot_cpu_data 105 106 #define cache_line_size() (boot_cpu_data.cache_alignment) 106 107 108 + extern unsigned long get_thread_reg(int reg, jmp_buf *buf); 107 109 #define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) 108 110 extern unsigned long __get_wchan(struct task_struct *p); 109 111
-2
arch/um/include/shared/registers.h
··· 7 7 #define __REGISTERS_H 8 8 9 9 #include <sysdep/ptrace.h> 10 - #include <sysdep/archsetjmp.h> 11 10 12 11 extern int save_i387_registers(int pid, unsigned long *fp_regs); 13 12 extern int restore_i387_registers(int pid, unsigned long *fp_regs); ··· 18 19 extern int restore_pid_registers(int pid, struct uml_pt_regs *regs); 19 20 extern int init_pid_registers(int pid); 20 21 extern void get_safe_registers(unsigned long *regs, unsigned long *fp_regs); 21 - extern unsigned long get_thread_reg(int reg, jmp_buf *buf); 22 22 extern int get_fp_registers(int pid, unsigned long *regs); 23 23 extern int put_fp_registers(int pid, unsigned long *regs); 24 24
+1
arch/um/kernel/exec.c
··· 16 16 #include <linux/uaccess.h> 17 17 #include <as-layout.h> 18 18 #include <mem_user.h> 19 + #include <registers.h> 19 20 #include <skas.h> 20 21 #include <os.h> 21 22
+1
arch/um/kernel/process.c
··· 31 31 #include <kern_util.h> 32 32 #include <os.h> 33 33 #include <skas.h> 34 + #include <registers.h> 34 35 #include <linux/time-internal.h> 35 36 36 37 /*
+1
arch/x86/um/os-Linux/registers.c
··· 15 15 #include <sys/uio.h> 16 16 #include <asm/sigcontext.h> 17 17 #include <linux/elf.h> 18 + #include <registers.h> 18 19 19 20 int have_xstate_support; 20 21
+1
arch/x86/um/ptrace_32.c
··· 7 7 #include <linux/sched.h> 8 8 #include <linux/uaccess.h> 9 9 #include <asm/ptrace-abi.h> 10 + #include <registers.h> 10 11 #include <skas.h> 11 12 12 13 extern int arch_switch_tls(struct task_struct *to);
+1
arch/x86/um/ptrace_64.c
··· 11 11 #define __FRAME_OFFSETS 12 12 #include <asm/ptrace.h> 13 13 #include <linux/uaccess.h> 14 + #include <registers.h> 14 15 #include <asm/ptrace-abi.h> 15 16 16 17 /*
+1
arch/x86/um/signal.c
··· 12 12 #include <linux/uaccess.h> 13 13 #include <asm/ucontext.h> 14 14 #include <frame_kern.h> 15 + #include <registers.h> 15 16 #include <skas.h> 16 17 17 18 #ifdef CONFIG_X86_32
+1
arch/x86/um/syscalls_64.c
··· 10 10 #include <linux/syscalls.h> 11 11 #include <linux/uaccess.h> 12 12 #include <asm/prctl.h> /* XXX This should get the constants from libc */ 13 + #include <registers.h> 13 14 #include <os.h> 14 15 #include <registers.h> 15 16