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

Commit 9178caf9 authored by Russell King's avatar Russell King
Browse files

Merge branches 'devel-stable' and 'misc' into for-linus

parents b54290e5 5f8d561f

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config ARM 
	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL

arch/arm/boot/compressed/decompress.c

+1 −4
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ 
#include <linux/stddef.h>	/* for NULL */

#include <linux/linkage.h>

#include <asm/string.h>



extern unsigned long free_mem_ptr;

extern unsigned long free_mem_end_ptr;

extern void error(char *);

#include "misc.h"



#define STATIC static

#define STATIC_RW_DATA	/* non-static please */

arch/arm/boot/compressed/misc.c

+6 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ unsigned int __machine_arch_type; 
#include <linux/compiler.h>	/* for inline */

#include <linux/types.h>

#include <linux/linkage.h>

#include "misc.h"



static void putstr(const char *ptr);

extern void error(char *x);



#include CONFIG_UNCOMPRESS_INCLUDE
@@ -167,3 +167,8 @@ decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, 
	else

		putstr(" done, booting the kernel.\n");

}



void fortify_panic(const char *name)

{

	error("detected buffer overflow");

}

arch/arm/boot/compressed/misc.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef MISC_H

#define MISC_H



#include <linux/compiler.h>



void error(char *x) __noreturn;

extern unsigned long free_mem_ptr;

extern unsigned long free_mem_end_ptr;



#endif

arch/arm/mm/proc-v7.S

+11 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ ENDPROC(cpu_pj4b_do_resume) 
__v7_ca5mp_setup:

__v7_ca9mp_setup:

__v7_cr7mp_setup:

__v7_cr8mp_setup:

	mov	r10, #(1 << 0)			@ Cache/TLB ops broadcasting

	b	1f

__v7_ca7mp_setup:
@@ -641,6 +642,16 @@ __v7_cr7mp_proc_info: 
	__v7_proc __v7_cr7mp_proc_info, __v7_cr7mp_setup

	.size	__v7_cr7mp_proc_info, . - __v7_cr7mp_proc_info



	/*

	 * ARM Ltd. Cortex R8 processor.

	 */

	.type	__v7_cr8mp_proc_info, #object

__v7_cr8mp_proc_info:

	.long	0x410fc180

	.long	0xff0ffff0

	__v7_proc __v7_cr8mp_proc_info, __v7_cr8mp_setup

	.size	__v7_cr8mp_proc_info, . - __v7_cr8mp_proc_info



	/*

	 * ARM Ltd. Cortex A7 processor.

	 */