Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp4833588ybv; Wed, 26 Feb 2020 03:55:30 -0800 (PST) X-Google-Smtp-Source: APXvYqyaOKebD5TgudK4PxBq8wyYUaGbhH7kMqcQHt5eH+zw6McqOSEW9xKqLSP1XPy5jU+bICZ2 X-Received: by 2002:a9d:6f0a:: with SMTP id n10mr2782555otq.54.1582718129975; Wed, 26 Feb 2020 03:55:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582718129; cv=none; d=google.com; s=arc-20160816; b=aBJN4lKC6MdBqrSEpTfXUkr/4LR0knxmCqPsM3S/ljLLooSH05t6wyWxrKENOmCspk q/LVVI0zGKCxkBQilCHXSis7VmcVSGuW7YU2C97+b5vb+ZQmdP92Fg9Qm1XtGnacwm/6 2khof4XshFO1G/h0C5/s1uOMd0GL/7CbdOHiEy8jGSnVU/Wol6xcQV1yq5Ps/e0gSe1j y3qGxOecejigrhyew2iJesfpMqVSGRtSJVM2oCTk7T20+sglQneAjDQP2in500XlFda8 FYzF4XdqREf/DkiWFYbucFOzYzj8BFrPgVBqAG+z5uTYFkMSWSCXBLlx+xQXxoXX8AB+ bP4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=/xGAlSMxsbbK8Cs3mxqn4uvtWXswsjZq2+zN+Vo5MFY=; b=wc5yLtonlWWKMQu6eSgPx+qbtDAnVri6t2Pfo33n/qVLh+JX1LDcu4KDMxVxOur7l4 UQJFIwKoDcNKR0ILWqw4YeuNAaRQjJe4CkSQjusdfiUhahLiw6g/u8xqNWInjLo821dz k1LkM2vL8RYUvHcfnTZkadNUaQItd2+zZ77SL37JvpTRAqWusWlqyjJU1dUSEZtTUHYy 1IyHi9n5/QqsZIuYWcznjxn2dC9ZOiGkDnccpIqpizrPqs5rFSkAVmCo5xTJTeWBjiCc fqyPSTAzYxWxH6rSlDgMaN2EynOBzk2Wt9/L/Vedd58RcAuEtdFitLG+GUywje8gof45 URnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Qsl3GVPZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z129si1032622oia.17.2020.02.26.03.55.17; Wed, 26 Feb 2020 03:55:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Qsl3GVPZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726700AbgBZLxy (ORCPT + 99 others); Wed, 26 Feb 2020 06:53:54 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:40344 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726250AbgBZLxx (ORCPT ); Wed, 26 Feb 2020 06:53:53 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 48SDjB59pRz9txV8; Wed, 26 Feb 2020 12:53:50 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=Qsl3GVPZ; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id 9IVP3agQew3R; Wed, 26 Feb 2020 12:53:50 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 48SDjB47Tgz9txV6; Wed, 26 Feb 2020 12:53:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1582718030; bh=/xGAlSMxsbbK8Cs3mxqn4uvtWXswsjZq2+zN+Vo5MFY=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=Qsl3GVPZwwD/IOh4spRWb61QlJUcxGzf5qNun9KtZW3iIM8tUvDi6+C8HdILsBFB4 kdMQNdOMl9j5ikL3hcXXhNC3Fl/vddKcQIpriXHDMafnCk/U5UbiEfaP815ziqgfsD AavXrZ4DHhaUS25eMqQ65kQEPPHknM4PSRAEqA6k= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D088A8B846; Wed, 26 Feb 2020 12:53:51 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id rXFz3K37NZcy; Wed, 26 Feb 2020 12:53:51 +0100 (CET) Received: from pc16570vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 9BFF58B776; Wed, 26 Feb 2020 12:53:51 +0100 (CET) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 7526265400; Wed, 26 Feb 2020 11:53:51 +0000 (UTC) Message-Id: <9ebcbe37834e9d447dd97f4381084795a673260c.1582717645.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v3 01/13] powerpc: move ptrace into a subdirectory. To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , mikey@neuling.org Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Wed, 26 Feb 2020 11:53:51 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to allow splitting of ptrace depending on the different CONFIG_ options, create a subdirectory dedicated to ptrace and move ptrace.c and ptrace32.c into it. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/Makefile | 7 +++---- arch/powerpc/kernel/ptrace/Makefile | 9 +++++++++ arch/powerpc/kernel/{ => ptrace}/ptrace.c | 0 arch/powerpc/kernel/{ => ptrace}/ptrace32.c | 0 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 arch/powerpc/kernel/ptrace/Makefile rename arch/powerpc/kernel/{ => ptrace}/ptrace.c (100%) rename arch/powerpc/kernel/{ => ptrace}/ptrace32.c (100%) diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 78a1b22d4fd8..d812d7760e50 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -3,8 +3,6 @@ # Makefile for the linux kernel. # -CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' - ifdef CONFIG_PPC64 CFLAGS_prom_init.o += $(NO_MINIMAL_TOC) endif @@ -41,15 +39,16 @@ CFLAGS_cputable.o += -DDISABLE_BRANCH_PROFILING CFLAGS_btext.o += -DDISABLE_BRANCH_PROFILING endif -obj-y := cputable.o ptrace.o syscalls.o \ +obj-y := cputable.o syscalls.o \ irq.o align.o signal_32.o pmc.o vdso.o \ process.o systbl.o idle.o \ signal.o sysfs.o cacheinfo.o time.o \ prom.o traps.o setup-common.o \ udbg.o misc.o io.o misc_$(BITS).o \ of_platform.o prom_parse.o +obj-y += ptrace/ obj-$(CONFIG_PPC64) += setup_64.o sys_ppc32.o \ - signal_64.o ptrace32.o \ + signal_64.o \ paca.o nvram_64.o firmware.o note.o obj-$(CONFIG_VDSO32) += vdso32/ obj-$(CONFIG_PPC_WATCHDOG) += watchdog.o diff --git a/arch/powerpc/kernel/ptrace/Makefile b/arch/powerpc/kernel/ptrace/Makefile new file mode 100644 index 000000000000..02fb28eb3b55 --- /dev/null +++ b/arch/powerpc/kernel/ptrace/Makefile @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the linux kernel. +# + +CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' + +obj-y += ptrace.o +obj-$(CONFIG_PPC64) += ptrace32.o diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace/ptrace.c similarity index 100% rename from arch/powerpc/kernel/ptrace.c rename to arch/powerpc/kernel/ptrace/ptrace.c diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace/ptrace32.c similarity index 100% rename from arch/powerpc/kernel/ptrace32.c rename to arch/powerpc/kernel/ptrace/ptrace32.c -- 2.25.0