tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] nommu: trivial fixups for head-nommu.S and the Makefile

This patch fix compilation problem of start-up codes.
(head-nommu.S, arch/arm/kernel/Makefile)

Signed-off-by: Hyok S. Choi <hyok.choi@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Hyok S. Choi and committed by Russell King 3b920cef 6b426e78

+4 -2
unified split
+1 -1
arch/arm/kernel/Makefile
··· 29 obj-y += io.o 30 endif 31 32 - head-y := head.o 33 obj-$(CONFIG_DEBUG_LL) += debug.o 34 35 extra-y := $(head-y) init_task.o vmlinux.lds
··· 29 obj-y += io.o 30 endif 31 32 + head-y := head$(MMUEXT).o 33 obj-$(CONFIG_DEBUG_LL) += debug.o 34 35 extra-y := $(head-y) init_task.o vmlinux.lds
+3 -1
arch/arm/kernel/head-nommu.S
··· 20 #include <asm/mach-types.h> 21 #include <asm/procinfo.h> 22 #include <asm/ptrace.h> 23 - #include <asm/constants.h> 24 #include <asm/system.h> 25 26 #define PROCINFO_INITFUNC 12 27 28 /* 29 * Kernel startup entry point. ··· 80 81 mov pc, r13 @ clear the BSS and jump 82 @ to start_kernel 83 84 #include "head-common.S"
··· 20 #include <asm/mach-types.h> 21 #include <asm/procinfo.h> 22 #include <asm/ptrace.h> 23 + #include <asm/thread_info.h> 24 #include <asm/system.h> 25 26 #define PROCINFO_INITFUNC 12 27 + #define MACHINFO_TYPE 0 28 29 /* 30 * Kernel startup entry point. ··· 79 80 mov pc, r13 @ clear the BSS and jump 81 @ to start_kernel 82 + .ltorg 83 84 #include "head-common.S"