diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 08:45:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 08:45:53 -0700 |
| commit | 9fe9293d14e8418f29136216f0180f47270a916a (patch) | |
| tree | 62e4efbb4833940a6eafd98d950275c5b3f08c66 /arch/m68knommu/kernel/vmlinux.lds.S | |
| parent | a4277bf122e907e4fec509fc0bd9bf5fde30b14e (diff) | |
| parent | 64f68416e794d59a42ddffdf1c5b7f026a4f23d5 (diff) | |
| download | talos-op-linux-9fe9293d14e8418f29136216f0180f47270a916a.tar.gz talos-op-linux-9fe9293d14e8418f29136216f0180f47270a916a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: update the default config for the ColdFire 5407C3 board
m68knommu: update the default config for the ColdFire 5307C3 board
m68knommu: update the default config for the ColdFire 5257EVB board
m68knommu: update the default config for the ColdFire 5249EVB.
m68knommu: add a defconfig for the ColdFire M5272C3 board
m68knommu: update the defconfig for the ColdFire 5208evb board
m68knommu: fix DMA support for ColdFire
m68knommu: remove unused kernel stats offsets
m68knommu: fix missing .data.cacheline_aligned section
m68knommu: Fixed GPIO pin initialization for CONFIG_M5271 FEC.
Diffstat (limited to 'arch/m68knommu/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/m68knommu/kernel/vmlinux.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index 69ba9b10767a..b7fe505e358d 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S @@ -147,6 +147,8 @@ SECTIONS { . = ALIGN(4); _sdata = . ; DATA_DATA + . = ALIGN(32); + *(.data.cacheline_aligned) . = ALIGN(8192) ; *(.data.init_task) _edata = . ; |
