From patchwork Fri Jan 11 13:47:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10758077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE38C1390 for ; Fri, 11 Jan 2019 13:47:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19A882861D for ; Fri, 11 Jan 2019 13:47:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BB8B29C66; Fri, 11 Jan 2019 13:47:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF4E72861D for ; Fri, 11 Jan 2019 13:47:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732649AbfAKNrs (ORCPT ); Fri, 11 Jan 2019 08:47:48 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44000 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732827AbfAKNrs (ORCPT ); Fri, 11 Jan 2019 08:47:48 -0500 Received: by mail-wr1-f68.google.com with SMTP id r10so15238130wrs.10 for ; Fri, 11 Jan 2019 05:47:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JfzJzGO9UGsoHAHmj51k1BlHyWbSStwDHYTwKhI57Y4=; b=NEkMkJ+mRpnXceIfKVHdidDME1rqbsVFFyuYNbksIGQ533359BmSQX2EilvvFPUN6D tGfDFrq2ukPIHlM36+5L0mDWXTb6Ve78GanvqRtToFr9dzd5KVM3wt9Pdl6siWpUfse4 FM0lDfchKlAfLUl0AZ5gJk8fL7NW1qg+hR9XSoLfs+Z5XmjjckYgRkY/AkXKSzSCU91y J+sHFqQ8l26j7qabqmqE5gGX/GMMNOIuG3uKV4yyNrFVQmdFZgyrIK7bQhcGK3CrmYTF 10lqjyd/OFB8ceEbDt1sdwwdIcMne/mU27opORNvTLOz9taoqsIXnKQtKou48XFVcVW8 MQpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JfzJzGO9UGsoHAHmj51k1BlHyWbSStwDHYTwKhI57Y4=; b=cz3MW3AUg51+pCy/ZSCYMFyFtr+CsLotm9SUsiVEmnqvC8X3KJWRaK24vSQr87rdsz bftU66CmG7skV+gKdDj0SpYwupbELMIhbhQRh1YfWYhW3elq09YpretEg3PYII/Pz78r lpX339ohJI8f5ixxkfzmRnTuV3nszgFl3sb/TzWByZIl5woft4cEcM7jW5GqFIP2LqOo G28CrTwyPbOcrfz4fqrnERtuNkj9gS/YVbYOyc/fgoQBCqJvg+3vcTSd4kyy4bFt3oBm fVBEYvTb/BBQCQw3SVDbw1isxCz/ln7zDli0Rf/mh+kIk41BrTyB9gNhxZqEfcrKaC3j fE9g== X-Gm-Message-State: AJcUukdJ05JEP5oGpemtwiwtWVVGS/wD4CEYe0bdB9O/LPCb8scJVUdR UWJ8sIrEUQgzQwIotLwVHzOXaw== X-Google-Smtp-Source: ALg8bN79o72/jOe8866Av4s1M/ZY2sXogUQzDJeTqtK3cI+i3sVXtdmXDxWwD/wEpFd113uizmdOkg== X-Received: by 2002:a5d:454f:: with SMTP id p15mr14423289wrr.39.1547214464989; Fri, 11 Jan 2019 05:47:44 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:13:8ce:d7fa:9f4c:492]) by smtp.gmail.com with ESMTPSA id 3sm22946971wmw.46.2019.01.11.05.47.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 05:47:43 -0800 (PST) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Catalin Marinas , Will Deacon , Christoph Lameter , Andrew Morton , Mark Rutland , Nick Desaulniers , Marc Zyngier , Dave Martin , Ard Biesheuvel , "Eric W . Biederman" , Ingo Molnar , Paul Lawrence , Geert Uytterhoeven , Arnd Bergmann , "Kirill A . Shutemov" , Greg Kroah-Hartman , Kate Stewart , Mike Rapoport , Vincenzo Frascino , kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Cc: Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Jann Horn , Mark Brand , Chintan Pandya , Vishwath Mohan , Andrey Konovalov Subject: [PATCH] kasan, arm64: remove redundant ARCH_SLAB_MINALIGN define Date: Fri, 11 Jan 2019 14:47:40 +0100 Message-Id: <7f36be5fdf491259d6c8100232fa93ff40edf841.1547214440.git.andreyknvl@google.com> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Defining ARCH_SLAB_MINALIGN in arch/arm64/include/asm/cache.h when KASAN is off is not needed, as it is defined in defined in include/linux/slab.h as ifndef. Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/cache.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index eb43e09c1980..926434f413fa 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -60,8 +60,6 @@ #ifdef CONFIG_KASAN_SW_TAGS #define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT) -#else -#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) #endif #ifndef __ASSEMBLY__