Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b14662ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sparc changes from David Miller:
 "Several bug fixes (from Kirill Tkhai, Geery Uytterhoeven, and Alexey
  Dobriyan) and some support for Fujitsu sparc64x chips (from Allen
  Pais)"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Export flush_ptrace_access() (needed by lustre)
  sparc: fix PCI device proc file mmap(2)
  sparc64: Remove RWSEM export leftovers
  sparc64: Fix off by one in trampoline TLB mapping installation loop.
  sparc64: Fix ITLB handler of null page
  esp_scsi: Fix tag state corruption when autosensing.
  sparc64: Fix not SRA'ed %o5 in 32-bit traced syscall
  sparc64: cleanup: Rename ret_from_syscall to ret_from_fork
  sparc32: Fix exit flag passed from traced sys_sigreturn
  sparc64: Fix wrong syscall return value passed to trace_sys_exit()
  support sparc64x chip type in cpumap.c
  cpu hw caps support for sparc64x
parents cc998ff8 dc76f9ca

arch/sparc/include/asm/switch_to_64.h

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ do { save_and_clear_fpu(); \ 
	"wrpr	%%g0, 14, %%pil\n\t"					\

	"brz,pt %%o7, switch_to_pc\n\t"					\

	" mov	%%g7, %0\n\t"						\

	"sethi	%%hi(ret_from_syscall), %%g1\n\t"			\

	"jmpl	%%g1 + %%lo(ret_from_syscall), %%g0\n\t"		\

	"sethi	%%hi(ret_from_fork), %%g1\n\t"				\

	"jmpl	%%g1 + %%lo(ret_from_fork), %%g0\n\t"			\

	" nop\n\t"							\

	".globl switch_to_pc\n\t"					\

	"switch_to_pc:\n\t"						\

arch/sparc/kernel/cpumap.c

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ static int iterate_cpu(struct cpuinfo_tree *t, unsigned int root_index) 
	case SUN4V_CHIP_NIAGARA3:

	case SUN4V_CHIP_NIAGARA4:

	case SUN4V_CHIP_NIAGARA5:

	case SUN4V_CHIP_SPARC64X:

		rover_inc_table = niagara_iterate_method;

		break;

	default:

arch/sparc/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ sys_sigreturn: 
	 nop



	call	syscall_trace

	 nop

	 mov	1, %o1



1:

	/* We don't want to muck with user registers like a

arch/sparc/kernel/kgdb_64.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p) 
{

	struct thread_info *t = task_thread_info(p);

	extern unsigned int switch_to_pc;

	extern unsigned int ret_from_syscall;

	extern unsigned int ret_from_fork;

	struct reg_window *win;

	unsigned long pc, cwp;

	int i;
@@ -66,7 +66,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p) 
		gdb_regs[i] = 0;



	if (t->new_child)

		pc = (unsigned long) &ret_from_syscall;

		pc = (unsigned long) &ret_from_fork;

	else

		pc = (unsigned long) &switch_to_pc;

arch/sparc/kernel/ktlb.S

+1 −2
Original line number Diff line number Diff line
@@ -25,11 +25,10 @@ kvmap_itlb: 
	 */

kvmap_itlb_4v:



kvmap_itlb_nonlinear:

	/* Catch kernel NULL pointer calls.  */

	sethi		%hi(PAGE_SIZE), %g5

	cmp		%g4, %g5

	bleu,pn		%xcc, kvmap_dtlb_longpath

	blu,pn		%xcc, kvmap_itlb_longpath

	 nop



	KERN_TSB_LOOKUP_TL1(%g4, %g6, %g5, %g1, %g2, %g3, kvmap_itlb_load)