From: Dave Hansen <dave.han...@linux.intel.com>

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 <dave.han...@linux.intel.com>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: x...@kernel.org
Cc: Borislav Petkov <b...@alien8.de>
Cc: Fenghua Yu <fenghua...@intel.com>
Cc: Tim Chen <tim.c.c...@linux.intel.com>
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: */
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to