aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 11:44:24 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 11:44:24 -0400
commite3ebadd95cb621e2c7436f3d3646447ac9d5c16d (patch)
tree510b41550cc3751cfb565e3e2ba195a68b784a03 /include
parent15700770ef7c5d12e2f1659d2ddbeb3f658d9f37 (diff)
Revert "[PATCH] x86: __pa and __pa_symbol address space separation"
This was broken. It adds complexity, for no good reason. Rather than separate __pa() and __pa_symbol(), we should deprecate __pa_symbol(), and preferably __pa() too - and just use "virt_to_phys()" instead, which is more readable and has nicer semantics. However, right now, just undo the separation, and make __pa_symbol() be the exact same as __pa(). That fixes the bugs this patch introduced, and we can do the fairly obvious cleanups later. Do the new __phys_addr() function (which is now the actual workhorse for the unified __pa()/__pa_symbol()) as a real external function, that way all the potential issues with compile/link-time optimizations of constant symbol addresses go away, and we can also, if we choose to, add more sanity-checking of the argument. Cc: Eric W. Biederman <ebiederm@xmission.com> Cc: Vivek Goyal <vgoyal@in.ibm.com> Cc: Andi Kleen <ak@suse.de> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86_64/page.h18
-rw-r--r--include/asm-x86_64/pgtable.h4
2 files changed, 9 insertions, 13 deletions
diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h
index b17fc16ec2eb..4d04e2479569 100644
--- a/include/asm-x86_64/page.h
+++ b/include/asm-x86_64/page.h
@@ -94,26 +94,22 @@ extern unsigned long phys_base;
94 94
95#define KERNEL_TEXT_SIZE (40*1024*1024) 95#define KERNEL_TEXT_SIZE (40*1024*1024)
96#define KERNEL_TEXT_START 0xffffffff80000000 96#define KERNEL_TEXT_START 0xffffffff80000000
97#define PAGE_OFFSET __PAGE_OFFSET
97 98
98#ifndef __ASSEMBLY__ 99#ifndef __ASSEMBLY__
99 100
100#include <asm/bug.h> 101#include <asm/bug.h>
101 102
102#endif /* __ASSEMBLY__ */ 103extern unsigned long __phys_addr(unsigned long);
103 104
104#define PAGE_OFFSET __PAGE_OFFSET 105#endif /* __ASSEMBLY__ */
105 106
106/* Note: __pa(&symbol_visible_to_c) should be always replaced with __pa_symbol. 107#define __pa(x) __phys_addr((unsigned long)(x))
107 Otherwise you risk miscompilation. */ 108#define __pa_symbol(x) __phys_addr((unsigned long)(x))
108#define __pa(x) ((unsigned long)(x) - PAGE_OFFSET)
109/* __pa_symbol should be used for C visible symbols.
110 This seems to be the official gcc blessed way to do such arithmetic. */
111#define __pa_symbol(x) \
112 ({unsigned long v; \
113 asm("" : "=r" (v) : "0" (x)); \
114 ((v - __START_KERNEL_map) + phys_base); })
115 109
116#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) 110#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
111#define __boot_va(x) __va(x)
112#define __boot_pa(x) __pa(x)
117#ifdef CONFIG_FLATMEM 113#ifdef CONFIG_FLATMEM
118#define pfn_valid(pfn) ((pfn) < end_pfn) 114#define pfn_valid(pfn) ((pfn) < end_pfn)
119#endif 115#endif
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h
index 599993f6ba84..da3390faaea6 100644
--- a/include/asm-x86_64/pgtable.h
+++ b/include/asm-x86_64/pgtable.h
@@ -19,7 +19,7 @@ extern pmd_t level2_kernel_pgt[512];
19extern pgd_t init_level4_pgt[]; 19extern pgd_t init_level4_pgt[];
20extern unsigned long __supported_pte_mask; 20extern unsigned long __supported_pte_mask;
21 21
22#define swapper_pg_dir ((pgd_t *)NULL) 22#define swapper_pg_dir init_level4_pgt
23 23
24extern void paging_init(void); 24extern void paging_init(void);
25extern void clear_kernel_mapping(unsigned long addr, unsigned long size); 25extern void clear_kernel_mapping(unsigned long addr, unsigned long size);
@@ -29,7 +29,7 @@ extern void clear_kernel_mapping(unsigned long addr, unsigned long size);
29 * for zero-mapped memory areas etc.. 29 * for zero-mapped memory areas etc..
30 */ 30 */
31extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)]; 31extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)];
32#define ZERO_PAGE(vaddr) (pfn_to_page(__pa_symbol(&empty_zero_page) >> PAGE_SHIFT)) 32#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
33 33
34#endif /* !__ASSEMBLY__ */ 34#endif /* !__ASSEMBLY__ */
35 35