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

Commit d2ae5b5f authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Get rid of pud_offset_k / __pud_offset_k 



pud_offset_k() equivalent to pud_offset() now.  Pointed out by Jan Beulich
Similar for __pud_offset_ok, which needs a small change in the callers.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b79c4df7

arch/x86_64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void dump_pagetable(unsigned long address) 
	printk("PGD %lx ", pgd_val(*pgd));

	if (!pgd_present(*pgd)) goto ret; 



	pud = __pud_offset_k((pud_t *)pgd_page(*pgd), address);

	pud = pud_offset(pgd, address);

	if (bad_address(pud)) goto bad;

	printk("PUD %lx ", pud_val(*pud));

	if (!pud_present(*pud))	goto ret;

arch/x86_64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ void __meminit init_memory_mapping(unsigned long start, unsigned long end) 
		pud_t *pud;



		if (after_bootmem)

			pud = pud_offset_k(pgd, start & PGDIR_MASK);

			pud = pud_offset(pgd, start & PGDIR_MASK);

		else

			pud = alloc_low_page(&map, &pud_phys);

include/asm-x86_64/pgtable.h

+0 −6
Original line number Diff line number Diff line
@@ -337,14 +337,8 @@ static inline int pmd_large(pmd_t pte) { 
/* to find an entry in a page-table-directory. */

#define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))

#define pud_offset(pgd, address) ((pud_t *) pgd_page(*(pgd)) + pud_index(address))

#define pud_offset_k(pgd, addr) pud_offset(pgd, addr)

#define pud_present(pud) (pud_val(pud) & _PAGE_PRESENT)



static inline pud_t *__pud_offset_k(pud_t *pud, unsigned long address)

{ 

	return pud + pud_index(address);

} 



/* PMD  - Level 2 access */

#define pmd_page_kernel(pmd) ((unsigned long) __va(pmd_val(pmd) & PTE_MASK))

#define pmd_page(pmd)		(pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))