linux-kernel - [tip:x86/urgent] x86/vmware: Remove duplicate inclusion of asm/timer.h

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] [day] [month] [year] [list]

Date:   Wed, 1 Mar 2017 01:55:23 -0800
From:   tip-bot for Masanari Iida <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     tglx@...utronix.de, standby24x7@...il.com, hpa@...or.com,
        linux-kernel@...r.kernel.org, mingo@...nel.org
Subject: [tip:x86/urgent] x86/vmware: Remove duplicate inclusion of
 asm/timer.h

Commit-ID:  aa5ec3f715d576353c7d8f4f8085634bd845b73f
Gitweb:     http://git.kernel.org/tip/aa5ec3f715d576353c7d8f4f8085634bd845b73f
Author:     Masanari Iida <standby24x7@...il.com>
AuthorDate: Mon, 27 Feb 2017 21:29:22 +0900
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 1 Mar 2017 10:51:40 +0100

x86/vmware: Remove duplicate inclusion of asm/timer.h

Signed-off-by: Masanari Iida <standby24x7@...il.com>
Cc: akataria@...are.com
Cc: virtualization@...ts.linux-foundation.org
Link: http://lkml.kernel.org/r/20170227122922.26230-1-standby24x7@gmail.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>

---
 arch/x86/kernel/cpu/vmware.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index 891f4da..22403a2 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -30,7 +30,6 @@
 #include <asm/hypervisor.h>
 #include <asm/timer.h>
 #include <asm/apic.h>
-#include <asm/timer.h>
 
 #undef pr_fmt
 #define pr_fmt(fmt)	"vmware: " fmt