Commit 4d7eaa12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM fixes from Russell King:
 "A number of ARM updates for -rc, covering mostly ARM specific code,
  but with one change to modpost.c to allow Thumb section mismatches to
  be detected.

  ARM changes include reporting when an attempt is made to boot a LPAE
  kernel on hardware which does not support LPAE, rather than just being
  silent about it.

  A number of other minor fixes are included too"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 7992/1: boot: compressed: ignore bswapsdi2.S
  ARM: 7991/1: sa1100: fix compile problem on Collie
  ARM: fix noMMU kallsyms symbol filtering
  ARM: 7980/1: kernel: improve error message when LPAE config doesn't match CPU
  ARM: 7964/1: Detect section mismatches in thumb relocations
  ARM: 7963/1: mm: report both sections from PMD
parents 95648c0e 38e0b088

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1578,6 +1578,7 @@ config BL_SWITCHER_DUMMY_IF 


choice

	prompt "Memory split"

	depends on MMU

	default VMSPLIT_3G

	help

	  Select the desired split between kernel and user memory.
@@ -1595,6 +1596,7 @@ endchoice 


config PAGE_OFFSET

	hex

	default PHYS_OFFSET if !MMU

	default 0x40000000 if VMSPLIT_1G

	default 0x80000000 if VMSPLIT_2G

	default 0xC0000000

arch/arm/boot/compressed/.gitignore

+1 −0
Original line number Diff line number Diff line 
ashldi3.S

bswapsdi2.S

font.c

lib1funcs.S

hyp-stub.S

arch/arm/include/asm/memory.h

+3 −6
Original line number Diff line number Diff line
@@ -30,14 +30,15 @@ 
 */

#define UL(x) _AC(x, UL)



/* PAGE_OFFSET - the virtual address of the start of the kernel image */

#define PAGE_OFFSET		UL(CONFIG_PAGE_OFFSET)



#ifdef CONFIG_MMU



/*

 * PAGE_OFFSET - the virtual address of the start of the kernel image

 * TASK_SIZE - the maximum size of a user space task.

 * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area

 */

#define PAGE_OFFSET		UL(CONFIG_PAGE_OFFSET)

#define TASK_SIZE		(UL(CONFIG_PAGE_OFFSET) - UL(SZ_16M))

#define TASK_UNMAPPED_BASE	ALIGN(TASK_SIZE / 3, SZ_16M)
@@ -104,10 +105,6 @@ 
#define END_MEM     		(UL(CONFIG_DRAM_BASE) + CONFIG_DRAM_SIZE)

#endif



#ifndef PAGE_OFFSET

#define PAGE_OFFSET		PLAT_PHYS_OFFSET

#endif



/*

 * The module can be at any place in ram in nommu mode.

 */

arch/arm/kernel/head-common.S

+12 −0
Original line number Diff line number Diff line
@@ -177,6 +177,18 @@ __lookup_processor_type_data: 
	.long	__proc_info_end

	.size	__lookup_processor_type_data, . - __lookup_processor_type_data



__error_lpae:

#ifdef CONFIG_DEBUG_LL

	adr	r0, str_lpae

	bl 	printascii

	b	__error

str_lpae: .asciz "\nError: Kernel with LPAE support, but CPU does not support LPAE.\n"

#else

	b	__error

#endif

	.align

ENDPROC(__error_lpae)



__error_p:

#ifdef CONFIG_DEBUG_LL

	adr	r0, str_p1

arch/arm/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ ENTRY(stext) 
	and	r3, r3, #0xf			@ extract VMSA support

	cmp	r3, #5				@ long-descriptor translation table format?

 THUMB( it	lo )				@ force fixup-able long branch encoding

	blo	__error_p			@ only classic page table format

	blo	__error_lpae			@ only classic page table format

#endif



#ifndef CONFIG_XIP_KERNEL

CRA Git | Maintained and supported by SUSTech CRA and CCSE