Re: [PATCH] x86: fix UTS_MACHINE to be i386 for 32-bit build and x86_64 for 64-bit build

[Sam Ravnborg <sam@ravnborg.org>]

On Mon, Nov 19, 2007 at 10:34:37AM +0100, Andreas Herrmann wrote:
> On Sat, Nov 17, 2007 at 03:37:31PM +0100, Sam Ravnborg wrote:
> > 
> > Note: This patch does not fix the uname -m issue - to do so
> > Andreas' patch is needed.
> > 
> > 	Sam
> 
> Linus,
> 
> The issue Sam refers to is that UTS_MACHINE is set to "x86" instead of
> "i386" or "x86_64" when building with ARCH=x86. Thus the new kernel
> when booted will give either "x86" on x86_64 and many i386 systems or
> even "x66" on other i386 systems for 'uname -m'.
> 
> Many tools rely on the usual values of "x86_64", "i366" and "i686"
> here. So we shouldn't change this.

Andreas - I will suggest you to submit a new patch with
a better changelog where you jsut describe what you fix.
The above explanations looks a bit weird if read stand alone.

You can always add additional comments after the line containing:
---

In this way it is not included in the changelog but Linus can read it.

Anyway - your patch has my ack.

	Sam

> 
> Attached patch fixes that issue. Please apply.
> 
> 
> Regards,
> 
> Andreas
> 
> --
> x86: fix UTS_MACHINE to be i386 for 32-bit build and x86_64 for 64-bit build
> 
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Cc: Roman Zippel <zippel@linux-m68k.org>
> Signed-off-by: Andreas Herrmann <aherrman@arcor.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

> ---
>  arch/x86/Makefile |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> index 116b03a..7aa1dc6 100644
> --- a/arch/x86/Makefile
> +++ b/arch/x86/Makefile
> @@ -11,10 +11,9 @@ endif
>  $(srctree)/arch/x86/Makefile%: ;
>  
>  ifeq ($(CONFIG_X86_32),y)
> +        UTS_MACHINE := i386
>          include $(srctree)/arch/x86/Makefile_32
>  else
> +        UTS_MACHINE := x86_64
>          include $(srctree)/arch/x86/Makefile_64
>  endif
> -
> -
> -
> -- 
> 1.5.3.4
> 
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/