diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-10 09:33:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-10 09:48:38 +0800 |
| commit | 42f504e28a169ebfea0e3d9c6e151451800e41d5 (patch) | |
| tree | d01c160e4e9a5c094e91706ab60651e26098fb60 /arch/arc | |
| parent | c810fcb930d9c705774427bb6eb551b2e1108adb (diff) | |
| parent | 389fb5fb0b8b812ce0e853d5eca748b08fc73289 (diff) | |
Merge tag 'v3.10.71' into linux-linaro-lsk
This is the 3.10.71 stable release
Conflicts:
arch/arm64/kernel/setup.c
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/include/asm/pgtable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h index 95b1522212a7..ecf23eaa20c1 100644 --- a/arch/arc/include/asm/pgtable.h +++ b/arch/arc/include/asm/pgtable.h @@ -270,7 +270,8 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) #define pmd_clear(xp) do { pmd_val(*(xp)) = 0; } while (0) #define pte_page(x) (mem_map + \ - (unsigned long)(((pte_val(x) - PAGE_OFFSET) >> PAGE_SHIFT))) + (unsigned long)(((pte_val(x) - CONFIG_LINUX_LINK_BASE) >> \ + PAGE_SHIFT))) #define mk_pte(page, pgprot) \ ({ \ |