Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp4270694ybc; Fri, 15 Nov 2019 01:46:14 -0800 (PST) X-Google-Smtp-Source: APXvYqyordvbDOD4SID0jZ5z3oXEh2DYZTcfJrwHQLWcK+k17YrMxbEN/D8dsOT86XhOeZ3pDNHr X-Received: by 2002:a17:906:1d01:: with SMTP id n1mr12398955ejh.95.1573811173814; Fri, 15 Nov 2019 01:46:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573811173; cv=none; d=google.com; s=arc-20160816; b=cHqudwxL16+jE4o8+f+rNGBlQWg7NAYvHgQr+AFNQrhCTLc/HnUpi/YUcnLyRgYDO9 NY64nd5jqofV+EaixRQ5BhVMz6eJI74g3vQRU9Yp8mhsVFoqwRrnOEUaZFYdSmT/BO9H CMeOpd6jUJpuRZMADtUH4ZDp7XvYh5kM3JI7GhrQuI6Ft7ely48DAvTqlymai9ZYNrcc G7a00dpPgxK69YnsWZwahldIQMCdqiGhikQ+CqT+x8aYTYtt/+NqvmXoazX2g2V8SE1W SaIZrlHC6/vYlxEwLzaA7/rz/751ZyIf+0m3nzLXTfMYEZghO/8HtcscmfdDdidpi+bi UJAQ== 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=qf10jhokCnfw5OP5DxdmzRKqGqkKW0r8ODC1JCpm67o=; b=1KdEQz9StvPTH/W6ej2T7MIrJCaVegxBoJahiadlgN0LSGOiBA/awQdeGNiWWXGlSD hlEHaGRcw/jf3B9COIwPlPZHENirdFtJwJeprkhvsHpbd+bmZu3exBXBbQ4v6IF9iZOu lAcQhQoIev+MKgt9sQruxBVDF0D+3LuhxOIHMeTd36u4tSwm+6Hmn4uE+oFP9mO5ZmK8 3r1EGB9HVXxy+Pd+iL9SypaJI5jMIu++k5Y4nlVP9+12f5Ds5uKZzfM3XroFWu2IC4GI TAoumMj3L0sajPxZyNm3O8te0VAZp5w/m6N681lDK9sh68PHMZ8e0LoiJYtGWGYLdS5/ fLyw== ARC-Authentication-Results: i=1; mx.google.com; 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 b29si6517438ede.118.2019.11.15.01.45.48; Fri, 15 Nov 2019 01:46:13 -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; 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 S1727566AbfKOJoB (ORCPT + 99 others); Fri, 15 Nov 2019 04:44:01 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:42936 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727316AbfKOJn0 (ORCPT ); Fri, 15 Nov 2019 04:43:26 -0500 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 1iVY8Q-0004Sz-1V; Fri, 15 Nov 2019 10:43:22 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id B66821C08AC; Fri, 15 Nov 2019 10:43:21 +0100 (CET) Date: Fri, 15 Nov 2019 09:43:21 -0000 From: "tip-bot2 for Christoph Hellwig" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/pci: Remove #ifdef __KERNEL__ guard from Cc: Christoph Hellwig , Thomas Gleixner , Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org In-Reply-To: <20191113071836.21041-4-hch@lst.de> References: <20191113071836.21041-4-hch@lst.de> MIME-Version: 1.0 Message-ID: <157381100119.29467.13434467993345423920.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 x86/cleanups branch of tip: Commit-ID: b52b0c4fc977901c243756e191f3fc686725b7d9 Gitweb: https://git.kernel.org/tip/b52b0c4fc977901c243756e191f3fc686725b7d9 Author: Christoph Hellwig AuthorDate: Wed, 13 Nov 2019 08:18:36 +01:00 Committer: Thomas Gleixner CommitterDate: Fri, 15 Nov 2019 10:37:14 +01:00 x86/pci: Remove #ifdef __KERNEL__ guard from pci.h is not a UAPI header, so the __KERNEL__ ifdef is rather pointless. Signed-off-by: Christoph Hellwig Signed-off-by: Thomas Gleixner Link: https://lkml.kernel.org/r/20191113071836.21041-4-hch@lst.de --- arch/x86/include/asm/pci.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e28aa..90d0731 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -12,8 +12,6 @@ #include #include -#ifdef __KERNEL__ - struct pci_sysdata { int domain; /* PCI domain */ int node; /* NUMA node */ @@ -118,7 +116,6 @@ void native_restore_msi_irqs(struct pci_dev *dev); #define native_setup_msi_irqs NULL #define native_teardown_msi_irq NULL #endif -#endif /* __KERNEL__ */ /* generic pci stuff */ #include