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

Commit 5b3fcfed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm 

* 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm:
  ARM: sa11x0: assabet: fix build warning
  ARM: Add arm_memblock_steal() to allocate memory away from the kernel
  ARM: 7275/1: LPAE: Check the CPU support for the long descriptor format
  ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97
  ARM: 7272/1: S3C24XX: Fix build error for missing <mach/system-reset.h>
  ARM: 7271/1: Fix typo in conversion of ARCH_NR_GPIOS to Kconfig
parents a12587b0 a61c2332

arch/arm/include/asm/gpio.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define _ARCH_ARM_GPIO_H



#if CONFIG_ARCH_NR_GPIO > 0

#define ARCH_NR_GPIO CONFIG_ARCH_NR_GPIO

#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO

#endif



/* not all ARM platforms necessarily support this API ... */

arch/arm/include/asm/memblock.h

+2 −0
Original line number Diff line number Diff line
@@ -6,4 +6,6 @@ struct machine_desc; 


extern void arm_memblock_init(struct meminfo *, struct machine_desc *);



phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align);



#endif

arch/arm/kernel/head.S

+8 −0
Original line number Diff line number Diff line
@@ -99,6 +99,14 @@ ENTRY(stext) 
 THUMB( it	eq )		@ force fixup-able long branch encoding

	beq	__error_p			@ yes, error 'p'



#ifdef CONFIG_ARM_LPAE

	mrc	p15, 0, r3, c0, c1, 4		@ read ID_MMFR0

	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

#endif



#ifndef CONFIG_XIP_KERNEL

	adr	r3, 2f

	ldmia	r3, {r4, r8}

arch/arm/mach-imx/mach-mx31_3ds.c

+2 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/mach/time.h>

#include <asm/memory.h>

#include <asm/mach/map.h>

#include <asm/memblock.h>

#include <mach/common.h>

#include <mach/iomux-mx3.h>

#include <mach/3ds_debugboard.h>
@@ -754,10 +755,8 @@ static struct sys_timer mx31_3ds_timer = { 
static void __init mx31_3ds_reserve(void)

{

	/* reserve MX31_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */

	mx3_camera_base = memblock_alloc(MX31_3DS_CAMERA_BUF_SIZE,

	mx3_camera_base = arm_memblock_steal(MX31_3DS_CAMERA_BUF_SIZE,

					 MX31_3DS_CAMERA_BUF_SIZE);

	memblock_free(mx3_camera_base, MX31_3DS_CAMERA_BUF_SIZE);

	memblock_remove(mx3_camera_base, MX31_3DS_CAMERA_BUF_SIZE);

}



MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")

arch/arm/mach-imx/mach-mx31moboard.c

+2 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/mach/map.h>

#include <asm/memblock.h>

#include <mach/board-mx31moboard.h>

#include <mach/common.h>

#include <mach/hardware.h>
@@ -584,10 +585,8 @@ struct sys_timer mx31moboard_timer = { 
static void __init mx31moboard_reserve(void)

{

	/* reserve 4 MiB for mx3-camera */

	mx3_camera_base = memblock_alloc(MX3_CAMERA_BUF_SIZE,

	mx3_camera_base = arm_memblock_steal(MX3_CAMERA_BUF_SIZE,

			MX3_CAMERA_BUF_SIZE);

	memblock_free(mx3_camera_base, MX3_CAMERA_BUF_SIZE);

	memblock_remove(mx3_camera_base, MX3_CAMERA_BUF_SIZE);

}



MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")