diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 11:25:06 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 11:28:36 +0100 |
| commit | 68d00bbebb5a48b7a9056a8c03476a71ecbc30a6 (patch) | |
| tree | 95af63041b79c43be37d734da6073fc82070f769 /arch/x86/include/asm/page.h | |
| parent | x86: Don't panic if can not alloc buffer for swiotlb (diff) | |
| parent | x86-32, mm: Remove reference to alloc_remap() (diff) | |
| download | linux-68d00bbebb5a48b7a9056a8c03476a71ecbc30a6.tar.xz linux-68d00bbebb5a48b7a9056a8c03476a71ecbc30a6.zip | |
Merge remote-tracking branch 'origin/x86/mm' into x86/mm2
Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.
Resolved Conflicts:
arch/x86/kernel/head32.c
arch/x86/kernel/head64.c
arch/x86/mm/init_64.c
arch/x86/realmode/init.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/page.h')
| -rw-r--r-- | arch/x86/include/asm/page.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index 100a20c7b98d..c87892442e53 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h @@ -48,7 +48,8 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, * case properly. Once all supported versions of gcc understand it, we can * remove this Voodoo magic stuff. (i.e. once gcc3.x is deprecated) */ -#define __pa_symbol(x) __pa(__phys_reloc_hide((unsigned long)(x))) +#define __pa_symbol(x) \ + __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x))) #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) |