diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:23:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:23:19 -0500 |
| commit | 664a1566df81b44f7e5e234d55e3bc8c6c0be211 (patch) | |
| tree | 17eb4b827091279a60f60a36b34e0437ba804dc1 /arch/x86/mm/fault.c | |
| parent | b9e222904ce92e1b277f2b85411d1eb6bfe27410 (diff) | |
| parent | f8d8406bcb58ff70e97b71c35ff5be90c54fc3d0 (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: cpa, fix out of date comment
KVM is not seen under X86 config with latest git (32 bit compile)
x86: cpa: ensure page alignment
x86: include proper prototypes for rodata_test
x86: fix gart_iommu_init()
x86: EFI set_memory_x()/set_memory_uc() fixes
x86: make dump_pagetable() static
x86: fix "BUG: sleeping function called from invalid context" in print_vma_addr()
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 621afb6343dc..fdc667422df9 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -186,7 +186,7 @@ static int bad_address(void *p) | |||
| 186 | } | 186 | } |
| 187 | #endif | 187 | #endif |
| 188 | 188 | ||
| 189 | void dump_pagetable(unsigned long address) | 189 | static void dump_pagetable(unsigned long address) |
| 190 | { | 190 | { |
| 191 | #ifdef CONFIG_X86_32 | 191 | #ifdef CONFIG_X86_32 |
| 192 | __typeof__(pte_val(__pte(0))) page; | 192 | __typeof__(pte_val(__pte(0))) page; |