From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756045AbbHaWdE (ORCPT ); Mon, 31 Aug 2015 18:33:04 -0400 Received: from mga09.intel.com ([134.134.136.24]:23073 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755313AbbHaWUy (ORCPT ); Mon, 31 Aug 2015 18:20:54 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,444,1437462000"; d="scan'208";a="759471224" Subject: [PATCH 06/15] x86, fpu: rename XFEATURES_NR_MAX To: dave@sr71.net Cc: dave.hansen@linux.intel.com, mingo@redhat.com, x86@kernel.org, bp@alien8.de, fenghua.yu@intel.com, tim.c.chen@linux.intel.com, linux-kernel@vger.kernel.org From: Dave Hansen Date: Mon, 31 Aug 2015 15:20:53 -0700 References: <20150831222051.3D1897BF@viggo.jf.intel.com> In-Reply-To: <20150831222051.3D1897BF@viggo.jf.intel.com> Message-Id: <20150831222053.CBBF8821@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen This is a logcal followon to the last patch. It makes the XFEATURE_MAX naming consistent with the other enum values. This is what Ingo suggested. Signed-off-by: Dave Hansen Cc: Ingo Molnar Cc: x86@kernel.org Cc: Borislav Petkov Cc: Fenghua Yu Cc: Tim Chen Cc: linux-kernel@vger.kernel.org --- b/arch/x86/include/asm/fpu/types.h | 2 +- b/arch/x86/kernel/fpu/xstate.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/x86/include/asm/fpu/types.h~rename-XFEATURES_NR_MAX arch/x86/include/asm/fpu/types.h --- a/arch/x86/include/asm/fpu/types.h~rename-XFEATURES_NR_MAX 2015-08-31 15:17:33.710851053 -0700 +++ b/arch/x86/include/asm/fpu/types.h 2015-08-31 15:17:33.714851236 -0700 @@ -109,7 +109,7 @@ enum xfeature { XFEATURE_ZMM_Hi256, XFEATURE_Hi16_ZMM, - XFEATURES_NR_MAX, + XFEATURE_MAX, }; #define XFEATURE_MASK_FP (1 << XFEATURE_FP) diff -puN arch/x86/kernel/fpu/xstate.c~rename-XFEATURES_NR_MAX arch/x86/kernel/fpu/xstate.c --- a/arch/x86/kernel/fpu/xstate.c~rename-XFEATURES_NR_MAX 2015-08-31 15:17:33.711851099 -0700 +++ b/arch/x86/kernel/fpu/xstate.c 2015-08-31 15:17:33.715851281 -0700 @@ -31,8 +31,8 @@ static const char *xfeature_names[] = */ u64 xfeatures_mask __read_mostly; -static unsigned int xstate_offsets[XFEATURES_NR_MAX] = { [ 0 ... XFEATURES_NR_MAX - 1] = -1}; -static unsigned int xstate_sizes[XFEATURES_NR_MAX] = { [ 0 ... XFEATURES_NR_MAX - 1] = -1}; +static unsigned int xstate_offsets[XFEATURE_MAX] = { [ 0 ... XFEATURE_MAX - 1] = -1}; +static unsigned int xstate_sizes[XFEATURE_MAX] = { [ 0 ... XFEATURE_MAX - 1] = -1}; static unsigned int xstate_comp_offsets[sizeof(xfeatures_mask)*8]; /* The number of supported xfeatures in xfeatures_mask: */ _