Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / kernel / process.c

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index c9a5e2ce8aa98831d4d498bd4442ebeaecf1b7e6..f219703168366f8142321b93750e0027f1e6c6b2 100644 (file)
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -225,11 +225,8 @@ void __show_regs(struct pt_regs *regs)
        unsigned long flags;
        char buf[64];
 
-       printk("CPU: %d    %s  (%s %.*s)\n",
-               raw_smp_processor_id(), print_tainted(),
-               init_utsname()->release,
-               (int)strcspn(init_utsname()->version, " "),
-               init_utsname()->version);
+       show_regs_print_info(KERN_DEFAULT);
+
        print_symbol("PC is at %s\n", instruction_pointer(regs));
        print_symbol("LR is at %s\n", regs->ARM_lr);
        printk("pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n"
@@ -284,7 +281,6 @@ void __show_regs(struct pt_regs *regs)
 void show_regs(struct pt_regs * regs)
 {
        printk("\n");
-       printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
        __show_regs(regs);
        dump_stack();
 }
@@ -411,15 +407,16 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  * atomic helpers and the signal restart code. Insert it into the
  * gate_vma so that it is visible through ptrace and /proc/<pid>/mem.
  */
-static struct vm_area_struct gate_vma;
+static struct vm_area_struct gate_vma = {
+       .vm_start       = 0xffff0000,
+       .vm_end         = 0xffff0000 + PAGE_SIZE,
+       .vm_flags       = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC,
+       .vm_mm          = &init_mm,
+};
 
 static int __init gate_vma_init(void)
 {
-       gate_vma.vm_start       = 0xffff0000;
-       gate_vma.vm_end         = 0xffff0000 + PAGE_SIZE;
-       gate_vma.vm_page_prot   = PAGE_READONLY_EXEC;
-       gate_vma.vm_flags       = VM_READ | VM_EXEC |
-                                 VM_MAYREAD | VM_MAYEXEC;
+       gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
        return 0;
 }
 arch_initcall(gate_vma_init);