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 a sparc fix from David Miller.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Do not clobber %g2 in xcall_fetch_glob_regs().

Linus Torvalds 9e5869f8 f3b26922

+4 -4
+1 -1
arch/sparc/kernel/central.c
··· 269 269 return 0; 270 270 } 271 271 272 - subsys_initcall(sunfire_init); 272 + fs_initcall(sunfire_init);
+3 -3
arch/sparc/mm/ultra.S
··· 495 495 stx %o7, [%g1 + GR_SNAP_O7] 496 496 stx %i7, [%g1 + GR_SNAP_I7] 497 497 /* Don't try this at home kids... */ 498 - rdpr %cwp, %g2 499 - sub %g2, 1, %g7 498 + rdpr %cwp, %g3 499 + sub %g3, 1, %g7 500 500 wrpr %g7, %cwp 501 501 mov %i7, %g7 502 - wrpr %g2, %cwp 502 + wrpr %g3, %cwp 503 503 stx %g7, [%g1 + GR_SNAP_RPC] 504 504 sethi %hi(trap_block), %g7 505 505 or %g7, %lo(trap_block), %g7