linux-kernel - [tip:x86/asm] x86/io: Include asm-generic/io.h to architectural code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-3195201198aad06c151dcfcb09e2fff79b2fda0e@git.kernel.org>
Date:   Mon, 24 Jul 2017 03:20:10 -0700
From:   tip-bot for Andy Shevchenko <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     hpa@...or.com, andriy.shevchenko@...ux.intel.com,
        mika.westerberg@...ux.intel.com, peterz@...radead.org,
        wsa@...-dreams.de, baolin.wang@...eadtrum.com, mingo@...nel.org,
        torvalds@...ux-foundation.org, linux-kernel@...r.kernel.org,
        tglx@...utronix.de
Subject: [tip:x86/asm] x86/io: Include asm-generic/io.h to architectural
 code

Commit-ID:  3195201198aad06c151dcfcb09e2fff79b2fda0e
Gitweb:     http://git.kernel.org/tip/3195201198aad06c151dcfcb09e2fff79b2fda0e
Author:     Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
AuthorDate: Fri, 30 Jun 2017 20:09:31 +0300
Committer:  Ingo Molnar <mingo@...nel.org>
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 <andriy.shevchenko@...ux.intel.com>
Acked-by: Wolfram Sang <wsa@...-dreams.de>
Cc: Baolin Wang <baolin.wang@...eadtrum.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Mika Westerberg <mika.westerberg@...ux.intel.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: intel-gfx@...ts.freedesktop.org
Cc: linux-i2c@...r.kernel.org
Link: http://lkml.kernel.org/r/20170630170934.83028-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 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 <asm-generic/io.h>
+#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