Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (9e233113) · Commits · e / devices / android_kernel_fairphone_FP5

arch/sparc/mm/init_64.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1618,18 +1618,20 @@ static void ktsb_phys_patch(void)
	{		{
	extern unsigned int __swapper_tsb_phys_patch;		extern unsigned int __swapper_tsb_phys_patch;
	extern unsigned int __swapper_tsb_phys_patch_end;		extern unsigned int __swapper_tsb_phys_patch_end;
	extern unsigned int __swapper_4m_tsb_phys_patch;
	extern unsigned int __swapper_4m_tsb_phys_patch_end;
	unsigned long ktsb_pa;		unsigned long ktsb_pa;

	ktsb_pa = kern_base + ((unsigned long)&swapper_tsb[0] - KERNBASE);		ktsb_pa = kern_base + ((unsigned long)&swapper_tsb[0] - KERNBASE);
	patch_one_ktsb_phys(&__swapper_tsb_phys_patch,		patch_one_ktsb_phys(&__swapper_tsb_phys_patch,
	&__swapper_tsb_phys_patch_end, ktsb_pa);		&__swapper_tsb_phys_patch_end, ktsb_pa);
	#ifndef CONFIG_DEBUG_PAGEALLOC		#ifndef CONFIG_DEBUG_PAGEALLOC
			{
			extern unsigned int __swapper_4m_tsb_phys_patch;
			extern unsigned int __swapper_4m_tsb_phys_patch_end;
	ktsb_pa = (kern_base +		ktsb_pa = (kern_base +
	((unsigned long)&swapper_4m_tsb[0] - KERNBASE));		((unsigned long)&swapper_4m_tsb[0] - KERNBASE));
	patch_one_ktsb_phys(&__swapper_4m_tsb_phys_patch,		patch_one_ktsb_phys(&__swapper_4m_tsb_phys_patch,
	&__swapper_4m_tsb_phys_patch_end, ktsb_pa);		&__swapper_4m_tsb_phys_patch_end, ktsb_pa);
			}
	#endif		#endif
	}		}