projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[powerpc.git]
/
include
/
asm-x86_64
/
pgtable.h
diff --git
a/include/asm-x86_64/pgtable.h
b/include/asm-x86_64/pgtable.h
index
5e0f2fd
..
7a07196
100644
(file)
--- a/
include/asm-x86_64/pgtable.h
+++ b/
include/asm-x86_64/pgtable.h
@@
-85,7
+85,7
@@
static inline void set_pud(pud_t *dst, pud_t val)
pud_val(*dst) = pud_val(val);
}
pud_val(*dst) = pud_val(val);
}
-
extern
inline void pud_clear (pud_t *pud)
+
static
inline void pud_clear (pud_t *pud)
{
set_pud(pud, __pud(0));
}
{
set_pud(pud, __pud(0));
}
@@
-95,7
+95,7
@@
static inline void set_pgd(pgd_t *dst, pgd_t val)
pgd_val(*dst) = pgd_val(val);
}
pgd_val(*dst) = pgd_val(val);
}
-
extern
inline void pgd_clear (pgd_t * pgd)
+
static
inline void pgd_clear (pgd_t * pgd)
{
set_pgd(pgd, __pgd(0));
}
{
set_pgd(pgd, __pgd(0));
}
@@
-318,8
+318,6
@@
static inline int pmd_large(pmd_t pte) {
* and a page entry and page directory to the page they refer to.
*/
* and a page entry and page directory to the page they refer to.
*/
-#define page_pte(page) page_pte_prot(page, __pgprot(0))
-
/*
* Level 4 access.
*/
/*
* Level 4 access.
*/
@@
-375,7
+373,7
@@
static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
}
/* Change flags of a PTE */
}
/* Change flags of a PTE */
-
extern
inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+
static
inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
pte_val(pte) &= _PAGE_CHG_MASK;
pte_val(pte) |= pgprot_val(newprot);
{
pte_val(pte) &= _PAGE_CHG_MASK;
pte_val(pte) |= pgprot_val(newprot);
@@
-384,7
+382,7
@@
extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
}
#define pte_index(address) \
}
#define pte_index(address) \
- ((
address
>> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+ ((
(address)
>> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
#define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_kernel(*(dir)) + \
pte_index(address))
#define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_kernel(*(dir)) + \
pte_index(address))
@@
-421,9
+419,6
@@
extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
extern int kern_addr_valid(unsigned long addr);
extern int kern_addr_valid(unsigned long addr);
-#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
- remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
-
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
remap_pfn_range(vma, vaddr, pfn, size, prot)
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
remap_pfn_range(vma, vaddr, pfn, size, prot)