[PATCH 0/6] x86: coding style fixes to arch/x86/kernel/ - Kernel

This is a discussion on [PATCH 0/6] x86: coding style fixes to arch/x86/kernel/ - Kernel ; Ingo, I removed all errors and many warnings reported by checkpatch.pl for five files into arch/x86/kernel. I used a Linus tree with this HEAD: 63add2f2072e69c1eb7a5f6ca8f415122da889b9 which was commited seven hours ago. Thanks for teach me how to do this! $ ...

+ Reply to Thread
Results 1 to 9 of 9

Thread: [PATCH 0/6] x86: coding style fixes to arch/x86/kernel/

  1. [PATCH 0/6] x86: coding style fixes to arch/x86/kernel/

    Ingo,

    I removed all errors and many warnings reported by checkpatch.pl for five
    files into arch/x86/kernel. I used a Linus tree with this
    HEAD: 63add2f2072e69c1eb7a5f6ca8f415122da889b9 which was commited seven hours ago.

    Thanks for teach me how to do this!

    $ git-shortlog
    Gustavo F. Padovan (6):
    x86: conding styles fixes to arch/x86/kernel/process_64.c
    x86: add KERN_INFO to printks on process_64.c
    x86: coding style fixes to arch/x86/kernel/crash_dump_64.c
    x86: coding style fixes to arch/x86/kernel/signal_64.c
    x86: coding style fixes to arch/x86/kernel/traps_64.c
    x86: coding style fixes to arch/x86/kernel/sys_x86_64.c


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. [PATCH 2/6] x86: add KERN_INFO to printks on process_64.c

    Fix many coding style warnings.

    Signed-off-by: Gustavo F. Padovan
    ---
    arch/x86/kernel/process_64.c | 32 +++++++++++++++++---------------
    1 files changed, 17 insertions(+), 15 deletions(-)

    diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
    index 4da8514..3560d7f 100644
    --- a/arch/x86/kernel/process_64.c
    +++ b/arch/x86/kernel/process_64.c
    @@ -161,24 +161,24 @@ void __show_regs(struct pt_regs *regs)

    printk("\n");
    print_modules();
    - printk("Pid: %d, comm: %.20s %s %s %.*s\n",
    + printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s\n",
    current->pid, current->comm, print_tainted(),
    init_utsname()->release,
    (int)strcspn(init_utsname()->version, " "),
    init_utsname()->version);
    - printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip);
    + printk(KERN_INFO "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip);
    printk_address(regs->ip, 1);
    - printk("RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->sp,
    - regs->flags);
    - printk("RAX: %016lx RBX: %016lx RCX: %016lx\n",
    + printk(KERN_INFO "RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss,
    + regs->sp, regs->flags);
    + printk(KERN_INFO "RAX: %016lx RBX: %016lx RCX: %016lx\n",
    regs->ax, regs->bx, regs->cx);
    - printk("RDX: %016lx RSI: %016lx RDI: %016lx\n",
    + printk(KERN_INFO "RDX: %016lx RSI: %016lx RDI: %016lx\n",
    regs->dx, regs->si, regs->di);
    - printk("RBP: %016lx R08: %016lx R09: %016lx\n",
    + printk(KERN_INFO "RBP: %016lx R08: %016lx R09: %016lx\n",
    regs->bp, regs->r8, regs->r9);
    - printk("R10: %016lx R11: %016lx R12: %016lx\n",
    + printk(KERN_INFO "R10: %016lx R11: %016lx R12: %016lx\n",
    regs->r10, regs->r11, regs->r12);
    - printk("R13: %016lx R14: %016lx R15: %016lx\n",
    + printk(KERN_INFO "R13: %016lx R14: %016lx R15: %016lx\n",
    regs->r13, regs->r14, regs->r15);

    asm("movl %%ds,%0" : "=r" (ds));
    @@ -196,24 +196,26 @@ void __show_regs(struct pt_regs *regs)
    cr3 = read_cr3();
    cr4 = read_cr4();

    - printk("FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",
    + printk(KERN_INFO "FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",
    fs, fsindex, gs, gsindex, shadowgs);
    - printk("CS: %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds, es, cr0);
    - printk("CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3, cr4);
    + printk(KERN_INFO "CS: %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds,
    + es, cr0);
    + printk(KERN_INFO "CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3,
    + cr4);

    get_debugreg(d0, 0);
    get_debugreg(d1, 1);
    get_debugreg(d2, 2);
    - printk("DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2);
    + printk(KERN_INFO "DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2);
    get_debugreg(d3, 3);
    get_debugreg(d6, 6);
    get_debugreg(d7, 7);
    - printk("DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);
    + printk(KERN_INFO "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);
    }

    void show_regs(struct pt_regs *regs)
    {
    - printk("CPU %d:", smp_processor_id());
    + printk(KERN_INFO "CPU %d:", smp_processor_id());
    __show_regs(regs);
    show_trace(NULL, regs, (void *)(regs + 1), regs->bp);
    }
    --
    1.5.4.5

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  3. [PATCH 3/6] x86: coding style fixes to arch/x86/kernel/crash_dump_64.c

    Fix conding style without change crash_dump_64.o

    arch/x86/kernel/crash_dump_64.o
    text data bss dec hex filename
    129 0 0 129 81 crash_dump_64.o.after
    129 0 0 129 81 crash_dump_64.o.before

    md5:
    885b52c1b92737e6b12e5107e90fc1f1 crash_dump_64.o.after
    885b52c1b92737e6b12e5107e90fc1f1 crash_dump_64.o.before

    Signed-off-by: Gustavo F. Padovan
    ---
    arch/x86/kernel/crash_dump_64.c | 7 +++----
    1 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
    index 15e6c6b..d3e524c 100644
    --- a/arch/x86/kernel/crash_dump_64.c
    +++ b/arch/x86/kernel/crash_dump_64.c
    @@ -7,9 +7,8 @@

    #include
    #include
    -
    -#include
    -#include
    +#include
    +#include

    /**
    * copy_oldmem_page - copy one page from "oldmem"
    @@ -25,7 +24,7 @@
    * in the current kernel. We stitch up a pte, similar to kmap_atomic.
    */
    ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
    - size_t csize, unsigned long offset, int userbuf)
    + size_t csize, unsigned long offset, int userbuf)
    {
    void *vaddr;

    --
    1.5.4.5

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  4. [PATCH 5/6] x86: coding style fixes to arch/x86/kernel/traps_64.c

    Fix all errors and many warnings reported by checkpath.pl.
    Except the change of include to
    the traps.o before and after changes are the same.

    Signed-off-by: Gustavo F. Padovan
    ---
    arch/x86/kernel/traps_64.c | 59 +++++++++++++++++++++++--------------------
    1 files changed, 32 insertions(+), 27 deletions(-)

    diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
    index 3f18d73..fe36d96 100644
    --- a/arch/x86/kernel/traps_64.c
    +++ b/arch/x86/kernel/traps_64.c
    @@ -32,6 +32,8 @@
    #include
    #include
    #include
    +#include
    +#include

    #if defined(CONFIG_EDAC)
    #include
    @@ -45,9 +47,6 @@
    #include
    #include
    #include
    -#include
    -#include
    -#include
    #include
    #include
    #include
    @@ -85,7 +84,8 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)

    void printk_address(unsigned long address, int reliable)
    {
    - printk(" [<%016lx>] %s%pS\n", address, reliable ? "": "? ", (void *) address);
    + printk(" [<%016lx>] %s%pS\n", address, reliable ?
    + "" : "? ", (void *) address);
    }

    static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
    @@ -98,7 +98,8 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
    [STACKFAULT_STACK - 1] = "#SS",
    [MCE_STACK - 1] = "#MC",
    #if DEBUG_STKSZ > EXCEPTION_STKSZ
    - [N_EXCEPTION_STACKS ... N_EXCEPTION_STACKS + DEBUG_STKSZ / EXCEPTION_STKSZ - 2] = "#DB[?]"
    + [N_EXCEPTION_STACKS ... N_EXCEPTION_STACKS + DEBUG_STKSZ /
    + EXCEPTION_STKSZ - 2] = "#DB[?]"
    #endif
    };
    unsigned k;
    @@ -163,7 +164,7 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
    }

    /*
    - * x86-64 can have up to three kernel stacks:
    + * x86-64 can have up to three kernel stacks:
    * process stack
    * interrupt stack
    * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
    @@ -219,7 +220,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
    const struct stacktrace_ops *ops, void *data)
    {
    const unsigned cpu = get_cpu();
    - unsigned long *irqstack_end = (unsigned long*)cpu_pda(cpu)->irqstackptr;
    + unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)->irqstackptr;
    unsigned used = 0;
    struct thread_info *tinfo;

    @@ -237,7 +238,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
    if (!bp) {
    if (task == current) {
    /* Grab bp right from our regs */
    - asm("movq %%rbp, %0" : "=r" (bp) ;
    + asm("movq %%rbp, %0" : "=r" (bp) : );
    } else {
    /* bp is the last reg pushed by switch_to */
    bp = *(unsigned long *) task->thread.sp;
    @@ -357,11 +358,13 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
    unsigned long *stack;
    int i;
    const int cpu = smp_processor_id();
    - unsigned long *irqstack_end = (unsigned long *) (cpu_pda(cpu)->irqstackptr);
    - unsigned long *irqstack = (unsigned long *) (cpu_pda(cpu)->irqstackptr - IRQSTACKSIZE);
    + unsigned long *irqstack_end =
    + (unsigned long *) (cpu_pda(cpu)->irqstackptr);
    + unsigned long *irqstack =
    + (unsigned long *) (cpu_pda(cpu)->irqstackptr - IRQSTACKSIZE);

    - // debugging aid: "show_stack(NULL, NULL);" prints the
    - // back trace for this cpu.
    + /* debugging aid: "show_stack(NULL, NULL);" prints the
    + back trace for this cpu. */

    if (sp == NULL) {
    if (task)
    @@ -404,7 +407,7 @@ void dump_stack(void)

    #ifdef CONFIG_FRAME_POINTER
    if (!bp)
    - asm("movq %%rbp, %0" : "=r" (bp);
    + asm("movq %%rbp, %0" : "=r" (bp) : );
    #endif

    printk("Pid: %d, comm: %.20s %s %s %.*s\n",
    @@ -414,7 +417,6 @@ void dump_stack(void)
    init_utsname()->version);
    show_trace(NULL, NULL, &stack, bp);
    }
    -
    EXPORT_SYMBOL(dump_stack);

    void show_registers(struct pt_regs *regs)
    @@ -493,7 +495,7 @@ unsigned __kprobes long oops_begin(void)
    raw_local_irq_save(flags);
    cpu = smp_processor_id();
    if (!__raw_spin_trylock(&die_lock)) {
    - if (cpu == die_owner)
    + if (cpu == die_owner)
    /* nested oops. should stop eventually */;
    else
    __raw_spin_lock(&die_lock);
    @@ -638,7 +640,7 @@ kernel_trap:
    }

    #define DO_ERROR(trapnr, signr, str, name) \
    -asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
    +asmlinkage void do_##name(struct pt_regs *regs, long error_code) \
    { \
    if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
    == NOTIFY_STOP) \
    @@ -648,7 +650,7 @@ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
    }

    #define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \
    -asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
    +asmlinkage void do_##name(struct pt_regs *regs, long error_code) \
    { \
    siginfo_t info; \
    info.si_signo = signr; \
    @@ -683,7 +685,7 @@ asmlinkage void do_stack_segment(struct pt_regs *regs, long error_code)
    preempt_conditional_cli(regs);
    }

    -asmlinkage void do_double_fault(struct pt_regs * regs, long error_code)
    +asmlinkage void do_double_fault(struct pt_regs *regs, long error_code)
    {
    static const char str[] = "double fault";
    struct task_struct *tsk = current;
    @@ -778,9 +780,10 @@ io_check_error(unsigned char reason, struct pt_regs *regs)
    }

    static notrace __kprobes void
    -unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
    +unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
    {
    - if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)
    + if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) ==
    + NOTIFY_STOP)
    return;
    printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",
    reason);
    @@ -882,7 +885,7 @@ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
    else if (user_mode(eregs))
    regs = task_pt_regs(current);
    /* Exception from kernel and interrupts are enabled. Move to
    - kernel process stack. */
    + kernel process stack. */
    else if (eregs->flags & X86_EFLAGS_IF)
    regs = (struct pt_regs *)(eregs->sp -= sizeof(struct pt_regs));
    if (eregs != regs)
    @@ -891,7 +894,7 @@ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
    }

    /* runs on IST stack. */
    -asmlinkage void __kprobes do_debug(struct pt_regs * regs,
    +asmlinkage void __kprobes do_debug(struct pt_regs *regs,
    unsigned long error_code)
    {
    struct task_struct *tsk = current;
    @@ -1035,7 +1038,7 @@ asmlinkage void do_coprocessor_error(struct pt_regs *regs)

    asmlinkage void bad_intr(void)
    {
    - printk("bad interrupt");
    + printk("bad interrupt");
    }

    asmlinkage void do_simd_coprocessor_error(struct pt_regs *regs)
    @@ -1047,7 +1050,7 @@ asmlinkage void do_simd_coprocessor_error(struct pt_regs *regs)

    conditional_sti(regs);
    if (!user_mode(regs) &&
    - kernel_math_error(regs, "kernel simd math error", 19))
    + kernel_math_error(regs, "kernel simd math error", 19))
    return;

    /*
    @@ -1092,7 +1095,7 @@ asmlinkage void do_simd_coprocessor_error(struct pt_regs *regs)
    force_sig_info(SIGFPE, &info, task);
    }

    -asmlinkage void do_spurious_interrupt_bug(struct pt_regs * regs)
    +asmlinkage void do_spurious_interrupt_bug(struct pt_regs *regs)
    {
    }

    @@ -1142,8 +1145,10 @@ void __init trap_init(void)
    set_intr_gate(0, &divide_error);
    set_intr_gate_ist(1, &debug, DEBUG_STACK);
    set_intr_gate_ist(2, &nmi, NMI_STACK);
    - set_system_gate_ist(3, &int3, DEBUG_STACK); /* int3 can be called from all */
    - set_system_gate(4, &overflow); /* int4 can be called from all */
    + /* int3 can be called from all */
    + set_system_gate_ist(3, &int3, DEBUG_STACK);
    + /* int4 can be called from all */
    + set_system_gate(4, &overflow);
    set_intr_gate(5, &bounds);
    set_intr_gate(6, &invalid_op);
    set_intr_gate(7, &device_not_available);
    --
    1.5.4.5

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  5. [PATCH 4/6] x86: coding style fixes to arch/x86/kernel/signal_64.c

    Fix all errors and many warnings reported by checkpatch.pl
    without change signal_64.o

    arch/x86/kernel/signal_64.o
    text data bss dec hex filename
    5143 0 8 5151 141f signal_64.o.after
    5143 0 8 5151 141f signal_64.o.before
    md5:
    e68718092b3641cb27e79e55ce57e3ad signal_64.o.after
    e68718092b3641cb27e79e55ce57e3ad signal_64.o.before

    Signed-off-by: Gustavo F. Padovan
    ---
    arch/x86/kernel/sigframe.h | 5 +++
    arch/x86/kernel/signal_64.c | 62 ++++++++++++++++++++----------------------
    2 files changed, 35 insertions(+), 32 deletions(-)

    diff --git a/arch/x86/kernel/sigframe.h b/arch/x86/kernel/sigframe.h
    index 72bbb51..8b4956e 100644
    --- a/arch/x86/kernel/sigframe.h
    +++ b/arch/x86/kernel/sigframe.h
    @@ -24,4 +24,9 @@ struct rt_sigframe {
    struct ucontext uc;
    struct siginfo info;
    };
    +
    +int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    + sigset_t *set, struct pt_regs *regs);
    +int ia32_setup_frame(int sig, struct k_sigaction *ka,
    + sigset_t *set, struct pt_regs *regs);
    #endif
    diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
    index b45ef8d..87a9c2f 100644
    --- a/arch/x86/kernel/signal_64.c
    +++ b/arch/x86/kernel/signal_64.c
    @@ -19,9 +19,10 @@
    #include
    #include
    #include
    +#include
    +
    #include
    #include
    -#include
    #include
    #include
    #include
    @@ -41,11 +42,6 @@
    # define FIX_EFLAGS __FIX_EFLAGS
    #endif

    -int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    - sigset_t *set, struct pt_regs * regs);
    -int ia32_setup_frame(int sig, struct k_sigaction *ka,
    - sigset_t *set, struct pt_regs * regs);
    -
    asmlinkage long
    sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
    struct pt_regs *regs)
    @@ -119,7 +115,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
    /* Always make any pending restarted system calls return -EINTR */
    current_thread_info()->restart_block.fn = do_no_restart_syscall;

    -#define COPY(x) err |= __get_user(regs->x, &sc->x)
    +#define COPY(x) (err |= __get_user(regs->x, &sc->x))

    COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
    COPY(dx); COPY(cx); COPY(ip);
    @@ -149,7 +145,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
    }

    {
    - struct _fpstate __user * buf;
    + struct _fpstate __user *buf;
    err |= __get_user(buf, &sc->fpstate);

    if (buf) {
    @@ -189,7 +185,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
    current->blocked = set;
    recalc_sigpending();
    spin_unlock_irq(&current->sighand->siglock);
    -
    +
    if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
    goto badframe;

    @@ -199,16 +195,17 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
    return ax;

    badframe:
    - signal_fault(regs,frame,"sigreturn");
    + signal_fault(regs, frame, "sigreturn");
    return 0;
    -}
    +}

    /*
    * Set up a signal frame.
    */

    static inline int
    -setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, unsigned long mask, struct task_struct *me)
    +setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
    + unsigned long mask, struct task_struct *me)
    {
    int err = 0;

    @@ -264,35 +261,35 @@ get_stack(struct k_sigaction *ka, struct pt_regs *regs, unsigned long size)
    }

    static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    - sigset_t *set, struct pt_regs * regs)
    + sigset_t *set, struct pt_regs *regs)
    {
    struct rt_sigframe __user *frame;
    - struct _fpstate __user *fp = NULL;
    + struct _fpstate __user *fp = NULL;
    int err = 0;
    struct task_struct *me = current;

    if (used_math()) {
    - fp = get_stack(ka, regs, sizeof(struct _fpstate));
    + fp = get_stack(ka, regs, sizeof(struct _fpstate));
    frame = (void __user *)round_down(
    (unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;

    if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate)))
    goto give_sigsegv;

    - if (save_i387(fp) < 0)
    - err |= -1;
    + if (save_i387(fp) < 0)
    + err |= -1;
    } else
    frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;

    if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
    goto give_sigsegv;

    - if (ka->sa.sa_flags & SA_SIGINFO) {
    + if (ka->sa.sa_flags & SA_SIGINFO) {
    err |= copy_siginfo_to_user(&frame->info, info);
    if (err)
    goto give_sigsegv;
    }
    -
    +
    /* Create the ucontext. */
    err |= __put_user(0, &frame->uc.uc_flags);
    err |= __put_user(0, &frame->uc.uc_link);
    @@ -302,9 +299,9 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    err |= __put_user(me->sas_ss_size, &frame->uc.uc_stack.ss_size);
    err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0], me);
    err |= __put_user(fp, &frame->uc.uc_mcontext.fpstate);
    - if (sizeof(*set) == 16) {
    + if (sizeof(*set) == 16) {
    __put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);
    - __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
    + __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
    } else
    err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));

    @@ -315,7 +312,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
    err |= __put_user(ka->sa.sa_restorer, &frame->pretcode);
    } else {
    /* could use a vstub here */
    - goto give_sigsegv;
    + goto give_sigsegv;
    }

    if (err)
    @@ -323,7 +320,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

    /* Set up registers for signal handler */
    regs->di = sig;
    - /* In case the signal handler was declared without prototypes */
    + /* In case the signal handler was declared without prototypes */
    regs->ax = 0;

    /* This also works for non SA_SIGINFO handlers because they expect the
    @@ -376,7 +373,7 @@ static long current_syscall_ret(struct pt_regs *regs)

    /*
    * OK, we're invoking a handler
    - */
    + */

    static int
    handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
    @@ -420,7 +417,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
    ret = ia32_setup_rt_frame(sig, ka, info, oldset, regs);
    else
    ret = ia32_setup_frame(sig, ka, oldset, regs);
    - } else
    + } else
    #endif
    ret = setup_rt_frame(sig, ka, info, oldset, regs);

    @@ -448,9 +445,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
    ptrace_notify(SIGTRAP);

    spin_lock_irq(&current->sighand->siglock);
    - sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
    + sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
    if (!(ka->sa.sa_flags & SA_NODEFER))
    - sigaddset(&current->blocked,sig);
    + sigaddset(&current->blocked, sig);
    recalc_sigpending();
    spin_unlock_irq(&current->sighand->siglock);
    }
    @@ -552,14 +549,15 @@ void do_notify_resume(struct pt_regs *regs, void *unused,
    }

    void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
    -{
    - struct task_struct *me = current;
    +{
    + struct task_struct *me = current;
    if (show_unhandled_signals && printk_ratelimit()) {
    printk("%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx",
    - me->comm,me->pid,where,frame,regs->ip,regs->sp,regs->orig_ax);
    + me->comm, me->pid, where, frame, regs->ip,
    + regs->sp, regs->orig_ax);
    print_vma_addr(" in ", regs->ip);
    printk("\n");
    }

    - force_sig(SIGSEGV, me);
    -}
    + force_sig(SIGSEGV, me);
    +}
    --
    1.5.4.5

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  6. [PATCH 6/6] x86: coding style fixes to arch/x86/kernel/sys_x86_64.c

    Fix all errors and many warnings reported by checkpatch.pl
    without change sys_x86_64.o

    arch/x86/kernel/sys_x86_64.o:
    text data bss dec hex filename
    1567 0 0 1567 61f sys_x86_64.o.after
    1567 0 0 1567 61f sys_x86_64.o.before
    md5:
    de28ffedcb5851dfd7ec87a03afec1fd sys_x86_64.o.after
    de28ffedcb5851dfd7ec87a03afec1fd sys_x86_64.o.before

    Signed-off-by: Gustavo F. Padovan
    ---
    arch/x86/kernel/sys_x86_64.c | 43 +++++++++++++++++++++--------------------
    1 files changed, 22 insertions(+), 21 deletions(-)

    diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
    index 3b360ef..56eb8f9 100644
    --- a/arch/x86/kernel/sys_x86_64.c
    +++ b/arch/x86/kernel/sys_x86_64.c
    @@ -13,15 +13,16 @@
    #include
    #include
    #include
    +#include

    -#include
    #include

    -asmlinkage long sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags,
    - unsigned long fd, unsigned long off)
    +asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
    + unsigned long prot, unsigned long flags,
    + unsigned long fd, unsigned long off)
    {
    long error;
    - struct file * file;
    + struct file *file;

    error = -EINVAL;
    if (off & ~PAGE_MASK)
    @@ -56,9 +57,9 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
    unmapped base down for this case. This can give
    conflicts with the heap, but we assume that glibc
    malloc knows how to fall back to mmap. Give it 1GB
    - of playground for now. -AK */
    - *begin = 0x40000000;
    - *end = 0x80000000;
    + of playground for now. -AK */
    + *begin = 0x40000000;
    + *end = 0x80000000;
    if (current->flags & PF_RANDOMIZE) {
    new_begin = randomize_range(*begin, *begin + 0x02000000, 0);
    if (new_begin)
    @@ -66,9 +67,9 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
    }
    } else {
    *begin = TASK_UNMAPPED_BASE;
    - *end = TASK_SIZE;
    + *end = TASK_SIZE;
    }
    -}
    +}

    unsigned long
    arch_get_unmapped_area(struct file *filp, unsigned long addr,
    @@ -78,11 +79,11 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
    struct vm_area_struct *vma;
    unsigned long start_addr;
    unsigned long begin, end;
    -
    +
    if (flags & MAP_FIXED)
    return addr;

    - find_start_end(flags, &begin, &end);
    + find_start_end(flags, &begin, &end);

    if (len > end)
    return -ENOMEM;
    @@ -96,12 +97,12 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
    }
    if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
    && len <= mm->cached_hole_size) {
    - mm->cached_hole_size = 0;
    + mm->cached_hole_size = 0;
    mm->free_area_cache = begin;
    }
    addr = mm->free_area_cache;
    - if (addr < begin)
    - addr = begin;
    + if (addr < begin)
    + addr = begin;
    start_addr = addr;

    full_search:
    @@ -127,7 +128,7 @@ full_search:
    return addr;
    }
    if (addr + mm->cached_hole_size < vma->vm_start)
    - mm->cached_hole_size = vma->vm_start - addr;
    + mm->cached_hole_size = vma->vm_start - addr;

    addr = vma->vm_end;
    }
    @@ -177,7 +178,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
    vma = find_vma(mm, addr-len);
    if (!vma || addr <= vma->vm_start)
    /* remember the address as a hint for next time */
    - return (mm->free_area_cache = addr-len);
    + return mm->free_area_cache = addr-len;
    }

    if (mm->mmap_base < len)
    @@ -194,7 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
    vma = find_vma(mm, addr);
    if (!vma || addr+len <= vma->vm_start)
    /* remember the address as a hint for next time */
    - return (mm->free_area_cache = addr);
    + return mm->free_area_cache = addr;

    /* remember the largest hole we saw so far */
    if (addr + mm->cached_hole_size < vma->vm_start)
    @@ -224,13 +225,13 @@ bottomup:
    }


    -asmlinkage long sys_uname(struct new_utsname __user * name)
    +asmlinkage long sys_uname(struct new_utsname __user *name)
    {
    int err;
    down_read(&uts_sem);
    - err = copy_to_user(name, utsname(), sizeof (*name));
    + err = copy_to_user(name, utsname(), sizeof(*name));
    up_read(&uts_sem);
    - if (personality(current->personality) == PER_LINUX32)
    - err |= copy_to_user(&name->machine, "i686", 5);
    + if (personality(current->personality) == PER_LINUX32)
    + err |= copy_to_user(&name->machine, "i686", 5);
    return err ? -EFAULT : 0;
    }
    --
    1.5.4.5

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  7. [PATCH 1/6] x86: coding styles fixes to arch/x86/kernel/process_64.c

    Fix about 50 errors and many warnings without change process_64.o

    arch/x86/kernel/process_64.o:
    text data bss dec hex filename
    5236 8 24 5268 1494 process_64.o.after
    5236 8 24 5268 1494 process_64.o.before
    md5:
    9c35e9debdea4e471288c6e8ca267a75 process_64.o.after
    9c35e9debdea4e471288c6e8ca267a75 process_64.o.before

    Signed-off-by: Gustavo F. Padovan
    ---
    arch/x86/kernel/process_64.c | 101 +++++++++++++++++++++---------------------
    1 files changed, 50 insertions(+), 51 deletions(-)

    diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
    index 3fb62a7..4da8514 100644
    --- a/arch/x86/kernel/process_64.c
    +++ b/arch/x86/kernel/process_64.c
    @@ -37,11 +37,11 @@
    #include
    #include
    #include
    +#include
    +#include

    -#include
    #include
    #include
    -#include
    #include
    #include
    #include
    @@ -88,7 +88,7 @@ void exit_idle(void)
    #ifdef CONFIG_HOTPLUG_CPU
    DECLARE_PER_CPU(int, cpu_state);

    -#include
    +#include
    /* We halt the CPU with physical CPU hotplug */
    static inline void play_dead(void)
    {
    @@ -152,7 +152,7 @@ void cpu_idle(void)
    }

    /* Prints also some state that isn't saved in the pt_regs */
    -void __show_regs(struct pt_regs * regs)
    +void __show_regs(struct pt_regs *regs)
    {
    unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L, fs, gs, shadowgs;
    unsigned long d0, d1, d2, d3, d6, d7;
    @@ -177,28 +177,28 @@ void __show_regs(struct pt_regs * regs)
    printk("RBP: %016lx R08: %016lx R09: %016lx\n",
    regs->bp, regs->r8, regs->r9);
    printk("R10: %016lx R11: %016lx R12: %016lx\n",
    - regs->r10, regs->r11, regs->r12);
    + regs->r10, regs->r11, regs->r12);
    printk("R13: %016lx R14: %016lx R15: %016lx\n",
    - regs->r13, regs->r14, regs->r15);
    + regs->r13, regs->r14, regs->r15);

    - asm("movl %%ds,%0" : "=r" (ds));
    - asm("movl %%cs,%0" : "=r" (cs));
    - asm("movl %%es,%0" : "=r" (es));
    + asm("movl %%ds,%0" : "=r" (ds));
    + asm("movl %%cs,%0" : "=r" (cs));
    + asm("movl %%es,%0" : "=r" (es));
    asm("movl %%fs,%0" : "=r" (fsindex));
    asm("movl %%gs,%0" : "=r" (gsindex));

    rdmsrl(MSR_FS_BASE, fs);
    - rdmsrl(MSR_GS_BASE, gs);
    - rdmsrl(MSR_KERNEL_GS_BASE, shadowgs);
    + rdmsrl(MSR_GS_BASE, gs);
    + rdmsrl(MSR_KERNEL_GS_BASE, shadowgs);

    cr0 = read_cr0();
    cr2 = read_cr2();
    cr3 = read_cr3();
    cr4 = read_cr4();

    - printk("FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",
    - fs,fsindex,gs,gsindex,shadowgs);
    - printk("CS: %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds, es, cr0);
    + printk("FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",
    + fs, fsindex, gs, gsindex, shadowgs);
    + printk("CS: %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds, es, cr0);
    printk("CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3, cr4);

    get_debugreg(d0, 0);
    @@ -314,10 +314,10 @@ void prepare_to_copy(struct task_struct *tsk)

    int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
    unsigned long unused,
    - struct task_struct * p, struct pt_regs * regs)
    + struct task_struct *p, struct pt_regs *regs)
    {
    int err;
    - struct pt_regs * childregs;
    + struct pt_regs *childregs;
    struct task_struct *me = current;

    childregs = ((struct pt_regs *)
    @@ -362,10 +362,10 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
    if (test_thread_flag(TIF_IA32))
    err = do_set_thread_area(p, -1,
    (struct user_desc __user *)childregs->si, 0);
    - else
    -#endif
    - err = do_arch_prctl(p, ARCH_SET_FS, childregs->r8);
    - if (err)
    + else
    +#endif
    + err = do_arch_prctl(p, ARCH_SET_FS, childregs->r8);
    + if (err)
    goto out;
    }
    err = 0;
    @@ -544,7 +544,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
    unsigned fsindex, gsindex;

    /* we're going to use this soon, after a few expensive things */
    - if (next_p->fpu_counter>5)
    + if (next_p->fpu_counter > 5)
    prefetch(next->xstate);

    /*
    @@ -552,13 +552,13 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
    */
    load_sp0(tss, next);

    - /*
    + /*
    * Switch DS and ES.
    * This won't pick up thread selector changes, but I guess that is ok.
    */
    savesegment(es, prev->es);
    if (unlikely(next->es | prev->es))
    - loadsegment(es, next->es);
    + loadsegment(es, next->es);

    savesegment(ds, prev->ds);
    if (unlikely(next->ds | prev->ds))
    @@ -584,7 +584,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
    */
    arch_leave_lazy_cpu_mode();

    - /*
    + /*
    * Switch FS and GS.
    *
    * Segment register != 0 always requires a reload. Also
    @@ -593,13 +593,13 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
    */
    if (unlikely(fsindex | next->fsindex | prev->fs)) {
    loadsegment(fs, next->fsindex);
    - /*
    + /*
    * Check if the user used a selector != 0; if yes
    * clear 64bit base, since overloaded base is always
    * mapped to the Null selector
    */
    if (fsindex)
    - prev->fs = 0;
    + prev->fs = 0;
    }
    /* when next process has a 64bit base use it */
    if (next->fs)
    @@ -609,7 +609,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
    if (unlikely(gsindex | next->gsindex | prev->gs)) {
    load_gs_index(next->gsindex);
    if (gsindex)
    - prev->gs = 0;
    + prev->gs = 0;
    }
    if (next->gs)
    wrmsrl(MSR_KERNEL_GS_BASE, next->gs);
    @@ -618,12 +618,12 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
    /* Must be after DS reload */
    unlazy_fpu(prev_p);

    - /*
    + /*
    * Switch the PDA and FPU contexts.
    */
    prev->usersp = read_pda(oldrsp);
    write_pda(oldrsp, next->usersp);
    - write_pda(pcurrent, next_p);
    + write_pda(pcurrent, next_p);

    write_pda(kernelstack,
    (unsigned long)task_stack_page(next_p) +
    @@ -664,7 +664,7 @@ long sys_execve(char __user *name, char __user * __user *argv,
    char __user * __user *envp, struct pt_regs *regs)
    {
    long error;
    - char * filename;
    + char *filename;

    filename = getname(name);
    error = PTR_ERR(filename);
    @@ -722,55 +722,55 @@ asmlinkage long sys_vfork(struct pt_regs *regs)
    unsigned long get_wchan(struct task_struct *p)
    {
    unsigned long stack;
    - u64 fp,ip;
    + u64 fp, ip;
    int count = 0;

    - if (!p || p == current || p->state==TASK_RUNNING)
    - return 0;
    + if (!p || p == current || p->state == TASK_RUNNING)
    + return 0;
    stack = (unsigned long)task_stack_page(p);
    if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE)
    return 0;
    fp = *(u64 *)(p->thread.sp);
    - do {
    + do {
    if (fp < (unsigned long)stack ||
    fp > (unsigned long)stack+THREAD_SIZE)
    - return 0;
    + return 0;
    ip = *(u64 *)(fp+8);
    if (!in_sched_functions(ip))
    return ip;
    - fp = *(u64 *)fp;
    - } while (count++ < 16);
    + fp = *(u64 *)fp;
    + } while (count++ < 16);
    return 0;
    }

    long do_arch_prctl(struct task_struct *task, int code, unsigned long addr)
    -{
    - int ret = 0;
    +{
    + int ret = 0;
    int doit = task == current;
    int cpu;

    - switch (code) {
    + switch (code) {
    case ARCH_SET_GS:
    if (addr >= TASK_SIZE_OF(task))
    - return -EPERM;
    + return -EPERM;
    cpu = get_cpu();
    - /* handle small bases via the GDT because that's faster to
    + /* handle small bases via the GDT because that's faster to
    switch. */
    - if (addr <= 0xffffffff) {
    - set_32bit_tls(task, GS_TLS, addr);
    - if (doit) {
    + if (addr <= 0xffffffff) {
    + set_32bit_tls(task, GS_TLS, addr);
    + if (doit) {
    load_TLS(&task->thread, cpu);
    - load_gs_index(GS_TLS_SEL);
    + load_gs_index(GS_TLS_SEL);
    }
    - task->thread.gsindex = GS_TLS_SEL;
    + task->thread.gsindex = GS_TLS_SEL;
    task->thread.gs = 0;
    - } else {
    + } else {
    task->thread.gsindex = 0;
    task->thread.gs = addr;
    if (doit) {
    load_gs_index(0);
    ret = checking_wrmsrl(MSR_KERNEL_GS_BASE, addr);
    - }
    + }
    }
    put_cpu();
    break;
    @@ -824,8 +824,7 @@ long do_arch_prctl(struct task_struct *task, int code, unsigned long addr)
    rdmsrl(MSR_KERNEL_GS_BASE, base);
    else
    base = task->thread.gs;
    - }
    - else
    + } else
    base = task->thread.gs;
    ret = put_user(base, (unsigned long __user *)addr);
    break;
    --
    1.5.4.5

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  8. Re: [PATCH 0/6] x86: coding style fixes to arch/x86/kernel/


    * Gustavo F. Padovan wrote:

    > Ingo,
    >
    > I removed all errors and many warnings reported by checkpatch.pl for
    > five files into arch/x86/kernel. I used a Linus tree with this HEAD:
    > 63add2f2072e69c1eb7a5f6ca8f415122da889b9 which was commited seven
    > hours ago.


    applied to tip/x86/cleanups - thanks Gustavo.

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  9. Re: [PATCH 5/6] x86: coding style fixes to arch/x86/kernel/traps_64.c


    * Gustavo F. Padovan wrote:

    > void printk_address(unsigned long address, int reliable)
    > {
    > - printk(" [<%016lx>] %s%pS\n", address, reliable ? "": "? ", (void *) address);
    > + printk(" [<%016lx>] %s%pS\n", address, reliable ?
    > + "" : "? ", (void *) address);


    careful with line 80 warnings. This one is better broken up the
    following way:

    printk(" [<%016lx>] %s%pS\n",
    address, reliable ? "": "? ", (void *) address);

    so that logically coherent pieces of code stay together. (the arguments
    to the printk() function call in this case)

    > #if DEBUG_STKSZ > EXCEPTION_STKSZ
    > - [N_EXCEPTION_STACKS ... N_EXCEPTION_STACKS + DEBUG_STKSZ / EXCEPTION_STKSZ - 2] = "#DB[?]"
    > + [N_EXCEPTION_STACKS ... N_EXCEPTION_STACKS + DEBUG_STKSZ /
    > + EXCEPTION_STKSZ - 2] = "#DB[?]"


    this too is done better in another way:

    [N_EXCEPTION_STACKS ...
    N_EXCEPTION_STACKS + DEBUG_STKSZ / EXCEPTION_STKSZ - 2] = "#DB[?]"

    > - // debugging aid: "show_stack(NULL, NULL);" prints the
    > - // back trace for this cpu.
    > + /* debugging aid: "show_stack(NULL, NULL);" prints the
    > + back trace for this cpu. */


    please use the standard multi-line comment format:

    /*
    * Multi-line ...........
    * .............. comment.
    */

    i've applied your patches already to x86/cleanups, so please send a
    delta patch against that branch to fix these few items up. You can pick
    it up via:

    http://people.redhat.com/mingo/tip.git/README

    and do:

    git-checkout tip/x86/cleanups

    to check out that exact tree. (You might also want to work against
    tip/master, which has the same changes.)

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread