Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2123193yba; Sun, 5 May 2019 23:22:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqwVYFoYUdegarO7PllMFE1vjDXHORnO5TRSu8+KfL4B7i40lhBxy8Un14mVnQPB8n+X6HYo X-Received: by 2002:aa7:8652:: with SMTP id a18mr30365402pfo.167.1557123754442; Sun, 05 May 2019 23:22:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557123754; cv=none; d=google.com; s=arc-20160816; b=hfrHDR5ZsvEFid7PYjkLmKNpdxiuBAlLVp+i4zQPLVve9zZ+pMXtS9RpF7w5MDrBDD ibXgfsxblW3pvduxZtqnzIF++74Co5oGPV6G2p0UlUMeOC57T8n5IYViGznxcG/akwNx Ppg61WG4M/VCVbnbswwPV0YvnKHSgShG7PdDDNbNugQ/RwAWyaGsDZ/xcHKiQWMd0czi Kmav0FE/sedtKFHm53NLRZUYO90g+vYX42OKejrUA7uBsPYeoSYcQy2pNzT349uDVmp0 G4e8kh4Dwd7V3oClllbRm3mIKuetwL5Enjy2XqRbSxRW00eGm7HrbEKrLS7DnXvMpnE5 D5nw== 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:message-id :dkim-signature; bh=y5ptx3mBFIGJB7xCn9foWCh+QyM5ysNRdLKrp+77p+c=; b=LclVtB0FRIcsYd5dfjOfDF7qEjRaxncPlqSJAZH5mYF52Whjf51DLy9Y7LuSjIMfe7 eCkj39JKQSi2J64WebHr3CkBuB5DuRm4rrCgxYAKoN2t4e8ahWf7MxYUkGkdIEoEPCD9 swgNGeM/A6mA9TtIk7bc3CatUovYS5IM1IwjIwTgTB0uyXVUWySgJxkiqBdDYbzMLqcJ zoVvBv/LiJ3VzHSwHb8d02zeupmZgddlqiEU55YFQoo8bcmMZdBM84pvr4jQvSVtQHSA GM+J+JnaEPPE16v3tclUtC03Ztr3ASxinZ7PiKogeQnGB0srI6YxFiynEPw6wLgUBbKb Tu4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=PJbQIC0x; 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 r24si14437383pgg.50.2019.05.05.23.22.19; Sun, 05 May 2019 23:22:34 -0700 (PDT) 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=PJbQIC0x; 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 S1726063AbfEFGVG (ORCPT + 99 others); Mon, 6 May 2019 02:21:06 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:62162 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725828AbfEFGVC (ORCPT ); Mon, 6 May 2019 02:21:02 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44yCKh6glrz9v0Rr; Mon, 6 May 2019 08:20:56 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=PJbQIC0x; 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 tS-ONuM12wYz; Mon, 6 May 2019 08:20:56 +0200 (CEST) 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 44yCKh5ZRWz9v0Rp; Mon, 6 May 2019 08:20:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1557123656; bh=y5ptx3mBFIGJB7xCn9foWCh+QyM5ysNRdLKrp+77p+c=; h=From:Subject:To:Cc:Date:From; b=PJbQIC0xi+KkN/vSOW4aoXiHkt7bZYKsoHWyYM/s2vBQ5uVBNXM1E7m38ooRnSqo+ WMJuqpTsJ/F16yH/EVZRmfa7vvj+K5Ln5LX9WL6YRAKs7Eou7SYQPjjpsDnINag1zL ZJI0ZeMw+cTknlmLzYXv93QcjQI53H/xPXN1PE10= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 48F588B7F7; Mon, 6 May 2019 08:21:01 +0200 (CEST) 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 WMrlp5asfNfV; Mon, 6 May 2019 08:21:01 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.6]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 2CA0A8B74F; Mon, 6 May 2019 08:21:01 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 382F26728F; Mon, 6 May 2019 06:21:01 +0000 (UTC) Message-Id: <502da34ded576b9869b0f49146d465207fbd98ac.1557123466.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH] powerpc/mm: Fix makefile for KASAN To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 6 May 2019 06:21:01 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit 17312f258cf6 ("powerpc/mm: Move book3s32 specifics in subdirectory mm/book3s64"), ppc_mmu_32.c was moved and renamed. This patch fixes Makefiles to disable KASAN instrumentation on the new name and location. Fixes: f072015c7b74 ("powerpc: disable KASAN instrumentation on early/critical files.") Signed-off-by: Christophe Leroy --- arch/powerpc/mm/Makefile | 6 ------ arch/powerpc/mm/book3s32/Makefile | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index d8c0ce9b2557..7a7527116c3a 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile @@ -5,12 +5,6 @@ ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) -KASAN_SANITIZE_ppc_mmu_32.o := n - -ifdef CONFIG_KASAN -CFLAGS_ppc_mmu_32.o += -DDISABLE_BRANCH_PROFILING -endif - obj-y := fault.o mem.o pgtable.o mmap.o \ init_$(BITS).o pgtable_$(BITS).o \ pgtable-frag.o \ diff --git a/arch/powerpc/mm/book3s32/Makefile b/arch/powerpc/mm/book3s32/Makefile index a4e217d0f3b7..1732eaa740a9 100644 --- a/arch/powerpc/mm/book3s32/Makefile +++ b/arch/powerpc/mm/book3s32/Makefile @@ -1,3 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 +KASAN_SANITIZE_mmu.o := n + +ifdef CONFIG_KASAN +CFLAGS_mmu.o += -DDISABLE_BRANCH_PROFILING +endif + obj-y += mmu.o hash_low.o mmu_context.o tlb.o -- 2.13.3