From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751586AbdIKPGZ (ORCPT ); Mon, 11 Sep 2017 11:06:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55636 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750810AbdIKPGY (ORCPT ); Mon, 11 Sep 2017 11:06:24 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EB61122C8B3 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=vkuznets@redhat.com From: Vitaly Kuznetsov To: x86@kernel.org Cc: "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , devel@linuxdriverproject.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86/hyper-v: Remove doubled HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition Date: Mon, 11 Sep 2017 17:06:20 +0200 Message-Id: <20170911150620.3998-1-vkuznets@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 11 Sep 2017 15:06:24 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 7dcf90e9e032 ("PCI: hv: Use vPCI protocol version 1.2") and commit 628f54cc6451 ("x86/hyper-v: Support extended CPU ranges for TLB flush hypercalls") adding the same definition came through different trees. Fix the glitch. Signed-off-by: Vitaly Kuznetsov --- arch/x86/include/uapi/asm/hyperv.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h index 7032f4d8dff3..f65d12504e80 100644 --- a/arch/x86/include/uapi/asm/hyperv.h +++ b/arch/x86/include/uapi/asm/hyperv.h @@ -153,12 +153,6 @@ #define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11) /* - * HV_VP_SET available - */ -#define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11) - - -/* * Crash notification flag. */ #define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63) -- 2.13.5