Skip to content

L
linux-davinci
Commit f13d241b authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

Merge nommu tree

parents 928bd1b4 3b920cef
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
arch/arm/kernel/Makefile
View file @ f13d241b
...@@ -29,7 +29,7 @@ ifneq ($(CONFIG_ARCH_EBSA110),y) ...@@ -29,7 +29,7 @@ ifneq ($(CONFIG_ARCH_EBSA110),y)
obj-y += io.o obj-y += io.o
endif endif
head-y := head.o head-y := head$(MMUEXT).o
obj-$(CONFIG_DEBUG_LL) += debug.o obj-$(CONFIG_DEBUG_LL) += debug.o
extra-y := $(head-y) init_task.o vmlinux.lds extra-y := $(head-y) init_task.o vmlinux.lds
arch/arm/kernel/head-nommu.S
View file @ f13d241b
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/constants.h> #include <asm/thread_info.h>
#include <asm/system.h> #include <asm/system.h>
#define PROCINFO_INITFUNC 12 #define PROCINFO_INITFUNC 12
#define MACHINFO_TYPE 0
/* /*
* Kernel startup entry point. * Kernel startup entry point.
...@@ -79,5 +80,6 @@ __after_proc_init: ...@@ -79,5 +80,6 @@ __after_proc_init:
mov pc, r13 @ clear the BSS and jump mov pc, r13 @ clear the BSS and jump
@ to start_kernel @ to start_kernel
.ltorg
#include "head-common.S" #include "head-common.S"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment