1 files changed, 6 insertions, 4 deletions

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index f76e75548670..43a31fb06318 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -4,11 +4,13 @@
  */
 
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/cache.h>
 #include <asm/thread_info.h>
 #include <asm/memory.h>
 #include <asm/page.h>
         
 #define PROC_INFO                                                       \
+        . = ALIGN(4);                                                   \
         VMLINUX_SYMBOL(__proc_info_begin) = .;                          \
         *(.proc.info.init)                                              \
         VMLINUX_SYMBOL(__proc_info_end) = .;
@@ -181,7 +183,7 @@ SECTIONS
         }
 #endif
 
-        PERCPU_SECTION(32)
+        PERCPU_SECTION(L1_CACHE_BYTES)
 
 #ifdef CONFIG_XIP_KERNEL
         __data_loc = ALIGN(4);          /* location in binary */
@@ -212,13 +214,13 @@ SECTIONS
 #endif
 
                 NOSAVE_DATA
-                CACHELINE_ALIGNED_DATA(32)
-                READ_MOSTLY_DATA(32)
+                CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
+                READ_MOSTLY_DATA(L1_CACHE_BYTES)
 
                 /*
                  * The exception fixup table (might need resorting at runtime)
                  */
-                . = ALIGN(32);
+                . = ALIGN(4);
                 __start___ex_table = .;
 #ifdef CONFIG_MMU
                 *(__ex_table)