Commit f608600e authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files

[POWERPC] Clean up access to thread_info in assembly 



Use (31-THREAD_SHIFT) to get to thread_info from stack pointer.  This makes
the code a bit easier to read and more robust if we ever change THREAD_SHIFT.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 885aa35c

arch/powerpc/kernel/misc_32.S

+3 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ _GLOBAL(low_choose_750fx_pll) 
	mtspr	SPRN_HID1,r4



	/* Store new HID1 image */

	rlwinm	r6,r1,0,0,18

	rlwinm	r6,r1,0,0,(31-THREAD_SHIFT)

	lwz	r6,TI_CPU(r6)

	slwi	r6,r6,2

	addis	r6,r6,nap_save_hid1@ha
@@ -281,7 +281,7 @@ _GLOBAL(_tlbia) 
#endif /* CONFIG_SMP */

#else /* !(CONFIG_40x || CONFIG_44x || CONFIG_FSL_BOOKE) */

#if defined(CONFIG_SMP)

	rlwinm	r8,r1,0,0,18

	rlwinm	r8,r1,0,0,(31-THREAD_SHIFT)

	lwz	r8,TI_CPU(r8)

	oris	r8,r8,10

	mfmsr	r10
@@ -377,7 +377,7 @@ _GLOBAL(_tlbie) 
#endif /* CONFIG_SMP */

#else /* !(CONFIG_40x || CONFIG_44x || CONFIG_FSL_BOOKE) */

#if defined(CONFIG_SMP)

	rlwinm	r8,r1,0,0,18

	rlwinm	r8,r1,0,0,(31-THREAD_SHIFT)

	lwz	r8,TI_CPU(r8)

	oris	r8,r8,11

	mfmsr	r10

arch/powerpc/mm/hash_low_32.S

+2 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ _GLOBAL(add_hash_page) 
	add	r3,r3,r0		/* note create_hpte trims to 24 bits */



#ifdef CONFIG_SMP

	rlwinm	r8,r1,0,0,18		/* use cpu number to make tag */

	rlwinm	r8,r1,0,0,(31-THREAD_SHIFT) /* use cpu number to make tag */

	lwz	r8,TI_CPU(r8)		/* to go in mmu_hash_lock */

	oris	r8,r8,12

#endif /* CONFIG_SMP */
@@ -526,7 +526,7 @@ _GLOBAL(flush_hash_pages) 
#ifdef CONFIG_SMP

	addis	r9,r7,mmu_hash_lock@ha

	addi	r9,r9,mmu_hash_lock@l

	rlwinm	r8,r1,0,0,18

	rlwinm	r8,r1,0,0,(31-THREAD_SHIFT)

	add	r8,r8,r7

	lwz	r8,TI_CPU(r8)

	oris	r8,r8,9

CRA Git | Maintained and supported by SUSTech CRA and CCSE