Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (fe0c9f58) · Commits · e / devices / android_kernel_teracube_2e

arch/sparc64/mm/ultra.S

+3 −2

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ __flush_tlb_pending:
		flush %g6
		retl
		wrpr %g7, 0x0, %pstate
		nop

		.align 32
		.globl __flush_tlb_kernel_range
		@@ -249,7 +250,7 @@ __cheetah_flush_tlb_mm: /* 15 insns */
		retl
		wrpr %g7, 0x0, %pstate

		__cheetah_flush_tlb_pending: /* 22 insns */
		__cheetah_flush_tlb_pending: /* 23 insns */
		/* %o0 = context, %o1 = nr, %o2 = vaddrs[] */
		rdpr %pstate, %g7
		sllx %o1, 3, %o1
		@@ -317,7 +318,7 @@ cheetah_patch_cachetlbops:
		sethi %hi(__cheetah_flush_tlb_pending), %o1
		or %o1, %lo(__cheetah_flush_tlb_pending), %o1
		call cheetah_patch_one
		mov 22, %o2
		mov 23, %o2

		#ifdef DCACHE_ALIASING_POSSIBLE
		sethi %hi(__flush_dcache_page), %o0