From 11877cc2c9e8101b18d8614b9d57a4e1583ca36b Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Thu, 7 Dec 2006 02:14:03 +0100 Subject: [PATCH] --- yaml --- r: 43032 b: refs/heads/master c: 9f45accf17efc050ba26bf77cc4f166c950b284e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-i386/page.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5e91f09cc22e..90c7e82b69cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ed018845f1172cdc94f8a20ad807df901c6b7eb +refs/heads/master: 9f45accf17efc050ba26bf77cc4f166c950b284e diff --git a/trunk/include/asm-i386/page.h b/trunk/include/asm-i386/page.h index f5bf544c729a..5a70501291d6 100644 --- a/trunk/include/asm-i386/page.h +++ b/trunk/include/asm-i386/page.h @@ -124,6 +124,9 @@ extern int page_is_ram(unsigned long pagenr); #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) #define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE) #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) +/* __pa_symbol should be used for C visible symbols. + This seems to be the official gcc blessed way to do such arithmetic. */ +#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x),0)) #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) #ifdef CONFIG_FLATMEM