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

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 9c323bff 545ea16f

+18 -1
+1 -1
arch/arm/Makefile
··· 131 131 KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm 132 132 KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float 133 133 134 - CHECKFLAGS += -D__arm__ 134 + CHECKFLAGS += -D__arm__ -m32 135 135 136 136 #Default value 137 137 head-y := arch/arm/kernel/head$(MMUEXT).o
+4
arch/arm/boot/compressed/debug.S
··· 23 23 strb r0, [r1] 24 24 mov r0, #0x03 @ SYS_WRITEC 25 25 ARM( svc #0x123456 ) 26 + #ifdef CONFIG_CPU_V7M 27 + THUMB( bkpt #0xab ) 28 + #else 26 29 THUMB( svc #0xab ) 30 + #endif 27 31 mov pc, lr 28 32 .align 2 29 33 1: .word _GLOBAL_OFFSET_TABLE_ - .
+8
arch/arm/kernel/debug.S
··· 115 115 mov r1, r0 116 116 mov r0, #0x04 @ SYS_WRITE0 117 117 ARM( svc #0x123456 ) 118 + #ifdef CONFIG_CPU_V7M 119 + THUMB( bkpt #0xab ) 120 + #else 118 121 THUMB( svc #0xab ) 122 + #endif 119 123 ret lr 120 124 ENDPROC(printascii) 121 125 ··· 128 124 strb r0, [r1] 129 125 mov r0, #0x03 @ SYS_WRITEC 130 126 ARM( svc #0x123456 ) 127 + #ifdef CONFIG_CPU_V7M 128 + THUMB( bkpt #0xab ) 129 + #else 131 130 THUMB( svc #0xab ) 131 + #endif 132 132 ret lr 133 133 ENDPROC(printch) 134 134
+5
arch/arm/mm/nommu.c
··· 344 344 * reserved here. 345 345 */ 346 346 #endif 347 + /* 348 + * In any case, always ensure address 0 is never used as many things 349 + * get very confused if 0 is returned as a legitimate address. 350 + */ 351 + memblock_reserve(0, 1); 347 352 } 348 353 349 354 void __init adjust_lowmem_bounds(void)