Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp69616ybf; Thu, 27 Feb 2020 16:15:10 -0800 (PST) X-Google-Smtp-Source: APXvYqz9ijaLFw7v/XmoPjME1ihmdnlBG9hjWWSYBJXfUk95WLLtGMt60+VW35dVZnw+c056ioie X-Received: by 2002:aca:5646:: with SMTP id k67mr1271732oib.166.1582848910643; Thu, 27 Feb 2020 16:15:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582848910; cv=none; d=google.com; s=arc-20160816; b=yd2I9VLBiAQp4oJHaPaCL3KB/+vBqolnKpQSYGO7wlwkULnZzkOa8xe3CHo5w2cH3d jGi4IoG3P2SutbjOGfp0xfouB6P82sRo1+PDfiULXsP4iEOOLrPW2QzDVYuM1dEH1ylP 2zb39Dvvxt6rLqnBgsFnYgCS4UxjkYr8CToOptZgg00pJ4iCDRzE+Qa3CSWkkzUUJjE9 0QzlF0NRYupml055PSFw8AjmHfWMAGwlAVFVKx/kyz5Va8oz47Jbh3/tWYE+f2KmV5xO RG3kHdx2AgMUpzEjfVSZ3xD5eNcMNFSaGv2NsR5vnJPUYjEhDP1LZAhCTWy2jEguSWPf ruBA== 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=Dhne1FHVZfXPzFWADh8Lx/deqfJP4EizIvbuHyAi2C0+IE74W8F1ruRG67j4QkLeEO oGhTSc1JJ4cQvbWCNLMInKXvRZE0SEGOwSBYZ0WC1uSz7BKggtCmDlhuaMN7WkhjhIR8 jobV6TFpLvKVgyzXWJLmjM+qVXdp/8u1YQaIeNvU8Nw3Di/DVunrjMJhYRpBDS0JHZKp Ev9YaWgyonGLa8SIs/ecqqzveLzeSKUvXlli27xQTWtuiSig0G7qmFwo9hl8HVI6opxm TvbAddJHS8HEevda2lFGDgemoSyXhuli7DBFmaibJg5+Y3k+9yvFwyd7iBF4ePnyEPcV q4pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=cCmVfgWZ; 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 71si536922otm.111.2020.02.27.16.14.59; Thu, 27 Feb 2020 16:15:10 -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=cCmVfgWZ; 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 S1730174AbgB1AOo (ORCPT + 99 others); Thu, 27 Feb 2020 19:14:44 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:60999 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728993AbgB1AOn (ORCPT ); Thu, 27 Feb 2020 19:14:43 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 48T95Y4c3sz9tyJc; Fri, 28 Feb 2020 01:14:41 +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=cCmVfgWZ; 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 fg8Z_dmJUoFf; Fri, 28 Feb 2020 01:14:41 +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 48T95Y3Spdz9tyJb; Fri, 28 Feb 2020 01:14:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1582848881; bh=/xGAlSMxsbbK8Cs3mxqn4uvtWXswsjZq2+zN+Vo5MFY=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=cCmVfgWZwlY4wVl2W9ZRiGvqrKOnPCT6GNloBnH57eOH9XNtNe6ZEF0pgdxWzIzSA U0653OD7DMQeJ8expIlX//dNgVJ7L76TfzkpyIiUNZqthLjNbybqrJyb/lacvlozXX l9TYfnd+H4mUapxK9emK9ThCF8EmrrCrMeA/Ts6I= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id CA4378B881; Fri, 28 Feb 2020 01:14:41 +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 cr6emkYs4mFV; Fri, 28 Feb 2020 01:14:41 +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 1C1008B799; Fri, 28 Feb 2020 01:14:39 +0100 (CET) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 7F92B65403; Fri, 28 Feb 2020 00:14:37 +0000 (UTC) Message-Id: <9ebcbe37834e9d447dd97f4381084795a673260c.1582848567.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v5 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: Fri, 28 Feb 2020 00:14:37 +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