Commit 0b52a3c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "The biggest two fixes are fixing a compilation error with the
  decompressor, and a problem with our __my_cpu_offset implementation.

  Other changes are very trivial and small, which seems to be the way
  for most -rc stuff."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7747/1: pcpu: ensure __my_cpu_offset cannot be re-ordered across barrier()
  ARM: 7750/1: update legacy CPU ID in decompressor cache support jump table
  ARM: 7743/1: compressed/head.S: work around new binutils warning
  ARM: 7742/1: topology: export cpu_topology
  ARM: 7737/1: fix kernel decompressor compilation error with CONFIG_DEBUG_SEMIHOSTING
parents 6dbda5bf 509eb76e

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) 
endif



ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)

asflags-y := -Wa,-march=all -DZIMAGE

asflags-y := -DZIMAGE



# Supply kernel BSS size to the decompressor via a linker symbol.

KBSS_SZ = $(shell $(CROSS_COMPILE)size $(obj)/../../../../vmlinux | \

arch/arm/boot/compressed/debug.S

+28 −0
Original line number Diff line number Diff line 
#include <linux/linkage.h>

#include <asm/assembler.h>



#ifndef CONFIG_DEBUG_SEMIHOSTING



#include CONFIG_DEBUG_LL_INCLUDE



ENTRY(putc)
@@ -10,3 +12,29 @@ ENTRY(putc) 
	busyuart r3, r1

	mov	 pc, lr

ENDPROC(putc)



#else



ENTRY(putc)

	adr	r1, 1f

	ldmia	r1, {r2, r3}

	add	r2, r2, r1

	ldr	r1, [r2, r3]

	strb	r0, [r1]

	mov	r0, #0x03		@ SYS_WRITEC

   ARM(	svc	#0x123456	)

 THUMB(	svc	#0xab		)

	mov	pc, lr

	.align	2

1:	.word	_GLOBAL_OFFSET_TABLE_ - .

	.word	semi_writec_buf(GOT)

ENDPROC(putc)



	.bss

	.global	semi_writec_buf

	.type   semi_writec_buf, %object

semi_writec_buf:

	.space	4

	.size	semi_writec_buf, 4



#endif

arch/arm/boot/compressed/head-sa1100.S

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <asm/mach-types.h>



		.section        ".start", "ax"

		.arch	armv4



__SA1100_start:

arch/arm/boot/compressed/head-shark.S

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
	

		.section	".start", "ax"



		.arch armv4

		b	__beginning

	

__ofw_data:	.long	0				@ the number of memory blocks

arch/arm/boot/compressed/head.S

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/linkage.h>

#include <asm/assembler.h>



	.arch	armv7-a

/*

 * Debugging stuff

 *
@@ -805,8 +806,8 @@ call_cache_fn: adr r12, proc_types 
		.align	2

		.type	proc_types,#object

proc_types:

		.word	0x00000000		@ old ARM ID

		.word	0x0000f000

		.word	0x41000000		@ old ARM ID

		.word	0xff00f000

		mov	pc, lr

 THUMB(		nop				)

		mov	pc, lr

CRA Git | Maintained and supported by SUSTech CRA and CCSE