From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755217AbWKMQ5f (ORCPT ); Mon, 13 Nov 2006 11:57:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755211AbWKMQyP (ORCPT ); Mon, 13 Nov 2006 11:54:15 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:2986 "EHLO e34.co.us.ibm.com") by vger.kernel.org with ESMTP id S1755212AbWKMQyE (ORCPT ); Mon, 13 Nov 2006 11:54:04 -0500 Date: Mon, 13 Nov 2006 11:44:28 -0500 From: Vivek Goyal To: linux kernel mailing list Cc: Reloc Kernel List , ebiederm@xmission.com, akpm@osdl.org, ak@suse.de, hpa@zytor.com, magnus.damm@gmail.com, lwang@redhat.com, dzickus@redhat.com Subject: [RFC] [PATCH 11/16] x86_64: Modify discover_ebda to use virtual address Message-ID: <20061113164428.GL17429@in.ibm.com> Reply-To: vgoyal@in.ibm.com References: <20061113162135.GA17429@in.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061113162135.GA17429@in.ibm.com> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Eric W. Biederman Signed-off-by: Vivek Goyal --- arch/x86_64/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/x86_64/kernel/setup.c~x86_64-Modify-discover_ebda-to-use-virtual-addresses arch/x86_64/kernel/setup.c --- linux-2.6.19-rc5-reloc/arch/x86_64/kernel/setup.c~x86_64-Modify-discover_ebda-to-use-virtual-addresses 2006-11-09 23:02:24.000000000 -0500 +++ linux-2.6.19-rc5-reloc-root/arch/x86_64/kernel/setup.c 2006-11-09 23:02:24.000000000 -0500 @@ -327,10 +327,10 @@ static void discover_ebda(void) * there is a real-mode segmented pointer pointing to the * 4K EBDA area at 0x40E */ - ebda_addr = *(unsigned short *)EBDA_ADDR_POINTER; + ebda_addr = *(unsigned short *)__va(EBDA_ADDR_POINTER); ebda_addr <<= 4; - ebda_size = *(unsigned short *)(unsigned long)ebda_addr; + ebda_size = *(unsigned short *)__va(ebda_addr); /* Round EBDA up to pages */ if (ebda_size == 0) _