Commit 9975e77d authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Gcc 3.3 build fixes. 



Work around gcc 3.3's unability to evaluate that certain expressions indeed
are constant.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent bdd3ede0

arch/mips/mm/init.c

+8 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/proc_fs.h>

#include <linux/pfn.h>



#include <asm/asm-offsets.h>

#include <asm/bootinfo.h>

#include <asm/cachectl.h>

#include <asm/cpu.h>
@@ -498,7 +499,13 @@ unsigned long pgd_current[NR_CPUS]; 
 * different layout ...

 */

#define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE<<order)))

pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER);



/*

 * gcc 3.3 and older have trouble determining that PTRS_PER_PGD and PGD_ORDER

 * are constants.  So we use the variants from asm-offset.h until that gcc

 * will officially be retired.

 */

pgd_t swapper_pg_dir[_PTRS_PER_PGD] __page_aligned(_PGD_ORDER);

#ifdef CONFIG_64BIT

#ifdef MODULE_START

pgd_t module_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER);

include/asm-mips/pgtable.h

+5 −1
Original line number Diff line number Diff line
@@ -172,7 +172,11 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt 
#define PMD_T_LOG2	(__builtin_ffs(sizeof(pmd_t)) - 1)

#define PTE_T_LOG2	(__builtin_ffs(sizeof(pte_t)) - 1)



extern pgd_t swapper_pg_dir[PTRS_PER_PGD];

/*

 * We used to declare this array with size but gcc 3.3 and older are not able

 * to find that this expression is a constant, so the size is dropped.

 */

extern pgd_t swapper_pg_dir[];



/*

 * The following only work if pte_present() is true.