Re: [git-pull -tip V2] x86: cpu architecture debug code

Ingo Molnar
2009-03-11T13:48:30Z

* Jaswinder Singh Rajput <jaswinder@kernel.org> wrote:

> On Wed, 2009-03-11 at 14:13 +0100, Ingo Molnar wrote:
> > * Ingo Molnar <mingo@elte.hu> wrote:
> >
> > > * Jaswinder Singh Rajput <jaswinder@kernel.org> 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