Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Aug 2011 22:52:19 +0000 (15:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Aug 2011 22:52:19 +0000 (15:52 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Fix build with DEBUG_PAGEALLOC enabled.

arch/sparc/mm/init_64.c

index adfac23d976af73a9153ce0bec648d6af5f86473..581531dbc8b57ee299b62a13b15f8877891af690 100644 (file)
@@ -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
 }