Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
9178caf9
Commit
9178caf9
authored
Apr 09, 2018
by
Russell King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'devel-stable' and 'misc' into for-linus
parents
b54290e5
5f8d561f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
5 deletions
+29
-5
arch/arm/Kconfig
arch/arm/Kconfig
+1
-0
arch/arm/boot/compressed/decompress.c
arch/arm/boot/compressed/decompress.c
+1
-4
arch/arm/boot/compressed/misc.c
arch/arm/boot/compressed/misc.c
+6
-1
arch/arm/boot/compressed/misc.h
arch/arm/boot/compressed/misc.h
+10
-0
arch/arm/mm/proc-v7.S
arch/arm/mm/proc-v7.S
+11
-0
No files found.
arch/arm/Kconfig
View file @
9178caf9
...
@@ -7,6 +7,7 @@ config ARM
...
@@ -7,6 +7,7 @@ config ARM
select ARCH_HAS_DEBUG_VIRTUAL if MMU
select ARCH_HAS_DEBUG_VIRTUAL if MMU
select ARCH_HAS_DEVMEM_IS_ALLOWED
select ARCH_HAS_DEVMEM_IS_ALLOWED
select ARCH_HAS_ELF_RANDOMIZE
select ARCH_HAS_ELF_RANDOMIZE
select ARCH_HAS_FORTIFY_SOURCE
select ARCH_HAS_SET_MEMORY
select ARCH_HAS_SET_MEMORY
select ARCH_HAS_PHYS_TO_DMA
select ARCH_HAS_PHYS_TO_DMA
select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL
select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL
...
...
arch/arm/boot/compressed/decompress.c
View file @
9178caf9
...
@@ -6,10 +6,7 @@
...
@@ -6,10 +6,7 @@
#include <linux/stddef.h>
/* for NULL */
#include <linux/stddef.h>
/* for NULL */
#include <linux/linkage.h>
#include <linux/linkage.h>
#include <asm/string.h>
#include <asm/string.h>
#include "misc.h"
extern
unsigned
long
free_mem_ptr
;
extern
unsigned
long
free_mem_end_ptr
;
extern
void
error
(
char
*
);
#define STATIC static
#define STATIC static
#define STATIC_RW_DATA
/* non-static please */
#define STATIC_RW_DATA
/* non-static please */
...
...
arch/arm/boot/compressed/misc.c
View file @
9178caf9
...
@@ -22,9 +22,9 @@ unsigned int __machine_arch_type;
...
@@ -22,9 +22,9 @@ unsigned int __machine_arch_type;
#include <linux/compiler.h>
/* for inline */
#include <linux/compiler.h>
/* for inline */
#include <linux/types.h>
#include <linux/types.h>
#include <linux/linkage.h>
#include <linux/linkage.h>
#include "misc.h"
static
void
putstr
(
const
char
*
ptr
);
static
void
putstr
(
const
char
*
ptr
);
extern
void
error
(
char
*
x
);
#include CONFIG_UNCOMPRESS_INCLUDE
#include CONFIG_UNCOMPRESS_INCLUDE
...
@@ -167,3 +167,8 @@ decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
...
@@ -167,3 +167,8 @@ decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
else
else
putstr
(
" done, booting the kernel.
\n
"
);
putstr
(
" done, booting the kernel.
\n
"
);
}
}
void
fortify_panic
(
const
char
*
name
)
{
error
(
"detected buffer overflow"
);
}
arch/arm/boot/compressed/misc.h
0 → 100644
View file @
9178caf9
#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
View file @
9178caf9
...
@@ -272,6 +272,7 @@ ENDPROC(cpu_pj4b_do_resume)
...
@@ -272,6 +272,7 @@ ENDPROC(cpu_pj4b_do_resume)
__v7_ca5mp_setup
:
__v7_ca5mp_setup
:
__v7_ca9mp_setup
:
__v7_ca9mp_setup
:
__v7_cr7mp_setup
:
__v7_cr7mp_setup
:
__v7_cr8mp_setup
:
mov
r10
,
#(
1
<<
0
)
@
Cache
/
TLB
ops
broadcasting
mov
r10
,
#(
1
<<
0
)
@
Cache
/
TLB
ops
broadcasting
b
1
f
b
1
f
__v7_ca7mp_setup
:
__v7_ca7mp_setup
:
...
@@ -641,6 +642,16 @@ __v7_cr7mp_proc_info:
...
@@ -641,6 +642,16 @@ __v7_cr7mp_proc_info:
__v7_proc
__v7_cr7mp_proc_info
,
__v7_cr7mp_setup
__v7_proc
__v7_cr7mp_proc_info
,
__v7_cr7mp_setup
.
size
__v7_cr7mp_proc_info
,
.
-
__v7_cr7mp_proc_info
.
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
.
*
ARM
Ltd
.
Cortex
A7
processor
.
*/
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment