Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5017cfa authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: use cpu/common.c on 64 bit 



Use cpu/common.c on both 64-bit and 32-bit and remove cpu/common_64.c.

We started out with this linecount:

  816  arch/x86/kernel/cpu/common_64.c
  805  arch/x86/kernel/cpu/common.c

and the resulting common.c is 1197 lines long, so there's already
424 lines of code eliminated in this phase of the unification.

Signed-off-by: default avatarYinghai <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 143b604a

arch/x86/kernel/cpu/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
#



obj-y			:= intel_cacheinfo.o addon_cpuid_features.o

obj-y			+= proc.o capflags.o powerflags.o

obj-y			+= proc.o capflags.o powerflags.o common.o



obj-$(CONFIG_X86_32)	+= common.o bugs.o cmpxchg.o

obj-$(CONFIG_X86_64)	+= common_64.o bugs_64.o

obj-$(CONFIG_X86_32)	+= bugs.o cmpxchg.o

obj-$(CONFIG_X86_64)	+= bugs_64.o



obj-$(CONFIG_CPU_SUP_INTEL_32)		+= intel.o

obj-$(CONFIG_CPU_SUP_INTEL_64)		+= intel_64.o

arch/x86/kernel/cpu/common_64.c

deleted100644 → 0
+0 −1197

File deleted.

Preview size limit exceeded, changes collapsed.