diff options
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/Kconfig | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/signal.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/traps.c | 10 | ||||
-rw-r--r-- | arch/parisc/kernel/unaligned.c | 2 | ||||
-rw-r--r-- | arch/parisc/mm/fault.c | 2 | ||||
-rw-r--r-- | arch/parisc/oprofile/Kconfig | 23 |
6 files changed, 9 insertions, 32 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 3d73545e8c48..b8ef1787a191 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -267,7 +267,7 @@ source "drivers/Kconfig" | |||
267 | 267 | ||
268 | source "fs/Kconfig" | 268 | source "fs/Kconfig" |
269 | 269 | ||
270 | source "arch/parisc/oprofile/Kconfig" | 270 | source "kernel/Kconfig.instrumentation" |
271 | 271 | ||
272 | source "arch/parisc/Kconfig.debug" | 272 | source "arch/parisc/Kconfig.debug" |
273 | 273 | ||
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c index fb35ebc0c4da..2ce3806f02e1 100644 --- a/arch/parisc/kernel/signal.c +++ b/arch/parisc/kernel/signal.c | |||
@@ -181,7 +181,7 @@ give_sigsegv: | |||
181 | si.si_signo = SIGSEGV; | 181 | si.si_signo = SIGSEGV; |
182 | si.si_errno = 0; | 182 | si.si_errno = 0; |
183 | si.si_code = SI_KERNEL; | 183 | si.si_code = SI_KERNEL; |
184 | si.si_pid = current->pid; | 184 | si.si_pid = task_pid_vnr(current); |
185 | si.si_uid = current->uid; | 185 | si.si_uid = current->uid; |
186 | si.si_addr = &frame->uc; | 186 | si.si_addr = &frame->uc; |
187 | force_sig_info(SIGSEGV, &si, current); | 187 | force_sig_info(SIGSEGV, &si, current); |
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index bbf029a184ac..99fd56939afa 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
@@ -219,7 +219,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err) | |||
219 | return; /* STFU */ | 219 | return; /* STFU */ |
220 | 220 | ||
221 | printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", | 221 | printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", |
222 | current->comm, current->pid, str, err, regs->iaoq[0]); | 222 | current->comm, task_pid_nr(current), str, err, regs->iaoq[0]); |
223 | #ifdef PRINT_USER_FAULTS | 223 | #ifdef PRINT_USER_FAULTS |
224 | /* XXX for debugging only */ | 224 | /* XXX for debugging only */ |
225 | show_regs(regs); | 225 | show_regs(regs); |
@@ -252,7 +252,7 @@ KERN_CRIT " || ||\n"); | |||
252 | 252 | ||
253 | if (err) | 253 | if (err) |
254 | printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n", | 254 | printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n", |
255 | current->comm, current->pid, str, err); | 255 | current->comm, task_pid_nr(current), str, err); |
256 | 256 | ||
257 | /* Wot's wrong wif bein' racy? */ | 257 | /* Wot's wrong wif bein' racy? */ |
258 | if (current->thread.flags & PARISC_KERNEL_DEATH) { | 258 | if (current->thread.flags & PARISC_KERNEL_DEATH) { |
@@ -317,7 +317,7 @@ static void handle_break(struct pt_regs *regs) | |||
317 | if (unlikely(iir != GDB_BREAK_INSN)) { | 317 | if (unlikely(iir != GDB_BREAK_INSN)) { |
318 | printk(KERN_DEBUG "break %d,%d: pid=%d command='%s'\n", | 318 | printk(KERN_DEBUG "break %d,%d: pid=%d command='%s'\n", |
319 | iir & 31, (iir>>13) & ((1<<13)-1), | 319 | iir & 31, (iir>>13) & ((1<<13)-1), |
320 | current->pid, current->comm); | 320 | task_pid_nr(current), current->comm); |
321 | show_regs(regs); | 321 | show_regs(regs); |
322 | } | 322 | } |
323 | #endif | 323 | #endif |
@@ -747,7 +747,7 @@ void handle_interruption(int code, struct pt_regs *regs) | |||
747 | if (user_mode(regs)) { | 747 | if (user_mode(regs)) { |
748 | #ifdef PRINT_USER_FAULTS | 748 | #ifdef PRINT_USER_FAULTS |
749 | printk(KERN_DEBUG "\nhandle_interruption() pid=%d command='%s'\n", | 749 | printk(KERN_DEBUG "\nhandle_interruption() pid=%d command='%s'\n", |
750 | current->pid, current->comm); | 750 | task_pid_nr(current), current->comm); |
751 | show_regs(regs); | 751 | show_regs(regs); |
752 | #endif | 752 | #endif |
753 | /* SIGBUS, for lack of a better one. */ | 753 | /* SIGBUS, for lack of a better one. */ |
@@ -772,7 +772,7 @@ void handle_interruption(int code, struct pt_regs *regs) | |||
772 | else | 772 | else |
773 | printk(KERN_DEBUG "User Fault (long pointer) (fault %d) ", | 773 | printk(KERN_DEBUG "User Fault (long pointer) (fault %d) ", |
774 | code); | 774 | code); |
775 | printk("pid=%d command='%s'\n", current->pid, current->comm); | 775 | printk("pid=%d command='%s'\n", task_pid_nr(current), current->comm); |
776 | show_regs(regs); | 776 | show_regs(regs); |
777 | #endif | 777 | #endif |
778 | si.si_signo = SIGSEGV; | 778 | si.si_signo = SIGSEGV; |
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c index 347bb922e6d0..aebf3c168871 100644 --- a/arch/parisc/kernel/unaligned.c +++ b/arch/parisc/kernel/unaligned.c | |||
@@ -469,7 +469,7 @@ void handle_unaligned(struct pt_regs *regs) | |||
469 | && ++unaligned_count < 5) { | 469 | && ++unaligned_count < 5) { |
470 | char buf[256]; | 470 | char buf[256]; |
471 | sprintf(buf, "%s(%d): unaligned access to 0x" RFMT " at ip=0x" RFMT "\n", | 471 | sprintf(buf, "%s(%d): unaligned access to 0x" RFMT " at ip=0x" RFMT "\n", |
472 | current->comm, current->pid, regs->ior, regs->iaoq[0]); | 472 | current->comm, task_pid_nr(current), regs->ior, regs->iaoq[0]); |
473 | printk(KERN_WARNING "%s", buf); | 473 | printk(KERN_WARNING "%s", buf); |
474 | #ifdef DEBUG_UNALIGNED | 474 | #ifdef DEBUG_UNALIGNED |
475 | show_regs(regs); | 475 | show_regs(regs); |
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index 1c091b415cd9..b2e3e9a8cece 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c | |||
@@ -211,7 +211,7 @@ bad_area: | |||
211 | #ifdef PRINT_USER_FAULTS | 211 | #ifdef PRINT_USER_FAULTS |
212 | printk(KERN_DEBUG "\n"); | 212 | printk(KERN_DEBUG "\n"); |
213 | printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n", | 213 | printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n", |
214 | tsk->pid, tsk->comm, code, address); | 214 | task_pid_nr(tsk), tsk->comm, code, address); |
215 | if (vma) { | 215 | if (vma) { |
216 | printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", | 216 | printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", |
217 | vma->vm_start, vma->vm_end); | 217 | vma->vm_start, vma->vm_end); |
diff --git a/arch/parisc/oprofile/Kconfig b/arch/parisc/oprofile/Kconfig deleted file mode 100644 index 5ade19801b97..000000000000 --- a/arch/parisc/oprofile/Kconfig +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | |||
2 | menu "Profiling support" | ||
3 | depends on EXPERIMENTAL | ||
4 | |||
5 | config PROFILING | ||
6 | bool "Profiling support (EXPERIMENTAL)" | ||
7 | help | ||
8 | Say Y here to enable the extended profiling support mechanisms used | ||
9 | by profilers such as OProfile. | ||
10 | |||
11 | |||
12 | config OPROFILE | ||
13 | tristate "OProfile system profiling (EXPERIMENTAL)" | ||
14 | depends on PROFILING | ||
15 | help | ||
16 | OProfile is a profiling system capable of profiling the | ||
17 | whole system, include the kernel, kernel modules, libraries, | ||
18 | and applications. | ||
19 | |||
20 | If unsure, say N. | ||
21 | |||
22 | endmenu | ||
23 | |||