diff --git a/arch/x86/kernel/fpu/Makefile b/arch/x86/kernel/fpu/Makefile
index 2020a2b7a597b..6ae59bccdd2f2 100644
--- a/arch/x86/kernel/fpu/Makefile
+++ b/arch/x86/kernel/fpu/Makefile
@@ -2,4 +2,4 @@
 # Build rules for the FPU support code:
 #
 
-obj-y				+= init.o bugs.o core.o xsave.o
+obj-y				+= init.o bugs.o core.o xstate.o
diff --git a/arch/x86/kernel/fpu/xsave.c b/arch/x86/kernel/fpu/xstate.c
similarity index 100%
rename from arch/x86/kernel/fpu/xsave.c
rename to arch/x86/kernel/fpu/xstate.c