diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-21 10:35:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-21 10:35:11 -0800 |
| commit | 8552d28e140110fc935b39a6bfaf33c8ce3a1ad5 (patch) | |
| tree | 8102bc58bb5be253a7df0993d8d06a128cbc125e /arch/m68k/kernel/vmlinux-nommu.lds | |
| parent | 70990afa34fbac03ade78e2ad0ccd418acecfc04 (diff) | |
| parent | 8b22820efb35f93d98638563b0a8f4094e8ee399 (diff) | |
Merge tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
- cleanup of 68328 code
- align BSS section to 32bit
* tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: m68328: remove duplicate code
m68k: m68328: move platform code to separate files
m68knommu: align BSS section to 4-byte boundaries
Diffstat (limited to 'arch/m68k/kernel/vmlinux-nommu.lds')
| -rw-r--r-- | arch/m68k/kernel/vmlinux-nommu.lds | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-nommu.lds index 396e126a4258..387f334e87d3 100644 --- a/arch/m68k/kernel/vmlinux-nommu.lds +++ b/arch/m68k/kernel/vmlinux-nommu.lds @@ -81,7 +81,7 @@ SECTIONS { __init_end = .; } - BSS_SECTION(0, 0, 0) + BSS_SECTION(4, 0, 4) _end = .; |