Commit 31168f03 authored by Mike Rapoport's avatar Mike Rapoport Committed by Paul Burton

mips: drop __pXd_offset() macros that duplicate pXd_index() ones

The __pXd_offset() macros are identical to the pXd_index() macros and there
is no point to keep both of them. All architectures define and use
pXd_index() so let's keep only those to make mips consistent with the rest
of the kernel.
Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org
Cc: Mike Rapoport <rppt@kernel.org>
parent 3ed6751b
...@@ -196,14 +196,11 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot) ...@@ -196,14 +196,11 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)
#define pte_page(x) pfn_to_page(pte_pfn(x)) #define pte_page(x) pfn_to_page(pte_pfn(x))
#define __pgd_offset(address) pgd_index(address)
#define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))
#define __pmd_offset(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
/* to find an entry in a kernel page-table-directory */ /* to find an entry in a kernel page-table-directory */
#define pgd_offset_k(address) pgd_offset(&init_mm, address) #define pgd_offset_k(address) pgd_offset(&init_mm, address)
#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
#define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))
#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
/* to find an entry in a page-table-directory */ /* to find an entry in a page-table-directory */
......
...@@ -319,10 +319,6 @@ static inline void pud_clear(pud_t *pudp) ...@@ -319,10 +319,6 @@ static inline void pud_clear(pud_t *pudp)
#define pfn_pmd(pfn, prot) __pmd(((pfn) << _PFN_SHIFT) | pgprot_val(prot)) #define pfn_pmd(pfn, prot) __pmd(((pfn) << _PFN_SHIFT) | pgprot_val(prot))
#endif #endif
#define __pgd_offset(address) pgd_index(address)
#define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))
#define __pmd_offset(address) pmd_index(address)
/* to find an entry in a kernel page-table-directory */ /* to find an entry in a kernel page-table-directory */
#define pgd_offset_k(address) pgd_offset(&init_mm, address) #define pgd_offset_k(address) pgd_offset(&init_mm, address)
......
...@@ -204,8 +204,8 @@ static bool kvm_mips_flush_gpa_pmd(pmd_t *pmd, unsigned long start_gpa, ...@@ -204,8 +204,8 @@ static bool kvm_mips_flush_gpa_pmd(pmd_t *pmd, unsigned long start_gpa,
{ {
pte_t *pte; pte_t *pte;
unsigned long end = ~0ul; unsigned long end = ~0ul;
int i_min = __pmd_offset(start_gpa); int i_min = pmd_index(start_gpa);
int i_max = __pmd_offset(end_gpa); int i_max = pmd_index(end_gpa);
bool safe_to_remove = (i_min == 0 && i_max == PTRS_PER_PMD - 1); bool safe_to_remove = (i_min == 0 && i_max == PTRS_PER_PMD - 1);
int i; int i;
...@@ -232,8 +232,8 @@ static bool kvm_mips_flush_gpa_pud(pud_t *pud, unsigned long start_gpa, ...@@ -232,8 +232,8 @@ static bool kvm_mips_flush_gpa_pud(pud_t *pud, unsigned long start_gpa,
{ {
pmd_t *pmd; pmd_t *pmd;
unsigned long end = ~0ul; unsigned long end = ~0ul;
int i_min = __pud_offset(start_gpa); int i_min = pud_index(start_gpa);
int i_max = __pud_offset(end_gpa); int i_max = pud_index(end_gpa);
bool safe_to_remove = (i_min == 0 && i_max == PTRS_PER_PUD - 1); bool safe_to_remove = (i_min == 0 && i_max == PTRS_PER_PUD - 1);
int i; int i;
...@@ -334,8 +334,8 @@ static int kvm_mips_##name##_pmd(pmd_t *pmd, unsigned long start, \ ...@@ -334,8 +334,8 @@ static int kvm_mips_##name##_pmd(pmd_t *pmd, unsigned long start, \
int ret = 0; \ int ret = 0; \
pte_t *pte; \ pte_t *pte; \
unsigned long cur_end = ~0ul; \ unsigned long cur_end = ~0ul; \
int i_min = __pmd_offset(start); \ int i_min = pmd_index(start); \
int i_max = __pmd_offset(end); \ int i_max = pmd_index(end); \
int i; \ int i; \
\ \
for (i = i_min; i <= i_max; ++i, start = 0) { \ for (i = i_min; i <= i_max; ++i, start = 0) { \
...@@ -357,8 +357,8 @@ static int kvm_mips_##name##_pud(pud_t *pud, unsigned long start, \ ...@@ -357,8 +357,8 @@ static int kvm_mips_##name##_pud(pud_t *pud, unsigned long start, \
int ret = 0; \ int ret = 0; \
pmd_t *pmd; \ pmd_t *pmd; \
unsigned long cur_end = ~0ul; \ unsigned long cur_end = ~0ul; \
int i_min = __pud_offset(start); \ int i_min = pud_index(start); \
int i_max = __pud_offset(end); \ int i_max = pud_index(end); \
int i; \ int i; \
\ \
for (i = i_min; i <= i_max; ++i, start = 0) { \ for (i = i_min; i <= i_max; ++i, start = 0) { \
...@@ -862,8 +862,8 @@ static bool kvm_mips_flush_gva_pmd(pmd_t *pmd, unsigned long start_gva, ...@@ -862,8 +862,8 @@ static bool kvm_mips_flush_gva_pmd(pmd_t *pmd, unsigned long start_gva,
{ {
pte_t *pte; pte_t *pte;
unsigned long end = ~0ul; unsigned long end = ~0ul;
int i_min = __pmd_offset(start_gva); int i_min = pmd_index(start_gva);
int i_max = __pmd_offset(end_gva); int i_max = pmd_index(end_gva);
bool safe_to_remove = (i_min == 0 && i_max == PTRS_PER_PMD - 1); bool safe_to_remove = (i_min == 0 && i_max == PTRS_PER_PMD - 1);
int i; int i;
...@@ -890,8 +890,8 @@ static bool kvm_mips_flush_gva_pud(pud_t *pud, unsigned long start_gva, ...@@ -890,8 +890,8 @@ static bool kvm_mips_flush_gva_pud(pud_t *pud, unsigned long start_gva,
{ {
pmd_t *pmd; pmd_t *pmd;
unsigned long end = ~0ul; unsigned long end = ~0ul;
int i_min = __pud_offset(start_gva); int i_min = pud_index(start_gva);
int i_max = __pud_offset(end_gva); int i_max = pud_index(end_gva);
bool safe_to_remove = (i_min == 0 && i_max == PTRS_PER_PUD - 1); bool safe_to_remove = (i_min == 0 && i_max == PTRS_PER_PUD - 1);
int i; int i;
......
...@@ -292,7 +292,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, ...@@ -292,7 +292,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write,
* Do _not_ use "tsk" here. We might be inside * Do _not_ use "tsk" here. We might be inside
* an interrupt in the middle of a task switch.. * an interrupt in the middle of a task switch..
*/ */
int offset = __pgd_offset(address); int offset = pgd_index(address);
pgd_t *pgd, *pgd_k; pgd_t *pgd, *pgd_k;
pud_t *pud, *pud_k; pud_t *pud, *pud_k;
pmd_t *pmd, *pmd_k; pmd_t *pmd, *pmd_k;
......
...@@ -239,9 +239,9 @@ void __init fixrange_init(unsigned long start, unsigned long end, ...@@ -239,9 +239,9 @@ void __init fixrange_init(unsigned long start, unsigned long end,
unsigned long vaddr; unsigned long vaddr;
vaddr = start; vaddr = start;
i = __pgd_offset(vaddr); i = pgd_index(vaddr);
j = __pud_offset(vaddr); j = pud_index(vaddr);
k = __pmd_offset(vaddr); k = pmd_index(vaddr);
pgd = pgd_base + i; pgd = pgd_base + i;
for ( ; (i < PTRS_PER_PGD) && (vaddr < end); pgd++, i++) { for ( ; (i < PTRS_PER_PGD) && (vaddr < end); pgd++, i++) {
......
...@@ -81,7 +81,7 @@ void __init pagetable_init(void) ...@@ -81,7 +81,7 @@ void __init pagetable_init(void)
vaddr = PKMAP_BASE; vaddr = PKMAP_BASE;
fixrange_init(vaddr & PMD_MASK, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base); fixrange_init(vaddr & PMD_MASK, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base);
pgd = swapper_pg_dir + __pgd_offset(vaddr); pgd = swapper_pg_dir + pgd_index(vaddr);
pud = pud_offset(pgd, vaddr); pud = pud_offset(pgd, vaddr);
pmd = pmd_offset(pud, vaddr); pmd = pmd_offset(pud, vaddr);
pte = pte_offset_kernel(pmd, vaddr); pte = pte_offset_kernel(pmd, vaddr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment