Re: [PATCH 5/6] x86: move i386 and x86_64 Kconfig files to x86 directory

[Randy Dunlap <rdunlap@xenotime.net>]

On Thu, 25 Oct 2007 22:51:56 -0700 Yinghai Lu wrote:

> On 10/25/07, Randy Dunlap <rdunlap@xenotime.net> wrote:
> > On Thu, 25 Oct 2007 18:53:18 -0700 Yinghai Lu wrote:
> >
> > > On 10/25/07, Sam Ravnborg <sam@ravnborg.org> wrote:
> > > > From 6654a98eb8587f0538904c9bdb9aeaf9d577f182 Mon Sep 17 00:00:00 2001
> > > > From: Sam Ravnborg <sam@ravnborg.org>
> > > > Date: Thu, 25 Oct 2007 21:04:16 +0200
> > > > Subject: [PATCH] x86: move i386 and x86_64 Kconfig files to x86 directory
> > > >
> > > > After a small change in kconfig Makefile we could
> > > > move all x86 Kconfig files to x86 directory.
> > > >
> > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> > > > ---
> > > >  arch/{i386 => x86}/Kconfig.cpu              |    0
> > > >  arch/{i386 => x86}/Kconfig.debug            |    0
> > > >  arch/{i386/Kconfig => x86/Kconfig.i386}     |    4 +-
> > > >  arch/{x86_64/Kconfig => x86/Kconfig.x86_64} |    2 +-
> > > >  arch/x86_64/Kconfig.debug                   |  119 ---------------------------
> > > >  scripts/kconfig/Makefile                    |    7 ++-
> > > >  6 files changed, 9 insertions(+), 123 deletions(-)
> > > >  rename arch/{i386 => x86}/Kconfig.cpu (100%)
> > > >  rename arch/{i386 => x86}/Kconfig.debug (100%)
> > > >  rename arch/{i386/Kconfig => x86/Kconfig.i386} (99%)
> > > >  rename arch/{x86_64/Kconfig => x86/Kconfig.x86_64} (99%) <------<
> > > >  delete mode 100644 arch/x86_64/Kconfig.debug                    |
> > >                                                                    |
> > > arch/i386/Kconfig.debug will be arch/x86/Kconfig.debug             |
> > >                                                                    |
> > > in it, EARLY_PRINTK will depend on X86_32                          |
> >                                                                      |
> > but EARLY_PRINTK for x86_64 is here -------------------------------  ^
> >
> > so we didn't lose it.  However, they should live in the same place
> > so that confusion like this does not continue.
> >
> > You can make a patch.  or I can.  or Sam can.  or someone else can...
> 
> in PATCH 3/5 that Sam sent out.
> 
> >From 16b853f53463e43bfce341965ac10a78a3755a14 Mon Sep 17 00:00:00 2001
> From: Randy Dunlap <rdunlap@xenotime.net>
> Date: Wed, 24 Oct 2007 15:50:43 -0700
> Subject: [PATCH] x86: unification of i386 and x86_64 Kconfig.debug
> 
> Adding proper dependencies so the two Kconfig.debug files
> are now identical.
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> ---
>  arch/i386/Kconfig.debug             |   51 ++++++++++++++++++++++++++++-------
>  arch/x86_64/Kconfig                 |    4 ---
>  arch/{i386 => x86_64}/Kconfig.debug |   51 ++++++++++++++++++++++++++++-------
>  3 files changed, 82 insertions(+), 24 deletions(-)
>  copy arch/{i386 => x86_64}/Kconfig.debug (65%)
> 
> ...
> diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
> index 308970a..1bc0268 100644
> --- a/arch/x86_64/Kconfig
> +++ b/arch/x86_64/Kconfig
> @@ -97,10 +97,6 @@ config X86_CMPXCHG
>        bool
>        default y
> 
> -config EARLY_PRINTK
> -       bool
> -       default y
> -
>  config GENERIC_ISA_DMA
>        bool
>        default y
> 
> but
> in git
> 
> http://git.kernel.org/?p=linux/kernel/git/sam/x86.git;a=commitdiff;h=d013a27cb79a01b324f93adb275162c244cca2de
> 
> doesn't include that removing..
> 
> interesting.

Oh, OK.  We'll get it fixed (if it needs fixing).

---
~Randy