From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: Re: KVM next tree merge onto current Linus master Date: Thu, 21 Mar 2013 12:47:30 -0300 Message-ID: <20130321154730.GA4460@amt.cnet> References: <93606445-F2D9-42C3-A8A9-202FE3E69B98@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "kvm@vger.kernel.org list:Overall" , Gleb Natapov To: Alexander Graf Return-path: Received: from mx1.redhat.com ([209.132.183.28]:42460 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932811Ab3CUPsP (ORCPT ); Thu, 21 Mar 2013 11:48:15 -0400 Content-Disposition: inline In-Reply-To: <93606445-F2D9-42C3-A8A9-202FE3E69B98@suse.de> Sender: kvm-owner@vger.kernel.org List-ID: On Thu, Mar 21, 2013 at 08:49:07AM +0100, Alexander Graf wrote: > Hi guys, > > Just recently this really important patch got pulled into Linus' tree for 3.9: > > commit 1674400aaee5b466c595a8fc310488263ce888c7 > Author: Anton Blanchard > Date: Tue Mar 12 01:51:51 2013 +0000 > > powerpc: Fix -mcmodel=medium breakage in prom_init.c > > Commit 5ac47f7a6efb (powerpc: Relocate prom_init.c on 64bit) made > prom_init.c position independent by manually relocating its entries > in the TOC. > > We get the address of the TOC entries with the __prom_init_toc_start > linker symbol. If __prom_init_toc_start ends up as an entry in the > TOC then we need to add an offset to get the current address. This is > the case for older toolchains. > > On the other hand, if we have a newer toolchain that supports > -mcmodel=medium then __prom_init_toc_start will be created by a > relative offset from r2 (the TOC pointer). Since r2 has already been > relocated, nothing more needs to be done. Adding an offset in this > case is wrong and Aaro Koskinen and Alexander Graf have noticed noticed > G5 and OpenBIOS breakage. > > Alan Modra suggested we just use r2 to get at the TOC which is simpler > and works with both old and new toolchains. > > Reported-by: Alexander Graf > Signed-off-by: Anton Blanchard > Tested-by: Aaro Koskinen > Signed-off-by: Benjamin Herrenschmidt > > > Without that commit, I can not boot my G5, thus I can't run automated tests on it against my queue. > > Could you please merge kvm/next against linus/master, so that I can base my trees against that? > > > Alex Done, will push master as soon as autotest finishes.