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

Commit 9c323bff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Three fixes this time around:

   - ensure sparse realises that we're building for a 32-bit arch on
     64-bit hosts.

   - use the correct instruction for semihosting on v7m (nommu) CPUs.

   - reserve address 0 to prevent the first page of memory being used on
     nommu systems"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8704/1: semihosting: use proper instruction on v7m processors
  ARM: 8701/1: fix sparse flags for build on 64bit machines
  ARM: 8700/1: nommu: always reserve address 0 away
parents 545ea16f ee3eaee6

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ endif 
KBUILD_CFLAGS	+=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm

KBUILD_AFLAGS	+=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float



CHECKFLAGS	+= -D__arm__

CHECKFLAGS	+= -D__arm__ -m32



#Default value

head-y		:= arch/arm/kernel/head$(MMUEXT).o

arch/arm/boot/compressed/debug.S

+4 −0
Original line number Diff line number Diff line
@@ -23,7 +23,11 @@ ENTRY(putc) 
	strb	r0, [r1]

	mov	r0, #0x03		@ SYS_WRITEC

   ARM(	svc	#0x123456	)

#ifdef CONFIG_CPU_V7M

 THUMB(	bkpt	#0xab		)

#else

 THUMB(	svc	#0xab		)

#endif

	mov	pc, lr

	.align	2

1:	.word	_GLOBAL_OFFSET_TABLE_ - .

arch/arm/kernel/debug.S

+8 −0
Original line number Diff line number Diff line
@@ -115,7 +115,11 @@ ENTRY(printascii) 
		mov	r1, r0

		mov	r0, #0x04		@ SYS_WRITE0

	ARM(	svc	#0x123456	)

#ifdef CONFIG_CPU_V7M

	THUMB(	bkpt	#0xab		)

#else

	THUMB(	svc	#0xab		)

#endif

		ret	lr

ENDPROC(printascii)
@@ -124,7 +128,11 @@ ENTRY(printch) 
		strb	r0, [r1]

		mov	r0, #0x03		@ SYS_WRITEC

	ARM(	svc	#0x123456	)

#ifdef CONFIG_CPU_V7M

	THUMB(	bkpt	#0xab		)

#else

	THUMB(	svc	#0xab		)

#endif

		ret	lr

ENDPROC(printch)

arch/arm/mm/nommu.c

+5 −0
Original line number Diff line number Diff line
@@ -344,6 +344,11 @@ void __init arm_mm_memblock_reserve(void) 
	 * reserved here.

	 */

#endif

	/*

	 * In any case, always ensure address 0 is never used as many things

	 * get very confused if 0 is returned as a legitimate address.

	 */

	memblock_reserve(0, 1);

}



void __init adjust_lowmem_bounds(void)