tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Eliminate obsolete __handle_softirq() function
sparc64: Fix bootup crash on sun4v.

Linus Torvalds 7d93101f 6e117339

+1 -8
+1 -1
arch/sparc/kernel/ds.c
··· 1264 1264 return vio_register_driver(&ds_driver); 1265 1265 } 1266 1266 1267 - subsys_initcall(ds_init); 1267 + fs_initcall(ds_init);
-7
arch/sparc/kernel/rtrap_64.S
··· 20 20 21 21 .text 22 22 .align 32 23 - __handle_softirq: 24 - call do_softirq 25 - nop 26 - ba,a,pt %xcc, __handle_softirq_continue 27 - nop 28 23 __handle_preemption: 29 24 call schedule 30 25 wrpr %g0, RTRAP_PSTATE, %pstate ··· 84 89 cmp %l1, 0 85 90 86 91 /* mm/ultra.S:xcall_report_regs KNOWS about this load. */ 87 - bne,pn %icc, __handle_softirq 88 92 ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 89 - __handle_softirq_continue: 90 93 rtrap_xcall: 91 94 sethi %hi(0xf << 20), %l4 92 95 and %l1, %l4, %l4