korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 08:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Russell King 2018-04-09 10:08:51 +01:00
commit 9178caf964
5 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -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

5
arch/arm/boot/compressed/decompress.c
View File

@ -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 */

7
arch/arm/boot/compressed/misc.c
View File

@ -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");
}

10
arch/arm/boot/compressed/misc.h Normal file
View File

@ -0,0 +1,10 @@
#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

11
arch/arm/mm/proc-v7.S
View File

@ -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.
*/