UML - Style fixes in arch/um/sys-x86_64
Subsystems (2)
PATCH 8/20 UML - Style fixes in arch/um/sys-x86_64
Style fixes in arch/um/sys-x86_64:
updated copyrights
CodingStyle fixes
added severities to printks which needed them
A bunch of functions in sys-*/ptrace_user.c turn out to be unused, so they and their declarations are gone.
Signed-off-by Jeff Dike <[email protected]>
--- arch/um/include/ptrace_user.h | 11 ++------ arch/um/sys-i386/ptrace_user.c | 14 ----------- arch/um/sys-x86_64/bug.c | 3 +- arch/um/sys-x86_64/ptrace.c | 29 ++++++++++++----------- arch/um/sys-x86_64/ptrace_user.c | 46 ++++--------------------------------- arch/um/sys-x86_64/syscall_table.c | 31 ++++++++++++++++-------- arch/um/sys-x86_64/sysrq.c | 29 ++++++++++++----------- arch/um/sys-x86_64/um_module.c | 8 ++++-- 8 files changed, 65 insertions(+), 106 deletions(-)
arch/um/include/ptrace_user.h +3 -8
@@ -1,5 +1,5 @@/* -* Copyright (C) 2000, 2001, 2002 Jeff Dike ([email protected]) +* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) * Licensed under the GPL */
@@ -10,12 +10,6 @@extern int ptrace_getregs (long pid,unsigned long *regs_out);extern int ptrace_setregs (long pid,unsigned long *regs_in); -extern int ptrace_getfpregs (long pid,unsigned long *regs_out); -extern int ptrace_setfpregs (long pid,unsigned long *regs); -extern void arch_enter_kernel (void *task,int pid); -extern void arch_leave_kernel (void *task,int pid); -extern void ptrace_pokeuser (unsigned long addr,unsigned long data); -/* syscall emulation path in ptrace */
@@ -54,7 +48,8 @@ extern int sysemu_supported; (((int [3 ][3 ] ) { \ {PTRACE_SYSCALL ,PTRACE_SYSCALL ,PTRACE_SINGLESTEP }, \ {PTRACE_SYSEMU ,PTRACE_SYSEMU ,PTRACE_SINGLESTEP }, \ - {PTRACE_SYSEMU ,PTRACE_SYSEMU_SINGLESTEP ,PTRACE_SYSEMU_SINGLESTEP }}) \ + {PTRACE_SYSEMU ,PTRACE_SYSEMU_SINGLESTEP , \ +PTRACE_SYSEMU_SINGLESTEP } }) \ [sysemu_mode][singlestep_mode])#endif
arch/um/sys-i386/ptrace_user.c +0 -14
@@ -19,17 +19,3 @@ int ptrace_setregs(long pid, unsigned loreturn -errno;return 0 ; } - -int ptrace_getfpregs (long pid,unsigned long *regs) -{ -if (ptrace (PTRACE_GETFPREGS , pid,0 , regs) <0 ) -return -errno; -return 0 ; -} - -int ptrace_setfpregs (long pid,unsigned long *regs) -{ -if (ptrace (PTRACE_SETFPREGS , pid,0 , regs) <0 ) -return -errno; -return 0 ; -}
arch/um/sys-x86_64/bug.c +2 -1
@@ -5,7 +5,8 @@#include <linux/uaccess.h> -/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because +/* +* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because * that's not relevant in skas mode. */
arch/um/sys-x86_64/ptrace.c +15 -14
@@ -5,13 +5,12 @@* Licensed under the GPL */ -#define __FRAME_OFFSETS -#include <asm/ptrace.h> +#include <linux/mm.h> #include <linux/sched.h> #include <linux/errno.h> -#include <linux/mm.h> +#define __FRAME_OFFSETS +#include <asm/ptrace.h> #include <asm/uaccess.h> -#include <asm/elf.h> /* * determines which flags the user has access to.
@@ -24,12 +23,14 @@ int putreg(struct task_struct *child, inunsigned long tmp;#ifdef TIF_IA32 -/* Some code in the 64bit emulation may not be 64bit clean. -Don't take any chances. */ +/* +* Some code in the 64bit emulation may not be 64bit clean. +* Don't take any chances. +*/ if (test_tsk_thread_flag (child,TIF_IA32 )) value &=0xffffffff ;#endif -switch (regno){ +switch (regno) {case FS :case GS :case DS :
@@ -66,7 +67,7 @@ int poke_user(struct task_struct *child,if (addr <MAX_REG_OFFSET )return putreg (child, addr, data); else if ((addr >= offsetof(struct user, u_debugreg[0])) && - (addr <= offsetof(struct user, u_debugreg[7]))){ + (addr <= offsetof(struct user, u_debugreg[7]))) { addr -= offsetof(struct user, u_debugreg[0]); addr = addr >>2 ;if ((addr ==4 ) || (addr ==5 ))
@@ -108,11 +109,10 @@ int peek_user(struct task_struct *child,return -EIO ; tmp =0 ;/* Default return condition */ -if (addr <MAX_REG_OFFSET ){ +if (addr <MAX_REG_OFFSET ) tmp =getreg (child, addr); - } else if ((addr >= offsetof(struct user, u_debugreg[0])) && - (addr <= offsetof(struct user, u_debugreg[7]))){ + (addr <= offsetof(struct user, u_debugreg[7]))) { addr -= offsetof(struct user, u_debugreg[0]); addr = addr >>2 ; tmp = child->thread.arch.debugregs[addr];
@@ -127,8 +127,9 @@ int is_syscall(unsigned long addr)int n; n =copy_from_user (&instr, (void __user *) addr,sizeof (instr)); -if (n){ -/* access_process_vm() grants access to vsyscall and stub, +if (n) { +/* +* access_process_vm() grants access to vsyscall and stub, * while copy_from_user doesn't. Maybe access_process_vm is * slow, but that doesn't matter, since it will be called only * in case of singlestepping, if copy_from_user failed.
@@ -155,7 +156,7 @@ int get_fpregs(struct user_i387_struct _return err; n =copy_to_user (buf, fpregs,sizeof (fpregs)); -if (n >0 ) +if (n >0 )return -EFAULT ;return n;
arch/um/sys-x86_64/ptrace_user.c +5 -41
60 lines not on this page · raw message
arch/um/sys-x86_64/syscall_table.c +20 -11
@@ -1,5 +1,7 @@ -/* System call table for UML/x86-64, copied from arch/x86_64/kernel/syscall.c -* with some changes for UML. */ +/* +* System call table for UML/x86-64, copied from arch/x86_64/kernel/syscall.c +* with some changes for UML. +*/ #include <linux/linkage.h> #include <linux/sys.h>
@@ -8,22 +10,26 @@#define __NO_STUBS -/* Below you can see, in terms of #define's, the differences between the x86-64 -* and the UML syscall table. */ +/* +* Below you can see, in terms of #define's, the differences between the x86-64 +* and the UML syscall table. +*/ /* Not going to be implemented by UML, since we have no hardware. */ #define stub_iopl sys_ni_syscall#define sys_ioperm sys_ni_syscall -/* The UML TLS problem. Note that x86_64 does not implement this, so the below -* is needed only for the ia32 compatibility. */ -/*#define sys_set_thread_area sys_ni_syscall -#define sys_get_thread_area sys_ni_syscall*/ +/* +* The UML TLS problem. Note that x86_64 does not implement this, so the below +* is needed only for the ia32 compatibility. +*/ /* On UML we call it this way ("old" means it's not mmap2) */ #define sys_mmap old_mmap -/* On x86-64 sys_uname is actually sys_newuname plus a compatibility trick. -* See arch/x86_64/kernel/sys_x86_64.c */ +/* +* On x86-64 sys_uname is actually sys_newuname plus a compatibility trick. +* See arch/x86_64/kernel/sys_x86_64.c +*/ #define sys_uname sys_uname64#define stub_clone sys_clone
@@ -47,7 +53,10 @@ typedef void (*sys_call_ptr_t)(void);extern void sys_ni_syscall (void ); sys_call_ptr_t sys_call_table[UM_NR_syscall_max+1] __cacheline_aligned = { - /* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */ + /* + * Smells like a like a compiler bug -- it doesn't work when the & + * below is removed. + */ [0 ... UM_NR_syscall_max] = &sys_ni_syscall,#include <asm-x86/unistd_64.h> };
arch/um/sys-x86_64/sysrq.c +15 -14
@@ -4,32 +4,33 @@* Licensed under the GPL */ -#include "linux/kernel.h" -#include "linux/utsname.h" -#include "linux/module.h" -#include "asm/current.h" -#include "asm/ptrace.h" +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/sched.h> +#include <linux/utsname.h> +#include <asm/current.h> +#include <asm/ptrace.h> #include "sysrq.h" -void __show_regs (struct pt_regs * regs) +void __show_regs (struct pt_regs *regs) {printk ("\n" );print_modules (); -printk ("Pid: %d, comm: %.20s %s %s\n" ,task_pid_nr (current), +printk (KERN_INFO "Pid: %d, comm: %.20s %s %s\n" ,task_pid_nr (current), current->comm,print_tainted (),init_utsname ()->release); -printk ("RIP: %04lx:[<%016lx>] " ,PT_REGS_CS (regs) &0xffff , +printk (KERN_INFO "RIP: %04lx:[<%016lx>]\n" ,PT_REGS_CS (regs) &0xffff ,PT_REGS_RIP (regs)); -printk ("\nRSP: %016lx EFLAGS: %08lx\n" ,PT_REGS_RSP (regs), +printk (KERN_INFO "RSP: %016lx EFLAGS: %08lx\n" ,PT_REGS_RSP (regs),PT_REGS_EFLAGS (regs)); -printk ("RAX: %016lx RBX: %016lx RCX: %016lx\n" , +printk (KERN_INFO "RAX: %016lx RBX: %016lx RCX: %016lx\n" ,PT_REGS_RAX (regs),PT_REGS_RBX (regs),PT_REGS_RCX (regs)); -printk ("RDX: %016lx RSI: %016lx RDI: %016lx\n" , +printk (KERN_INFO "RDX: %016lx RSI: %016lx RDI: %016lx\n" ,PT_REGS_RDX (regs),PT_REGS_RSI (regs),PT_REGS_RDI (regs)); -printk ("RBP: %016lx R08: %016lx R09: %016lx\n" , +printk (KERN_INFO "RBP: %016lx R08: %016lx R09: %016lx\n" ,PT_REGS_RBP (regs),PT_REGS_R8 (regs),PT_REGS_R9 (regs)); -printk ("R10: %016lx R11: %016lx R12: %016lx\n" , +printk (KERN_INFO "R10: %016lx R11: %016lx R12: %016lx\n" ,PT_REGS_R10 (regs),PT_REGS_R11 (regs),PT_REGS_R12 (regs)); -printk ("R13: %016lx R14: %016lx R15: %016lx\n" , +printk (KERN_INFO "R13: %016lx R14: %016lx R15: %016lx\n" ,PT_REGS_R13 (regs),PT_REGS_R14 (regs),PT_REGS_R15 (regs)); }
arch/um/sys-x86_64/um_module.c +5 -3
@@ -1,7 +1,7 @@#include <linux/vmalloc.h> #include <linux/moduleloader.h> -/*Copied from i386 arch/i386/kernel/module.c */ +/* Copied from i386 arch/i386/kernel/module.c */ void *module_alloc (unsigned long size) {if (size ==0 )
@@ -13,7 +13,9 @@ void *module_alloc(unsigned long size)void module_free (struct module *mod,void *module_region) {vfree (module_region); -/* FIXME: If module_region == mod->init_region, trim exception -table entries. */ +/* +* FIXME: If module_region == mod->init_region, trim exception +* table entries. +*/ }
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel