Commit 7d93101f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 6e117339 3d3eeb2e

arch/sparc/kernel/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -1264,4 +1264,4 @@ static int __init ds_init(void) 
	return vio_register_driver(&ds_driver);

}



subsys_initcall(ds_init);
 
fs_initcall(ds_init);

arch/sparc/kernel/rtrap_64.S

+0 −7
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ 


		.text

		.align			32

__handle_softirq:

		call			do_softirq

		 nop

		ba,a,pt			%xcc, __handle_softirq_continue

		 nop

__handle_preemption:

		call			schedule

		 wrpr			%g0, RTRAP_PSTATE, %pstate
@@ -89,9 +84,7 @@ rtrap: 
		cmp			%l1, 0



		/* mm/ultra.S:xcall_report_regs KNOWS about this load. */

		bne,pn			%icc, __handle_softirq

		 ldx			[%sp + PTREGS_OFF + PT_V9_TSTATE], %l1

__handle_softirq_continue:

rtrap_xcall:

		sethi			%hi(0xf << 20), %l4

		and			%l1, %l4, %l4