From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755294AbdGXKYZ (ORCPT ); Mon, 24 Jul 2017 06:24:25 -0400 Received: from terminus.zytor.com ([65.50.211.136]:36325 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752510AbdGXKXs (ORCPT ); Mon, 24 Jul 2017 06:23:48 -0400 Date: Mon, 24 Jul 2017 03:20:10 -0700 From: tip-bot for Andy Shevchenko Message-ID: Cc: hpa@zytor.com, andriy.shevchenko@linux.intel.com, mika.westerberg@linux.intel.com, peterz@infradead.org, wsa@the-dreams.de, baolin.wang@spreadtrum.com, mingo@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: andriy.shevchenko@linux.intel.com, hpa@zytor.com, peterz@infradead.org, mika.westerberg@linux.intel.com, torvalds@linux-foundation.org, mingo@kernel.org, baolin.wang@spreadtrum.com, wsa@the-dreams.de, tglx@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <20170630170934.83028-3-andriy.shevchenko@linux.intel.com> References: <20170630170934.83028-3-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/io: Include asm-generic/io.h to architectural code Git-Commit-ID: 3195201198aad06c151dcfcb09e2fff79b2fda0e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3195201198aad06c151dcfcb09e2fff79b2fda0e Gitweb: http://git.kernel.org/tip/3195201198aad06c151dcfcb09e2fff79b2fda0e Author: Andy Shevchenko AuthorDate: Fri, 30 Jun 2017 20:09:31 +0300 Committer: Ingo Molnar CommitDate: Mon, 24 Jul 2017 11:18:21 +0200 x86/io: Include asm-generic/io.h to architectural code asm-generic/io.h defines few helpers which would be useful in the drivers, such as writesb() and readsb(). Include it to the asm/io.h in architectural folder. Signed-off-by: Andy Shevchenko Acked-by: Wolfram Sang Cc: Baolin Wang Cc: Linus Torvalds Cc: Mika Westerberg Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: intel-gfx@lists.freedesktop.org Cc: linux-i2c@vger.kernel.org Link: http://lkml.kernel.org/r/20170630170934.83028-3-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/io.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index c1c0880..0558d81 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -406,6 +406,9 @@ extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, #define IO_SPACE_LIMIT 0xffff +#include +#undef PCI_IOBASE + #ifdef CONFIG_MTRR extern int __must_check arch_phys_wc_index(int handle); #define arch_phys_wc_index arch_phys_wc_index