From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752318AbcGMHTw (ORCPT ); Wed, 13 Jul 2016 03:19:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41600 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752257AbcGMHTl (ORCPT ); Wed, 13 Jul 2016 03:19:41 -0400 Date: Wed, 13 Jul 2016 00:19:18 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, hpa@zytor.com, christoffer.dall@linaro.org, acme@redhat.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, tglx@linutronix.de, eric.auger@linaro.org, jolsa@kernel.org, mingo@kernel.org, namhyung@kernel.org, wangnan0@huawei.com Reply-To: marc.zyngier@arm.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, christoffer.dall@linaro.org, acme@redhat.com, adrian.hunter@intel.com, hpa@zytor.com, namhyung@kernel.org, wangnan0@huawei.com, mingo@kernel.org, jolsa@kernel.org, eric.auger@linaro.org, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] kvm arm/arm64: Remove trailing whitespace from headers Git-Commit-ID: f2d3adf46d5763e7154e303e972c891999a4da43 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: f2d3adf46d5763e7154e303e972c891999a4da43 Gitweb: http://git.kernel.org/tip/f2d3adf46d5763e7154e303e972c891999a4da43 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 12 Jul 2016 10:54:45 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Jul 2016 15:20:36 -0300 kvm arm/arm64: Remove trailing whitespace from headers Noticed while making a copy of these files to tools/ where those kernel files were being directly accessed, which we're not allowing anymore to avoid that changes in the kernel side break tooling. Cc: Christoffer Dall Cc: Eric Auger Cc: Marc Zyngier Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-82thftcdhj2j5wt6ir4vuyhk@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- arch/arm/include/uapi/asm/kvm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h index df3f60c..a2b3eb3 100644 --- a/arch/arm/include/uapi/asm/kvm.h +++ b/arch/arm/include/uapi/asm/kvm.h @@ -139,8 +139,8 @@ struct kvm_arch_memory_slot { #define ARM_CP15_REG64(...) __ARM_CP15_REG64(__VA_ARGS__) #define KVM_REG_ARM_TIMER_CTL ARM_CP15_REG32(0, 14, 3, 1) -#define KVM_REG_ARM_TIMER_CNT ARM_CP15_REG64(1, 14) -#define KVM_REG_ARM_TIMER_CVAL ARM_CP15_REG64(3, 14) +#define KVM_REG_ARM_TIMER_CNT ARM_CP15_REG64(1, 14) +#define KVM_REG_ARM_TIMER_CVAL ARM_CP15_REG64(3, 14) /* Normal registers are mapped as coprocessor 16. */ #define KVM_REG_ARM_CORE (0x0010 << KVM_REG_ARM_COPROC_SHIFT)