From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754811AbbINMWt (ORCPT ); Mon, 14 Sep 2015 08:22:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35073 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753942AbbINMWq (ORCPT ); Mon, 14 Sep 2015 08:22:46 -0400 Date: Mon, 14 Sep 2015 05:21:29 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: mingo@kernel.org, tim.c.chen@linux.intel.com, torvalds@linux-foundation.org, luto@amacapital.net, hpa@zytor.com, bp@alien8.de, tglx@linutronix.de, brgerst@gmail.com, dvlasenk@redhat.com, fenghua.yu@intel.com, peterz@infradead.org, linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com Reply-To: torvalds@linux-foundation.org, tim.c.chen@linux.intel.com, mingo@kernel.org, hpa@zytor.com, luto@amacapital.net, bp@alien8.de, tglx@linutronix.de, brgerst@gmail.com, dvlasenk@redhat.com, fenghua.yu@intel.com, peterz@infradead.org, linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com In-Reply-To: <20150902233127.A541448F@viggo.jf.intel.com> References: <20150902233127.A541448F@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu: Rename XFEATURES_NR_MAX Git-Commit-ID: dad8c4fe8530f28dde73dadd1d588e3aaa507562 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: dad8c4fe8530f28dde73dadd1d588e3aaa507562 Gitweb: http://git.kernel.org/tip/dad8c4fe8530f28dde73dadd1d588e3aaa507562 Author: Dave Hansen AuthorDate: Wed, 2 Sep 2015 16:31:27 -0700 Committer: Ingo Molnar CommitDate: Mon, 14 Sep 2015 12:21:57 +0200 x86/fpu: Rename XFEATURES_NR_MAX 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: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tim Chen Cc: dave@sr71.net Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/20150902233127.A541448F@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/fpu/types.h | 2 +- arch/x86/kernel/fpu/xstate.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/fpu/types.h b/arch/x86/include/asm/fpu/types.h index 9f20d10..8764df3 100644 --- a/arch/x86/include/asm/fpu/types.h +++ b/arch/x86/include/asm/fpu/types.h @@ -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 --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index d6f0be9..f94e236 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -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: */