diff options
| author | Russell King | 2011-01-06 23:32:52 +0100 |
|---|---|---|
| committer | Russell King | 2011-01-06 23:32:52 +0100 |
| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch) | |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/arm/kernel/vmlinux.lds.S | |
| parent | Merge branch 'clksrc' into devel (diff) | |
| parent | Merge branch 'smp' into misc (diff) | |
| download | kernel-qcow2-linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.tar.gz kernel-qcow2-linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.tar.xz kernel-qcow2-linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.zip | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 897c1a8f1694..86b66f3f2031 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -168,6 +168,7 @@ SECTIONS NOSAVE_DATA CACHELINE_ALIGNED_DATA(32) + READ_MOSTLY_DATA(32) /* * The exception fixup table (might need resorting at runtime) |