[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-0fde5066220588e8144b996ac4a3df5a91c93459@git.kernel.org>
Date: Fri, 16 Nov 2012 16:30:02 -0800
From: tip-bot for Alexander Duyck <alexander.h.duyck@...el.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
rusty@...tcorp.com.au, alexander.h.duyck@...el.com,
tglx@...utronix.de, hpa@...ux.intel.com
Subject: [tip:x86/mm] x86/lguest:
Use __pa_symbol instead of __pa on C visible symbols
Commit-ID: 0fde5066220588e8144b996ac4a3df5a91c93459
Gitweb: http://git.kernel.org/tip/0fde5066220588e8144b996ac4a3df5a91c93459
Author: Alexander Duyck <alexander.h.duyck@...el.com>
AuthorDate: Fri, 16 Nov 2012 13:58:12 -0800
Committer: H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Fri, 16 Nov 2012 15:20:53 -0800
x86/lguest: Use __pa_symbol instead of __pa on C visible symbols
The function lguest_write_cr3 is using __pa to convert swapper_pg_dir and
initial_page_table from virtual addresses to physical. The correct function
to use for these values is __pa_symbol since they are C visible symbols.
Cc: Rusty Russell <rusty@...tcorp.com.au>
Signed-off-by: Alexander Duyck <alexander.h.duyck@...el.com>
Link: http://lkml.kernel.org/r/20121116215748.8521.83556.stgit@ahduyck-cp1.jf.intel.com
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
arch/x86/lguest/boot.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 642d880..139dd35 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -552,7 +552,8 @@ static void lguest_write_cr3(unsigned long cr3)
current_cr3 = cr3;
/* These two page tables are simple, linear, and used during boot */
- if (cr3 != __pa(swapper_pg_dir) && cr3 != __pa(initial_page_table))
+ if (cr3 != __pa_symbol(swapper_pg_dir) &&
+ cr3 != __pa_symbol(initial_page_table))
cr3_changed = true;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists