diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 18:51:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 18:51:40 -0500 |
| commit | 0165d7f476b99eb637027c2f69c365f00260f188 (patch) | |
| tree | 2369b69095695d1b974a8a2ffa2941d54de5075e /include | |
| parent | 20ef0f1ad0035cd7acc6cbcbc018b2dcd891e274 (diff) | |
| parent | f6c540cdd65d4bc4eaf4dcbf652580f09f3b0c38 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix lguest build failure
x86: reenable support for system without on node0
x86: CPA: avoid double checking of alias ranges
x86: CPA no alias checking for _NX
x86: zap invalid and unused pmds in early boot
x86: CPA, fix alias checks
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/pgtable_64.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index bd4740a60f29..7fd5e0e2361e 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h | |||
| @@ -246,6 +246,7 @@ static inline int pud_large(pud_t pte) | |||
| 246 | #define __swp_entry_to_pte(x) ((pte_t) { .pte = (x).val }) | 246 | #define __swp_entry_to_pte(x) ((pte_t) { .pte = (x).val }) |
| 247 | 247 | ||
| 248 | extern int kern_addr_valid(unsigned long addr); | 248 | extern int kern_addr_valid(unsigned long addr); |
| 249 | extern void cleanup_highmap(void); | ||
| 249 | 250 | ||
| 250 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | 251 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ |
| 251 | remap_pfn_range(vma, vaddr, pfn, size, prot) | 252 | remap_pfn_range(vma, vaddr, pfn, size, prot) |