Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19c5870c authored Oct 18, 2007 by Alexey Dobriyan Committed by Linus Torvalds Oct 19, 2007

Use helpers to obtain task pid in printks (arch code)



One of the easiest things to isolate is the pid printed in kernel log.
There was a patch, that made this for arch-independent code, this one makes
so for arch/xxx files.

It took some time to cross-compile it, but hopefully these are all the
printks in arch code.

Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ba25f9dc

arch/alpha/kernel/semaphore.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ __down_failed(struct semaphore *sem)

		#ifdef CONFIG_DEBUG_SEMAPHORE
		printk("%s(%d): down failed(%p)\n",
		tsk->comm, tsk->pid, sem);
		tsk->comm, task_pid_nr(tsk), sem);
		#endif

		tsk->state = TASK_UNINTERRUPTIBLE;
		@@ -98,7 +98,7 @@ __down_failed(struct semaphore *sem)

		#ifdef CONFIG_DEBUG_SEMAPHORE
		printk("%s(%d): down acquired(%p)\n",
		tsk->comm, tsk->pid, sem);
		tsk->comm, task_pid_nr(tsk), sem);
		#endif
		}

		@@ -111,7 +111,7 @@ __down_failed_interruptible(struct semaphore *sem)

		#ifdef CONFIG_DEBUG_SEMAPHORE
		printk("%s(%d): down failed(%p)\n",
		tsk->comm, tsk->pid, sem);
		tsk->comm, task_pid_nr(tsk), sem);
		#endif

		tsk->state = TASK_INTERRUPTIBLE;
		@@ -139,7 +139,7 @@ __down_failed_interruptible(struct semaphore *sem)

		#ifdef CONFIG_DEBUG_SEMAPHORE
		printk("%s(%d): down %s(%p)\n",
		current->comm, current->pid,
		current->comm, task_pid_nr(current),
		(ret < 0 ? "interrupted" : "acquired"), sem);
		#endif
		return ret;
		@@ -168,7 +168,7 @@ down(struct semaphore *sem)
		#endif
		#ifdef CONFIG_DEBUG_SEMAPHORE
		printk("%s(%d): down(%p) <count=%d> from %p\n",
		current->comm, current->pid, sem,
		current->comm, task_pid_nr(current), sem,
		atomic_read(&sem->count), __builtin_return_address(0));
		#endif
		__down(sem);
		@@ -182,7 +182,7 @@ down_interruptible(struct semaphore *sem)
		#endif
		#ifdef CONFIG_DEBUG_SEMAPHORE
		printk("%s(%d): down(%p) <count=%d> from %p\n",
		current->comm, current->pid, sem,
		current->comm, task_pid_nr(current), sem,
		atomic_read(&sem->count), __builtin_return_address(0));
		#endif
		return __down_interruptible(sem);
		@@ -201,7 +201,7 @@ down_trylock(struct semaphore *sem)

		#ifdef CONFIG_DEBUG_SEMAPHORE
		printk("%s(%d): down_trylock %s from %p\n",
		current->comm, current->pid,
		current->comm, task_pid_nr(current),
		ret ? "failed" : "acquired",
		__builtin_return_address(0));
		#endif
		@@ -217,7 +217,7 @@ up(struct semaphore *sem)
		#endif
		#ifdef CONFIG_DEBUG_SEMAPHORE
		printk("%s(%d): up(%p) <count=%d> from %p\n",
		current->comm, current->pid, sem,
		current->comm, task_pid_nr(current), sem,
		atomic_read(&sem->count), __builtin_return_address(0));
		#endif
		__up(sem);

arch/alpha/kernel/traps.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ die_if_kernel(char * str, struct pt_regs regs, long err, unsigned long r9_15)
		#ifdef CONFIG_SMP
		printk("CPU %d ", hard_smp_processor_id());
		#endif
		printk("%s(%d): %s %ld\n", current->comm, current->pid, str, err);
		printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
		dik_show_regs(regs, r9_15);
		add_taint(TAINT_DIE);
		dik_show_trace((unsigned long *)(regs+1));
		@@ -646,7 +646,7 @@ got_exception:
		lock_kernel();

		printk("%s(%d): unhandled unaligned exception\n",
		current->comm, current->pid);
		current->comm, task_pid_nr(current));

		printk("pc = [<%016lx>] ra = [<%016lx>] ps = %04lx\n",
		pc, una_reg(26), regs->ps);
		@@ -786,7 +786,7 @@ do_entUnaUser(void __user * va, unsigned long opcode,
		}
		if (++cnt < 5) {
		printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n",
		current->comm, current->pid,
		current->comm, task_pid_nr(current),
		regs->pc - 4, va, opcode, reg);
		}
		last_time = jiffies;

arch/alpha/mm/fault.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
		goto survive;
		}
		printk(KERN_ALERT "VM: killing process %s(%d)\n",
		current->comm, current->pid);
		current->comm, task_pid_nr(current));
		if (!user_mode(regs))
		goto no_context;
		do_group_exit(SIGKILL);

arch/arm/kernel/process.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -265,7 +265,7 @@ void __show_regs(struct pt_regs *regs)
		void show_regs(struct pt_regs * regs)
		{
		printk("\n");
		printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
		printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
		__show_regs(regs);
		__backtrace();
		}

arch/arm/kernel/ptrace.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -382,16 +382,16 @@ static void clear_breakpoint(struct task_struct task, struct debug_entry bp)

		if (ret != 2 \|\| old_insn.thumb != BREAKINST_THUMB)
		printk(KERN_ERR "%s:%d: corrupted Thumb breakpoint at "
		"0x%08lx (0x%04x)\n", task->comm, task->pid,
		addr, old_insn.thumb);
		"0x%08lx (0x%04x)\n", task->comm,
		task_pid_nr(task), addr, old_insn.thumb);
		} else {
		ret = swap_insn(task, addr & ~3, &old_insn.arm,
		&bp->insn.arm, 4);

		if (ret != 4 \|\| old_insn.arm != BREAKINST_ARM)
		printk(KERN_ERR "%s:%d: corrupted ARM breakpoint at "
		"0x%08lx (0x%08x)\n", task->comm, task->pid,
		addr, old_insn.arm);
		"0x%08lx (0x%08x)\n", task->comm,
		task_pid_nr(task), addr, old_insn.arm);
		}
		}