Loading arch/x86/boot/compressed/head_64.S +1 −1 Original line number Diff line number Diff line Loading @@ -174,7 +174,7 @@ no_longmode: hlt jmp 1b #include "../../../x86_64/kernel/verify_cpu_64.S" #include "../../kernel/verify_cpu_64.S" /* Be careful here startup_64 needs to be at a predictable * address so I can export it in an ELF header. Bootloaders Loading arch/x86/kernel/Makefile +1 −1 Original line number Diff line number Diff line ifeq ($(CONFIG_X86_32),y) include ${srctree}/arch/x86/kernel/Makefile_32 else include ${srctree}/arch/x86_64/kernel/Makefile_64 include ${srctree}/arch/x86/kernel/Makefile_64 endif arch/x86/kernel/Makefile_32 +0 −2 Original line number Diff line number Diff line Loading @@ -83,6 +83,4 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \ $(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note_32.o FORCE $(call if_changed,syscall) k8-y += ../../x86_64/kernel/k8.o stacktrace-y += ../../x86_64/kernel/stacktrace.o arch/x86_64/kernel/Makefile_64→arch/x86/kernel/Makefile_64 +0 −9 Original line number Diff line number Diff line Loading @@ -49,15 +49,6 @@ obj-y += pcspeaker.o CFLAGS_vsyscall_64.o := $(PROFILING) -g0 therm_throt-y += ../../x86/kernel/cpu/mcheck/therm_throt.o bootflag-y += ../../x86/kernel/bootflag.o cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../x86/kernel/cpuid.o topology-y += ../../x86/kernel/topology.o microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../x86/kernel/microcode.o intel_cacheinfo-y += ../../x86/kernel/cpu/intel_cacheinfo.o addon_cpuid_features-y += ../../x86/kernel/cpu/addon_cpuid_features.o quirks-y += ../../x86/kernel/quirks.o i8237-y += ../../x86/kernel/i8237.o msr-$(subst m,y,$(CONFIG_X86_MSR)) += ../../x86/kernel/msr.o alternative-y += ../../x86/kernel/alternative.o pcspeaker-y += ../../x86/kernel/pcspeaker.o perfctr-watchdog-y += ../../x86/kernel/cpu/perfctr-watchdog.o arch/x86/kernel/acpi/wakeup_64.S +1 −1 Original line number Diff line number Diff line Loading @@ -269,7 +269,7 @@ no_longmode: movb $0xbc,%al ; outb %al,$0x80 jmp no_longmode #include "../../../x86_64/kernel/verify_cpu_64.S" #include "../verify_cpu_64.S" /* This code uses an extended set of video mode numbers. These include: * Aliases for standard modes Loading Loading
arch/x86/boot/compressed/head_64.S +1 −1 Original line number Diff line number Diff line Loading @@ -174,7 +174,7 @@ no_longmode: hlt jmp 1b #include "../../../x86_64/kernel/verify_cpu_64.S" #include "../../kernel/verify_cpu_64.S" /* Be careful here startup_64 needs to be at a predictable * address so I can export it in an ELF header. Bootloaders Loading
arch/x86/kernel/Makefile +1 −1 Original line number Diff line number Diff line ifeq ($(CONFIG_X86_32),y) include ${srctree}/arch/x86/kernel/Makefile_32 else include ${srctree}/arch/x86_64/kernel/Makefile_64 include ${srctree}/arch/x86/kernel/Makefile_64 endif
arch/x86/kernel/Makefile_32 +0 −2 Original line number Diff line number Diff line Loading @@ -83,6 +83,4 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \ $(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note_32.o FORCE $(call if_changed,syscall) k8-y += ../../x86_64/kernel/k8.o stacktrace-y += ../../x86_64/kernel/stacktrace.o
arch/x86_64/kernel/Makefile_64→arch/x86/kernel/Makefile_64 +0 −9 Original line number Diff line number Diff line Loading @@ -49,15 +49,6 @@ obj-y += pcspeaker.o CFLAGS_vsyscall_64.o := $(PROFILING) -g0 therm_throt-y += ../../x86/kernel/cpu/mcheck/therm_throt.o bootflag-y += ../../x86/kernel/bootflag.o cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../x86/kernel/cpuid.o topology-y += ../../x86/kernel/topology.o microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../x86/kernel/microcode.o intel_cacheinfo-y += ../../x86/kernel/cpu/intel_cacheinfo.o addon_cpuid_features-y += ../../x86/kernel/cpu/addon_cpuid_features.o quirks-y += ../../x86/kernel/quirks.o i8237-y += ../../x86/kernel/i8237.o msr-$(subst m,y,$(CONFIG_X86_MSR)) += ../../x86/kernel/msr.o alternative-y += ../../x86/kernel/alternative.o pcspeaker-y += ../../x86/kernel/pcspeaker.o perfctr-watchdog-y += ../../x86/kernel/cpu/perfctr-watchdog.o
arch/x86/kernel/acpi/wakeup_64.S +1 −1 Original line number Diff line number Diff line Loading @@ -269,7 +269,7 @@ no_longmode: movb $0xbc,%al ; outb %al,$0x80 jmp no_longmode #include "../../../x86_64/kernel/verify_cpu_64.S" #include "../verify_cpu_64.S" /* This code uses an extended set of video mode numbers. These include: * Aliases for standard modes Loading