xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'arnd-fixes', 'clk', 'misc', 'v7' and 'fixes' into for-next

Browse Source
This commit is contained in:
Russell King
2015-06-12 21:18:08 +01:00
parent 6fb18ac936 079ed3681d ec3bd0e68a c76f238e26 0bbe6b5a73
commit 9de44aa4dc
74 changed files with 1102 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/include/asm/smp.h
View File

@@ -61,7 +61,7 @@ asmlinkage void secondary_start_kernel(void);
struct secondary_data {
union {
unsigned long mpu_rgn_szr;
unsigned long pgdir;
u64 pgdir;
};
unsigned long swapper_pg_dir;
void *stack;
@@ -69,6 +69,7 @@ struct secondary_data {
extern struct secondary_data secondary_data;
extern volatile int pen_release;
extern void secondary_startup(void);
extern void secondary_startup_arm(void);
extern int __cpu_disable(void);