Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp2766327ybk; Tue, 12 May 2020 07:39:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDUAmnG3BCt+ALr3q4B2ZbijTOpJgj/XaaC9u2kN5s9AwNgrtxHIsMr2t6mvdPD3rPkd5b X-Received: by 2002:a05:6402:946:: with SMTP id h6mr9818135edz.245.1589294381460; Tue, 12 May 2020 07:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589294381; cv=none; d=google.com; s=arc-20160816; b=d3FHNWhrMR9vhIFoUTXcBTmKkvielR/CaoxBU3dQqwCdBOnscJCwcLhhvReFK+O6J7 ZHs5g4cItjmR4I6viF5X9p03OjILvK7s0M6NmnO0n+iCUDSjqItnWJC51NW3BaE0xgby zcxmw7m1BrXvWnwE1BYKZeP1X3cBfc/HF1wgs7nNHrR5LheKMSp/67aaDOd9j9/CLvW6 jlHa0gpTMN9KK9QtPcc+eDzi4aqFOR7gj/qIB/DQnQhxEkollRjEz/5YYCz9kXiYbaP/ P8kUyQ/ilwmEQ8CEwvAI2UlOUvcproa+jK53HHY4CJxM/JYh40WXODsblQmK0ad/8Ejy OiYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=KREIYkqxGNFSEIvONsCqv9pawXfMt2wAIIV8lkCHKaM=; b=T/dhppLu2zxYyiHhC2r6LhTchB03AaK0aR5gaYDvHtww6lTjO2zw2RCt8jDlDw5hQQ miXtZFvHR/YsOuKmCsOTfVdwsuKKbL/n9VA50+w+sDZMg3377qxgEIsX6CAwZvS/Nr2U NdSmIkoi+32N+XpfdwGBYru7PT4QdyfqyZ5InO4yg+EWJ5VhqUs5XGyLIQ5x7K3bA6mn LAdhVY3tsC6jzWHYg9tZNXdeApjmBRtnB+KS/hHc5N7PWsSjMjjVCEVsQP9n2hVSh8JG kklEOU5+iqEKT22vpv8e2tBSeSe61C9zMYK1bph6GA0K8oIQLLQcxvcX9v2hzCfIl90X DNAg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id se23si3432401ejb.247.2020.05.12.07.39.18; Tue, 12 May 2020 07:39:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730412AbgELOhM (ORCPT + 99 others); Tue, 12 May 2020 10:37:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730394AbgELOhI (ORCPT ); Tue, 12 May 2020 10:37:08 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF511C061A0E; Tue, 12 May 2020 07:37:07 -0700 (PDT) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jYW1o-0005qT-CV; Tue, 12 May 2020 16:37:04 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id D47B91C0494; Tue, 12 May 2020 16:36:58 +0200 (CEST) Date: Tue, 12 May 2020 14:36:58 -0000 From: "tip-bot2 for Will Deacon" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/kcsan] linux/compiler.h: Remove redundant '#else' Cc: Will Deacon , Thomas Gleixner , "Peter Zijlstra (Intel)" , x86 , LKML In-Reply-To: <20200511204150.27858-19-will@kernel.org> References: <20200511204150.27858-19-will@kernel.org> MIME-Version: 1.0 Message-ID: <158929421876.390.5641049290756529509.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/kcsan branch of tip: Commit-ID: 8367aadcd83d2570fd4ce4af40ae7aec7c2bfcb7 Gitweb: https://git.kernel.org/tip/8367aadcd83d2570fd4ce4af40ae7aec7c2bfcb7 Author: Will Deacon AuthorDate: Mon, 11 May 2020 21:41:50 +01:00 Committer: Thomas Gleixner CommitterDate: Tue, 12 May 2020 11:04:11 +02:00 linux/compiler.h: Remove redundant '#else' The '#else' clause after checking '#ifdef __KERNEL__' is empty in linux/compiler.h, so remove it. Signed-off-by: Will Deacon Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20200511204150.27858-19-will@kernel.org --- include/linux/compiler.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index cce2c92..9bd0f76 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -331,7 +331,6 @@ unsigned long read_word_at_a_time(const void *addr) kcsan_enable_current(); \ __val; \ }) -#else #endif /* __KERNEL__ */