Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp4044373rwb; Sat, 10 Dec 2022 02:23:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf7ERMWcZ9mbMv3JG2qkNdFOm3OF7kUneGTXPnHisjv4/qIR3WY7BKx9dj6GPAu3sofC+h6E X-Received: by 2002:a05:6a20:699b:b0:a4:2a7d:59a5 with SMTP id t27-20020a056a20699b00b000a42a7d59a5mr12791645pzk.59.1670667810919; Sat, 10 Dec 2022 02:23:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670667810; cv=none; d=google.com; s=arc-20160816; b=TiOkrhr+c36Lrgztl1La/SgIFl0C7Hnm1u05JqCHUM8tSc84zEHALJzzRIxUQFLCN7 KB7qOHD3xUAHMaoovmFRbREQwn/Cn9u2Q+lPHr1CHRahFeNqrVnleS8DPFVj8j53fj93 bnh7L49VOTuZFiQEJzKAs5bs3BuuYYBnHdiroaheq5LZlOMQXNv0zFsH/J4oj+3IzKPy oZYgKpMjLONxA+/i47GpjDGSzgG+McrwfMsS0rGcohndXSdnq3GFisMkzXD9MEmulz49 cEbQRZYcI2EdjzPatuaaMGHYlA0A4JJBfk5Df9JruA6ZC0AgQ9YoODQBRliFIye6ZVEn CoWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date; bh=acM/21kftE4nhL/HoGJRrb7ob0K+rFgj/uPhrg3uPmU=; b=KL/n7h6OD3XrhwxW8V1JgrRBSWVGs4P9NMd6nRM4N+gvetm/UMx89V4r6Hccu2vmG5 Rk0v0fwxOg9uAjQNjCeCWoir0ekwLviyZwyJ0ILocXBNCwMPQQQAAgngApKYOjfiplde nW4giNRqpAtIECfVY3U44+iydQ7hK3b8liwqJOyObKR9TE5f7ZPa1ll8O9b+g/E7SzAI HBWQtmQc7i7Elpkm+AbNJkaY4WrQpr7BbOE8sq8IQR8yuuK54uMbrjnjXuMJlmTpuQHG /F1HJ0vBZFqNxKqzQr4p/us5pv8/40qElOP+CkoepG1WMjdM66BbcD5Ep7U1dG643g7B UqVQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bn2-20020a056a02030200b0045a2b6e1192si4139000pgb.233.2022.12.10.02.23.21; Sat, 10 Dec 2022 02:23:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230011AbiLJJNS (ORCPT + 74 others); Sat, 10 Dec 2022 04:13:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230175AbiLJJMa (ORCPT ); Sat, 10 Dec 2022 04:12:30 -0500 Received: from 1wt.eu (wtarreau.pck.nerim.net [62.212.114.60]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3B1AD114A for ; Sat, 10 Dec 2022 01:07:46 -0800 (PST) Received: (from willy@localhost) by pcw.home.local (8.15.2/8.15.2/Submit) id 2BA97SMM021793; Sat, 10 Dec 2022 10:07:28 +0100 Date: Sat, 10 Dec 2022 10:07:28 +0100 From: Willy Tarreau To: Sven Schnelle Cc: "Paul E . McKenney" , Josh Triplett , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/5] nolibc: add support for s390 Message-ID: <20221210090728.GB21743@1wt.eu> References: <20221209141939.3634586-1-svens@linux.ibm.com> <20221209141939.3634586-3-svens@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221209141939.3634586-3-svens@linux.ibm.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 09, 2022 at 03:19:36PM +0100, Sven Schnelle wrote: > Use arch-x86_64 as a template. Not really different, but > we have our own mmap syscall which takes a structure instead > of discrete arguments. I'm fine with placing the mmap syscall inside the arch-s390 file, though it differs from what's done for other syscalls. But I admit that mmap is one of these syscalls that differ between various archs and that it's not shocking to leave it per-arch. However you're having an issue here: > diff --git a/tools/include/nolibc/arch-s390.h b/tools/include/nolibc/arch-s390.h > new file mode 100644 > index 000000000000..34b744e2f7d6 > --- /dev/null > +++ b/tools/include/nolibc/arch-s390.h ^^^^^^^^^ vs: > diff --git a/tools/include/nolibc/arch.h b/tools/include/nolibc/arch.h > index 4c6992321b0d..fcded65b98d7 100644 > --- a/tools/include/nolibc/arch.h > +++ b/tools/include/nolibc/arch.h > @@ -27,6 +27,8 @@ > #include "arch-mips.h" > #elif defined(__riscv) > #include "arch-riscv.h" > +#elif defined(__s390x__) > +#include "arch-s390x.h" ^^^^^^^^^^ As you see the file is not the same so if you build by including nolibc.h directly it will not work. The difference between s390 and s390x has never been very clear to me, so I can't easily suggest which name is the most suitable, but you'll definitely have to choose one :-) If it's just a matter of dropping that trailing 'x' there, I think we can fix your patch here without re-submitting, let us know. Once this one is fixed, I'm fine with this: Acked-by: Willy Tarreau Willy