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

Commit f13d241b authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge nommu tree

parents 928bd1b4 3b920cef

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ifneq ($(CONFIG_ARCH_EBSA110),y) 
  obj-y		+= io.o

endif



head-y			:= head.o

head-y			:= head$(MMUEXT).o

obj-$(CONFIG_DEBUG_LL)	+= debug.o



extra-y := $(head-y) init_task.o vmlinux.lds

arch/arm/kernel/head-nommu.S

+3 −1
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ 
#include <asm/mach-types.h>

#include <asm/procinfo.h>

#include <asm/ptrace.h>

#include <asm/constants.h>

#include <asm/thread_info.h>

#include <asm/system.h>



#define PROCINFO_INITFUNC       12

#define MACHINFO_TYPE		0



/*

 * Kernel startup entry point.
@@ -79,5 +80,6 @@ __after_proc_init: 


	mov	pc, r13				@ clear the BSS and jump

						@ to start_kernel

	.ltorg



#include "head-common.S"