Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762705AbXJYUUG (ORCPT ); Thu, 25 Oct 2007 16:20:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755164AbXJYUTn (ORCPT ); Thu, 25 Oct 2007 16:19:43 -0400 Received: from nz-out-0506.google.com ([64.233.162.233]:32611 "EHLO nz-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753107AbXJYUTm (ORCPT ); Thu, 25 Oct 2007 16:19:42 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=XsZQzy/2BSLW6aEQQRM52JdnAaDjQ/cUY62KOdsGW2HqP/6NTs9jWb8VkyRh7E6cq65fFPbBZ1gMRAC4d3zDOG1CNSEG5aBz7ljm9rbZU/jjt1sj0W6POytWnL6ubcXN0ZrjD7etgznn95OOIruKlR1qAeJNA0varKujeJwOiMk= Message-ID: <3ae72650710251319y6bc4ad10u1b7ab271ba333072@mail.gmail.com> Date: Thu, 25 Oct 2007 22:19:40 +0200 From: "Kay Sievers" To: "Sam Ravnborg" Subject: Re: [PATCH 0/6] kill i386 and x86_64 directories Cc: "Thomas Gleixner" , "Ingo Molnar" , "H. Peter Anvin" , LKML , linux-kbuild , "Linus Torvalds" In-Reply-To: <20071025201437.GA14671@uranus.ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20071025195644.GA14501@uranus.ravnborg.org> <20071025201437.GA14671@uranus.ravnborg.org> X-Google-Sender-Auth: a14e5b3091d3d8d4 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3187 Lines: 68 On 10/25/07, Sam Ravnborg wrote: > On Thu, Oct 25, 2007 at 09:56:44PM +0200, Sam Ravnborg wrote: > > This series kill the old i386 and x86_64 directories. > > The relevant files are moved and adapted and > > Kconfig.debug was consolidated (thanks to Randy). > > > > I had to modify both the top-lvel Makefile and the kconfig > > Makefile to accomplish this. It was done in such a way that > > it is trivial for other archs to use the same mechanism > > should they have the need. > > > > To solve the defconfig issue (i386 and x86_64 cannot share one) > > the arch/x86/configs/ directory were introduced. This has > > been used by other archs for some time now but x86 had not had > > the need until now. > > > > The Kconfig files could be consolidated much more - I only > > did the minimal changes to make it work in the new place. > > > > Total diffstat (in git format): > > > > Makefile | 7 ++- > > arch/i386/.gitignore | 1 - > > arch/{i386 => x86}/Kconfig.cpu | 0 > > arch/{i386 => x86}/Kconfig.debug | 51 +++++++++++++--- > > arch/{i386/Kconfig => x86/Kconfig.i386} | 4 +- > > arch/{x86_64/Kconfig => x86/Kconfig.x86_64} | 6 +-- > > arch/x86/Makefile | 16 +++++ > > arch/{i386/Makefile => x86/Makefile_32} | 7 +-- > > arch/{i386/Makefile.cpu => x86/Makefile_32.cpu} | 0 > > arch/{x86_64/Makefile => x86/Makefile_64} | 5 +- > > .../{i386/defconfig => x86/configs/i386_defconfig} | 0 > > .../defconfig => x86/configs/x86_64_defconfig} | 0 > > arch/x86_64/.gitignore | 1 - > > arch/x86_64/Kconfig.debug | 61 -------------------- > > scripts/kconfig/Makefile | 35 +++++++----- > > 15 files changed, 89 insertions(+), 105 deletions(-) > > > > By the way I consider this -rc1 material. > Because: > 1) It sort of finishes the initial merge > 2) Any breakage should be easy to trigger (build breakage) and easy to fix. > > It is 1) that make me say this is -rc1 materail, > and 2) that say that this is an acceptable 'breaking the rules' patch serie. Hey Sam, I get this after a simple pull from your tree and a: make clean; make: LD init/built-in.o LD .tmp_vmlinux1 arch/x86/kernel/head_64.o: In function `early_idt_handler': (.text.head+0x1e5): undefined reference to `early_printk' arch/x86/kernel/head64.o: In function `x86_64_start_kernel': head64.c:(.init.text+0xa8): undefined reference to `early_printk' arch/x86/kernel/built-in.o: In function `early_panic': (.text+0x9c07): undefined reference to `early_printk' arch/x86/mm/built-in.o: In function `init_memory_mapping': (.init.text+0xc0a): undefined reference to `early_printk' make: *** [.tmp_vmlinux1] Error 1 Cheers, Kay - 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/