Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933081Ab1CWXDf (ORCPT ); Wed, 23 Mar 2011 19:03:35 -0400 Received: from sncsmrelay2.nai.com ([67.97.80.206]:38646 "EHLO sncsmrelay2.nai.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932755Ab1CWXDc convert rfc822-to-8bit (ORCPT ); Wed, 23 Mar 2011 19:03:32 -0400 Message-ID: <4D8A7B7F.2050405@snapgear.com> Date: Thu, 24 Mar 2011 09:00:15 +1000 From: Greg Ungerer User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.14) Gecko/20110223 Thunderbird/3.1.8 MIME-Version: 1.0 To: Geert Uytterhoeven CC: , , , Linux-Next Subject: Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories References: <1300768985-902-1-git-send-email-gerg@snapgear.com> In-Reply-To: Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5829 Lines: 133 Hi Geert, On 24/03/11 08:07, Geert Uytterhoeven wrote: > On Tue, Mar 22, 2011 at 05:43, wrote: >> The following patch merges the m68k and m68knommu arch directories. >> This patch has been trimmed for review purposes - the automated file >> moving and mergeing carried out by the script contained in this email >> has been removed. Only the manually required changes after running the >> script are shown as the patch. (So to end up with the final required >> change you need to run this script then apply the patch). >> >> This change is available as the only commit on the m68knommu git tree, >> for-linux branch: >> >> The following changes since commit a952baa034ae7c2e4a66932005cbc7ebbccfe28d: >> áLinus Torvalds (1): >> á á á áMerge branch 'for-linus' of git://git.kernel.org/.../dtor/input >> >> are available in the git repository at: >> >> ágit://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus >> >> Greg Ungerer (1): >> á á ám68k: merge m68k and m68knommu arch directories >> >> >> It is also on the for-next branch in that tree, so will get some testing >> in the next tree for the next few days. > > defconfig is now a nommu-config, and it fails? > > http://kisskb.ellerman.id.au/kisskb/buildresult/4012794/ Yep, that looks wrong. I'll move the define for KBUILD_DEFCONFIG into arch/m68k/Makefile (and remove the existing defines in Makefile_mm and Makefile_no). That will make the DEFCONFIG as it was before, multi_defconfig. > arch/m68k/kernel/entry_no.S:47: Error: Unknown operator -- statement > `save_all' ignored This is due to compiling for the non-mmu targets and not using a m68k-uclinux- toolchain. Unfortunately the compiler must define __uClinux__ to compile for non-mmu targets. This isn't new, we have had this problem ever since the merge of the header files. (The exported headers need some switch to use to base some conditionals on, and kernel config options cannot be used in exported headers). But with a fixed defconfig, you won't see this anymore :-) I'll fix up the git commit on m68knommu git tree. Thanks! Greg > arch/m68k/kernel/entry_no.S:56: Error: Unknown operator -- statement > `save_all' ignored > arch/m68k/kernel/entry_no.S:92: Error: operands mismatch -- statement > `moveml %a3-%a6/%d6-%d7,%sp@-' ignored > arch/m68k/kernel/entry_no.S:96: Error: operands mismatch -- statement > `moveml %sp@+,%a3-%a6/%d6-%d7' ignored > arch/m68k/kernel/entry_no.S:100: Error: operands mismatch -- statement > `moveml %a3-%a6/%d6-%d7,%sp@-' ignored > arch/m68k/kernel/entry_no.S:104: Error: operands mismatch -- statement > `moveml %sp@+,%a3-%a6/%d6-%d7' ignored > arch/m68k/kernel/entry_no.S:108: Error: operands mismatch -- statement > `moveml %a3-%a6/%d6-%d7,%sp@-' ignored > arch/m68k/kernel/entry_no.S:112: Error: operands mismatch -- statement > `moveml %sp@+,%a3-%a6/%d6-%d7' ignored > arch/m68k/kernel/entry_no.S:116: Error: operands mismatch -- statement > `moveml %a3-%a6/%d6-%d7,%sp@-' ignored > arch/m68k/kernel/entry_no.S:118: Error: operands mismatch -- statement > `moveml %sp@+,%a3-%a6/%d6-%d7' ignored > arch/m68k/kernel/entry_no.S:122: Error: operands mismatch -- statement > `moveml %a3-%a6/%d6-%d7,%sp@-' ignored > arch/m68k/kernel/entry_no.S:124: Error: operands mismatch -- statement > `moveml %sp@+,%a3-%a6/%d6-%d7' ignored > arch/m68k/platform/coldfire/entry.S:65: Error: Unknown operator -- > statement `save_all' ignored > arch/m68k/platform/coldfire/entry.S:92: Error: operands mismatch -- > statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored > arch/m68k/platform/coldfire/entry.S:94: Error: operands mismatch -- > statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored > arch/m68k/platform/coldfire/entry.S:100: Error: operands mismatch -- > statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored > arch/m68k/platform/coldfire/entry.S:104: Error: operands mismatch -- > statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored > arch/m68k/platform/coldfire/entry.S:144: Error: Unknown operator -- > statement `restore_user' ignored > arch/m68k/platform/coldfire/entry.S:156: Error: operands mismatch -- > statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored > arch/m68k/platform/coldfire/entry.S:160: Error: operands mismatch -- > statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored > arch/m68k/platform/coldfire/entry.S:169: Error: Unknown operator -- > statement `save_all' ignored > arch/m68k/platform/coldfire/entry.S:193: Error: Unknown operator -- > statement `rdusp' ignored > arch/m68k/platform/coldfire/entry.S:196: Error: operands mismatch -- > statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored > arch/m68k/platform/coldfire/entry.S:199: Error: operands mismatch -- > statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored > arch/m68k/platform/coldfire/entry.S:202: Error: Unknown operator -- > statement `wrusp' ignored > > Gr{oetje,eeting}s, > > á á á á á á á á á á á á Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > á á á á á á á á á á á á á áá áá -- Linus Torvalds > > > -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com -- 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/