Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SCSI] esp: Fix build.
[SPARC]: Fix SA_STATIC_ALLOC value.
[SPARC64]: Explicitly print return PC when the kernel fault PC is bogus.
+3
arch/sparc64/mm/fault.c
+3
arch/sparc64/mm/fault.c
···
19
19
#include <linux/init.h>
20
20
#include <linux/interrupt.h>
21
21
#include <linux/kprobes.h>
22
+
#include <linux/kallsyms.h>
22
23
23
24
#include <asm/page.h>
24
25
#include <asm/pgtable.h>
···
133
132
134
133
printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
135
134
regs->tpc);
135
+
printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
136
+
print_symbol("RPC: <%s>\n", regs->u_regs[15]);
136
137
printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
137
138
__asm__("mov %%sp, %0" : "=r" (ksp));
138
139
show_stack(current, ksp);
+4
-8
drivers/scsi/esp.c
+4
-8
drivers/scsi/esp.c
···
2754
2754
*/
2755
2755
static int esp_should_clear_sync(struct scsi_cmnd *sp)
2756
2756
{
2757
-
u8 cmd1 = sp->cmnd[0];
2758
-
u8 cmd2 = sp->data_cmnd[0];
2757
+
u8 cmd = sp->cmnd[0];
2759
2758
2760
2759
/* These cases are for spinning up a disk and
2761
2760
* waiting for that spinup to complete.
2762
2761
*/
2763
-
if (cmd1 == START_STOP ||
2764
-
cmd2 == START_STOP)
2762
+
if (cmd == START_STOP)
2765
2763
return 0;
2766
2764
2767
-
if (cmd1 == TEST_UNIT_READY ||
2768
-
cmd2 == TEST_UNIT_READY)
2765
+
if (cmd == TEST_UNIT_READY)
2769
2766
return 0;
2770
2767
2771
2768
/* One more special case for SCSI tape drives,
···
2770
2773
* completion of a rewind or tape load operation.
2771
2774
*/
2772
2775
if (sp->device->type == TYPE_TAPE) {
2773
-
if (cmd1 == MODE_SENSE ||
2774
-
cmd2 == MODE_SENSE)
2776
+
if (cmd == MODE_SENSE)
2775
2777
return 0;
2776
2778
}
2777
2779