From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755652AbZCKNsa (ORCPT ); Wed, 11 Mar 2009 09:48:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752924AbZCKNsV (ORCPT ); Wed, 11 Mar 2009 09:48:21 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:35587 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752487AbZCKNsV (ORCPT ); Wed, 11 Mar 2009 09:48:21 -0400 Date: Wed, 11 Mar 2009 14:48:16 +0100 From: Ingo Molnar To: Jaswinder Singh Rajput Cc: "H. Peter Anvin" , x86 maintainers , LKML Subject: Re: [git-pull -tip V2] x86: cpu architecture debug code Message-ID: <20090311134816.GA15077@elte.hu> References: <20090310122806.GE5794@elte.hu> <1236697752.3387.2.camel@localhost.localdomain> <20090310152029.GN3850@elte.hu> <1236701373.3387.4.camel@localhost.localdomain> <20090310174535.GA2963@elte.hu> <1236772478.2836.12.camel@ht.satnam> <1236775518.2836.14.camel@ht.satnam> <20090311125049.GA1074@elte.hu> <20090311131321.GC1074@elte.hu> <1236779029.2836.33.camel@ht.satnam> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1236779029.2836.33.camel@ht.satnam> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Jaswinder Singh Rajput wrote: > On Wed, 2009-03-11 at 14:13 +0100, Ingo Molnar wrote: > > * Ingo Molnar wrote: > > > > > * Jaswinder Singh Rajput wrote: > > > > > > > @@ -472,7 +473,7 @@ static void print_dt(void *seq) > > > > print_desc_ptr("GDT", seq, dt); > > > > > > > > /* LDT */ > > > > - store_ldt(ldt); > > > > + asm volatile("sldt %0" : "=m" (ldt)); > > > > > > this is still wrong. > > > > As i pointed it out before, we should not open-code an assembly > > primitive - especially since store_ldt() is available in > > arch/x86/include/asm/desc.h. > > > > True, that primitive is not available on CONFIG_PARAVIRT, but > > that is a bug: the fix is to move the store_ldt() definition > > outside the CONFIG_PARAVIRT section in desc.h, not to hack > > around the problem by open-coding assembly code. > > > > I.e. dont let an uncleanliness and incomplete primitive spread > > to other code. Fix the primitive and remove the uncleanliness > > that way. > > > > The following changes since commit 259ef6fcea4046fe24495b1e3631c1b905c531c1: > Jaswinder Singh Rajput (1): > x86: cpu architecture debug code > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip-cpu.git master > > Jaswinder Singh Rajput (2): > x86: cpu_debug.c cleanup > x86: move store_ldt outside the CONFIG_PARAVIRT section > > arch/x86/include/asm/desc.h | 3 ++- > arch/x86/kernel/cpu/cpu_debug.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) this throws rejects when pulled into tip:x86/debug: earth4:~/tip> git pull git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip-cpu.git master >>From git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip-cpu * branch master -> FETCH_HEAD Removing Documentation/scheduler/sched-coding.txt Removing arch/ia64/dig/dig_vtd_iommu.c Auto-merging arch/x86/Kconfig Removing arch/x86/include/asm/intel_arch_perfmon.h Auto-merging arch/x86/kernel/cpu/Makefile Auto-merging arch/x86/kernel/cpu/cpu_debug.c CONFLICT (add/add): Merge conflict in arch/x86/kernel/cpu/cpu_debug.c Removing block/blktrace.c Automatic merge failed; fix conflicts and then commit the result. you should base your branch on tip:x86/debug, and you should not merge in anything else, but do the fixes. Ingo