mmap locking API: use coccinelle to convert mmap_sem rwsem call sites

[linux-block.git] / arch / alpha / kernel / traps.c

diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index f6b9664ac5042d7eca61c9889c321648cf532761..49754e07e04f47e596ad0662b484283b974cb786 100644 (file)
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -121,10 +121,10 @@ dik_show_code(unsigned int *pc)
 }
 
 static void
-dik_show_trace(unsigned long *sp)
+dik_show_trace(unsigned long *sp, const char *loglvl)
 {
        long i = 0;
-       printk("Trace:\n");
+       printk("%sTrace:\n", loglvl);
        while (0x1ff8 & (unsigned long) sp) {
                extern char _stext[], _etext[];
                unsigned long tmp = *sp;
@@ -133,24 +133,24 @@ dik_show_trace(unsigned long *sp)
                        continue;
                if (tmp >= (unsigned long) &_etext)
                        continue;
-               printk("[<%lx>] %pSR\n", tmp, (void *)tmp);
+               printk("%s[<%lx>] %pSR\n", loglvl, tmp, (void *)tmp);
                if (i > 40) {
-                       printk(" ...");
+                       printk("%s ...", loglvl);
                        break;
                }
        }
-       printk("\n");
+       printk("%s\n", loglvl);
 }
 
 static int kstack_depth_to_print = 24;
 
-void show_stack(struct task_struct *task, unsigned long *sp)
+void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
 {
        unsigned long *stack;
        int i;
 
        /*
-        * debugging aid: "show_stack(NULL);" prints the
+        * debugging aid: "show_stack(NULL, NULL, KERN_EMERG);" prints the
         * back trace for this cpu.
         */
        if(sp==NULL)
@@ -163,14 +163,14 @@ void show_stack(struct task_struct *task, unsigned long *sp)
                if ((i % 4) == 0) {
                        if (i)
                                pr_cont("\n");
-                       printk("       ");
+                       printk("%s       ", loglvl);
                } else {
                        pr_cont(" ");
                }
                pr_cont("%016lx", *stack++);
        }
        pr_cont("\n");
-       dik_show_trace(sp);
+       dik_show_trace(sp, loglvl);
 }
 
 void
@@ -184,7 +184,7 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)
        printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
        dik_show_regs(regs, r9_15);
        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
-       dik_show_trace((unsigned long *)(regs+1));
+       dik_show_trace((unsigned long *)(regs+1), KERN_DEFAULT);
        dik_show_code((unsigned int *)regs->pc);
 
        if (test_and_set_thread_flag (TIF_DIE_IF_KERNEL)) {
@@ -625,7 +625,7 @@ got_exception:
        printk("gp = %016lx  sp = %p\n", regs->gp, regs+1);
 
        dik_show_code((unsigned int *)pc);
-       dik_show_trace((unsigned long *)(regs+1));
+       dik_show_trace((unsigned long *)(regs+1), KERN_DEFAULT);
 
        if (test_and_set_thread_flag (TIF_DIE_IF_KERNEL)) {
                printk("die_if_kernel recursion detected.\n");
@@ -957,12 +957,12 @@ give_sigsegv:
                si_code = SEGV_ACCERR;
        else {
                struct mm_struct *mm = current->mm;
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                if (find_vma(mm, (unsigned long)va))
                        si_code = SEGV_ACCERR;
                else
                        si_code = SEGV_MAPERR;
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        }
        send_sig_fault(SIGSEGV, si_code, va, 0, current);
        return;