diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-05 06:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-05 06:44:25 -0400 |
| commit | c90a9bb9073a4096596360f02ea711c619663494 (patch) | |
| tree | dc85d9f4c0d423e6b523e81c41a5b68e267de14f /arch/arm/kernel/vmlinux.lds.S | |
| parent | 23c342153ef2a4ad8bd4f2d6515126449658d2b3 (diff) | |
| parent | 9e85a6f9dc231f3ed3c1dc1b12217505d970142a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 43a31fb06318..36ff15bbfdd4 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -183,7 +183,9 @@ SECTIONS | |||
| 183 | } | 183 | } |
| 184 | #endif | 184 | #endif |
| 185 | 185 | ||
| 186 | #ifdef CONFIG_SMP | ||
| 186 | PERCPU_SECTION(L1_CACHE_BYTES) | 187 | PERCPU_SECTION(L1_CACHE_BYTES) |
| 188 | #endif | ||
| 187 | 189 | ||
| 188 | #ifdef CONFIG_XIP_KERNEL | 190 | #ifdef CONFIG_XIP_KERNEL |
| 189 | __data_loc = ALIGN(4); /* location in binary */ | 191 | __data_loc = ALIGN(4); /* location in binary */ |