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

Commit 9e233113 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Fix build with DEBUG_PAGEALLOC enabled.
parents fc97114b 0785a8e8

arch/sparc/mm/init_64.c

+4 −2
Original line number 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_end;

	extern unsigned int __swapper_4m_tsb_phys_patch;

	extern unsigned int __swapper_4m_tsb_phys_patch_end;

	unsigned long ktsb_pa;



	ktsb_pa = kern_base + ((unsigned long)&swapper_tsb[0] - KERNBASE);

	patch_one_ktsb_phys(&__swapper_tsb_phys_patch,

			    &__swapper_tsb_phys_patch_end, ktsb_pa);

#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 +

		   ((unsigned long)&swapper_4m_tsb[0] - KERNBASE));

	patch_one_ktsb_phys(&__swapper_4m_tsb_phys_patch,

			    &__swapper_4m_tsb_phys_patch_end, ktsb_pa);

	}

#endif

}