projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/intel-iommu
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mm
/
proc-arm1022.S
diff --git
a/arch/arm/mm/proc-arm1022.S
b/arch/arm/mm/proc-arm1022.S
index a126b7a5992809c93e911a7c875359b68c591085..dbb2413fe04dbd5babcd7dad8f41820448d518dc 100644
(file)
--- a/
arch/arm/mm/proc-arm1022.S
+++ b/
arch/arm/mm/proc-arm1022.S
@@
-448,7
+448,7
@@
arm1022_crval:
.align
.align
- .section ".proc.info.init", #alloc
, #execinstr
+ .section ".proc.info.init", #alloc
.type __arm1022_proc_info,#object
__arm1022_proc_info:
.type __arm1022_proc_info,#object
__arm1022_proc_info:
@@
-462,7
+462,7
@@
__arm1022_proc_info:
PMD_BIT4 | \
PMD_SECT_AP_WRITE | \
PMD_SECT_AP_READ
PMD_BIT4 | \
PMD_SECT_AP_WRITE | \
PMD_SECT_AP_READ
- b __arm1022_setup
+ initfn __arm1022_setup, __arm1022_proc_info
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_EDSP
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_EDSP