From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEFBBC04EB8 for ; Tue, 4 Dec 2018 21:17:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEB572082B for ; Tue, 4 Dec 2018 21:17:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AEB572082B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726168AbeLDVRf (ORCPT ); Tue, 4 Dec 2018 16:17:35 -0500 Received: from mail-qk1-f193.google.com ([209.85.222.193]:43547 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725880AbeLDVRf (ORCPT ); Tue, 4 Dec 2018 16:17:35 -0500 Received: by mail-qk1-f193.google.com with SMTP id r71so10572001qkr.10; Tue, 04 Dec 2018 13:17:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=oNLZdxPA/1JMTOenX3BXjqrafMgfKLzwoze6zSjaYjs=; b=FRV6mMBE7By9T7uj2xTjiptYoVShkJiOQ/lDHTFS5jWFhS06tGhOvQ4br3KxvCo0u8 scypYY4QigNzk3XcHyxcHgJpm5ip8/EGGg7BRNr6Hotjcua3Vpy7DV+qbWVfOfIpDItu ejwqSWXkHtLaRrCVzDLtsXh4ju1i/zdIfbOK1hoC03vNmNIXkSAVl3dIz+jNJS7TEM65 jpnR1WsOXpRSkg5zqvxpQVrvQkLQLCAXFjyOuJprd4nOb/gtldtw81X1aVhPaucPDn20 IK6KR0QdTP2iEPkKBNOcNV7G2oQDMJNLda/JGIh2iEq0I3yhyJEP6dz6hSIPSQ8tsqNK fgFA== X-Gm-Message-State: AA+aEWYWEqRSFsbHipfMv603hAMTy6NywYmkm5ZNxLH4oxkJoE5VJcM8 xDE4h4RyGj5TXSPdZCtQYfWGQ9FcQYZHBV3asgE= X-Google-Smtp-Source: AFSGD/WLqefm4/JZ8Oq0jJRXrV707I2FqcC+iotSpp9LY7+wMEyltpzSAqKwkIOad/jvr90tsqLqlJgfrLETvle9J5g= X-Received: by 2002:ae9:e102:: with SMTP id g2mr19045176qkm.343.1543958254395; Tue, 04 Dec 2018 13:17:34 -0800 (PST) MIME-Version: 1.0 References: <1543465611-17122-1-git-send-email-firoz.khan@linaro.org> <1543465611-17122-5-git-send-email-firoz.khan@linaro.org> In-Reply-To: <1543465611-17122-5-git-send-email-firoz.khan@linaro.org> From: Arnd Bergmann Date: Tue, 4 Dec 2018 22:17:18 +0100 Message-ID: Subject: Re: [PATCH v3 4/4] powerpc: generate uapi header and system call table files To: Firoz Khan Cc: linuxppc-dev , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Geert Uytterhoeven , linuxram@us.ibm.com, Mathieu Desnoyers , leitao@debian.org, Boqun Feng , gregkh , Philippe Ombredanne , Thomas Gleixner , Kate Stewart , y2038 Mailman List , Linux Kernel Mailing List , linux-arch , Deepa Dinamani , Marcin Juszkiewicz Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S > index 9ff1913..d756348 100644 > --- a/arch/powerpc/kernel/systbl.S > +++ b/arch/powerpc/kernel/systbl.S > #ifdef CONFIG_PPC64 > @@ -47,5 +25,17 @@ > .globl sys_call_table > sys_call_table: > > +#if defined CONFIG_PPC64 && defined(CONFIG_COMPAT) > +#define __SYSCALL(nr, entry, nargs) .8byte entry > #define compat_sys_sigsuspend sys_sigsuspend > -#include > +#include > +#undef __SYSCALL > +#elif defined CONFIG_PPC64 && !defined(CONFIG_COMPAT) > +#define __SYSCALL(nr, entry, nargs) .8byte entry > +#include > +#undef __SYSCALL This part looks wrong: where the old sys_call_table contained both the native and compat calls side by side, the new table contains only the compat versions (note that CONFIG_COMPAT is always set on PPC64). I think you copy-pasted this incorrectly from one of the other architectures that uses a different layout for the compat calls. The way I think this could work best is if you add a preparation patch that splits out the 64-bit table into two separate ones (and make sure that works). After that, you can add your existing patch, rebased to use the two generated tables instead of the old-style tables. I'll follow up with an untested patch for illustration. Arnd