Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix crash with /proc/iomem
sparc64: Reschedule KGDB capture to a software interrupt.
sbus: Auto-load openprom module when device opened.
+12
-25
+1
arch/sparc/include/asm/pil.h
+1
arch/sparc/include/asm/pil.h
+1
-1
arch/sparc/kernel/kgdb_64.c
+1
-1
arch/sparc/kernel/kgdb_64.c
+1
-1
arch/sparc/kernel/pci_common.c
+1
-1
arch/sparc/kernel/pci_common.c
···
368
368
const u32 *vdma = of_get_property(pbm->op->node, "virtual-dma", NULL);
369
369
370
370
if (vdma) {
371
-
struct resource *rp = kmalloc(sizeof(*rp), GFP_KERNEL);
371
+
struct resource *rp = kzalloc(sizeof(*rp), GFP_KERNEL);
372
372
373
373
if (!rp) {
374
374
prom_printf("Cannot allocate IOMMU resource.\n");
+6
-1
arch/sparc/kernel/ttable.S
+6
-1
arch/sparc/kernel/ttable.S
···
64
64
tl0_irq6: BTRAP(0x46)
65
65
#endif
66
66
tl0_irq7: TRAP_IRQ(deferred_pcr_work_irq, 7)
67
-
tl0_irq8: BTRAP(0x48) BTRAP(0x49)
67
+
#ifdef CONFIG_KGDB
68
+
tl0_irq8: TRAP_IRQ(smp_kgdb_capture_client, 8)
69
+
#else
70
+
tl0_irq8: BTRAP(0x48)
71
+
#endif
72
+
tl0_irq9: BTRAP(0x49)
68
73
tl0_irq10: BTRAP(0x4a) BTRAP(0x4b) BTRAP(0x4c) BTRAP(0x4d)
69
74
tl0_irq14: TRAP_IRQ(timer_interrupt, 14)
70
75
tl0_irq15: TRAP_NMI_IRQ(perfctr_irq, 15)
+2
-22
arch/sparc/mm/ultra.S
+2
-22
arch/sparc/mm/ultra.S
···
679
679
#ifdef CONFIG_KGDB
680
680
.globl xcall_kgdb_capture
681
681
xcall_kgdb_capture:
682
-
661: rdpr %pstate, %g2
683
-
wrpr %g2, PSTATE_IG | PSTATE_AG, %pstate
684
-
.section .sun4v_2insn_patch, "ax"
685
-
.word 661b
686
-
nop
687
-
nop
688
-
.previous
689
-
690
-
rdpr %pil, %g2
691
-
wrpr %g0, PIL_NORMAL_MAX, %pil
692
-
sethi %hi(109f), %g7
693
-
ba,pt %xcc, etrap_irq
694
-
109: or %g7, %lo(109b), %g7
695
-
#ifdef CONFIG_TRACE_IRQFLAGS
696
-
call trace_hardirqs_off
697
-
nop
698
-
#endif
699
-
call smp_kgdb_capture_client
700
-
add %sp, PTREGS_OFF, %o0
701
-
/* Has to be a non-v9 branch due to the large distance. */
702
-
ba rtrap_xcall
703
-
ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1
682
+
wr %g0, (1 << PIL_KGDB_CAPTURE), %set_softint
683
+
retry
704
684
#endif
705
685
706
686
#endif /* CONFIG_SMP */
+1
drivers/sbus/char/openprom.c
+1
drivers/sbus/char/openprom.c