system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 02:57:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Linus Torvalds 2012-04-13 12:41:21 -07:00
parent 6e1173399d 3d3eeb2ef2
commit 7d93101fc7
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc/kernel/ds.c
View file

@ -1264,4 +1264,4 @@ static int __init ds_init(void)
return vio_register_driver(&ds_driver); return vio_register_driver(&ds_driver);
} }
subsys_initcall(ds_init); fs_initcall(ds_init);

7
arch/sparc/kernel/rtrap_64.S
View file

@ -20,11 +20,6 @@
.text .text
.align 32 .align 32
__handle_softirq:
call do_softirq
nop
ba,a,pt %xcc, __handle_softirq_continue
nop
__handle_preemption: __handle_preemption:
call schedule call schedule
wrpr %g0, RTRAP_PSTATE, %pstate wrpr %g0, RTRAP_PSTATE, %pstate
@ -89,9 +84,7 @@ rtrap:
cmp %l1, 0 cmp %l1, 0
/* mm/ultra.S:xcall_report_regs KNOWS about this load. */ /* mm/ultra.S:xcall_report_regs KNOWS about this load. */
bne,pn %icc, __handle_softirq
ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1
__handle_softirq_continue:
rtrap_xcall: rtrap_xcall:
sethi %hi(0xf << 20), %l4 sethi %hi(0xf << 20), %l4
and %l1, %l4, %l4 and %l1, %l4, %l4