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: m68k: merge m68k and m68knommu arch directories
2026-10-12 06:01:58 +00:00 · 2011-03-25 17:47:58 -07:00 · 2011-03-25 17:47:58 -07:00 · ffbf0ab1a6
commit ffbf0ab1a6
parent 73939bb56a 66d857b08b
291 changed files with 27737 additions and 27952 deletions
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
--- a/arch/m68k/Kconfig.debug
+++ b/arch/m68k/Kconfig.debug
--- a/arch/m68k/Kconfig.mmu
+++ b/arch/m68k/Kconfig.mmu
--- a/arch/m68k/Kconfig.nommu
+++ b/arch/m68k/Kconfig.nommu
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
--- a/arch/m68k/Makefile_mm
+++ b/arch/m68k/Makefile_mm
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
--- a/arch/m68knommu/configs/m5208evb_defconfig
+++ b/arch/m68knommu/configs/m5208evb_defconfig
--- a/arch/m68knommu/configs/m5249evb_defconfig
+++ b/arch/m68knommu/configs/m5249evb_defconfig
--- a/arch/m68knommu/configs/m5272c3_defconfig
+++ b/arch/m68knommu/configs/m5272c3_defconfig
--- a/arch/m68knommu/configs/m5275evb_defconfig
+++ b/arch/m68knommu/configs/m5275evb_defconfig
--- a/arch/m68knommu/configs/m5307c3_defconfig
+++ b/arch/m68knommu/configs/m5307c3_defconfig
--- a/arch/m68knommu/configs/m5407c3_defconfig
+++ b/arch/m68knommu/configs/m5407c3_defconfig
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
--- a/arch/m68k/kernel/Makefile_mm
+++ b/arch/m68k/kernel/Makefile_mm
--- a/arch/m68knommu/kernel/Makefile
+++ b/arch/m68knommu/kernel/Makefile
--- a/arch/m68k/kernel/asm-offsets.c
+++ b/arch/m68k/kernel/asm-offsets.c
--- a/arch/m68k/kernel/asm-offsets_mm.c
+++ b/arch/m68k/kernel/asm-offsets_mm.c
--- a/arch/m68knommu/kernel/asm-offsets.c
+++ b/arch/m68knommu/kernel/asm-offsets.c
--- a/arch/m68k/kernel/dma.c
+++ b/arch/m68k/kernel/dma.c
--- a/arch/m68k/kernel/dma_mm.c
+++ b/arch/m68k/kernel/dma_mm.c
--- a/arch/m68knommu/kernel/dma.c
+++ b/arch/m68knommu/kernel/dma.c
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
--- a/arch/m68k/kernel/entry_mm.S
+++ b/arch/m68k/kernel/entry_mm.S
--- a/arch/m68knommu/kernel/entry.S
+++ b/arch/m68knommu/kernel/entry.S
--- a/arch/m68knommu/kernel/init_task.c
+++ b/arch/m68knommu/kernel/init_task.c
--- a/arch/m68knommu/kernel/irq.c
+++ b/arch/m68knommu/kernel/irq.c
--- a/arch/m68k/kernel/m68k_ksyms.c
+++ b/arch/m68k/kernel/m68k_ksyms.c
--- a/arch/m68k/kernel/m68k_ksyms_mm.c
+++ b/arch/m68k/kernel/m68k_ksyms_mm.c
--- a/arch/m68knommu/kernel/m68k_ksyms.c
+++ b/arch/m68knommu/kernel/m68k_ksyms.c
--- a/arch/m68k/kernel/module.c
+++ b/arch/m68k/kernel/module.c
--- a/arch/m68k/kernel/module_mm.c
+++ b/arch/m68k/kernel/module_mm.c
--- a/arch/m68knommu/kernel/module.c
+++ b/arch/m68knommu/kernel/module.c
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
--- a/arch/m68k/kernel/process_mm.c
+++ b/arch/m68k/kernel/process_mm.c
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
--- a/arch/m68k/kernel/ptrace.c
+++ b/arch/m68k/kernel/ptrace.c
--- a/arch/m68k/kernel/ptrace_mm.c
+++ b/arch/m68k/kernel/ptrace_mm.c
--- a/arch/m68knommu/kernel/ptrace.c
+++ b/arch/m68knommu/kernel/ptrace.c
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
--- a/arch/m68k/kernel/signal_mm.c
+++ b/arch/m68k/kernel/signal_mm.c
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
--- a/arch/m68k/kernel/sys_m68k_mm.c
+++ b/arch/m68k/kernel/sys_m68k_mm.c
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
--- a/arch/m68k/kernel/time_mm.c
+++ b/arch/m68k/kernel/time_mm.c
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
--- a/arch/m68k/kernel/traps_mm.c
+++ b/arch/m68k/kernel/traps_mm.c
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
--- a/arch/m68k/kernel/vmlinux.lds.S
+++ b/arch/m68k/kernel/vmlinux.lds.S
--- a/arch/m68k/kernel/vmlinux.lds_mm.S
+++ b/arch/m68k/kernel/vmlinux.lds_mm.S
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
--- a/arch/m68k/lib/Makefile_mm
+++ b/arch/m68k/lib/Makefile_mm
--- a/arch/m68knommu/lib/Makefile
+++ b/arch/m68knommu/lib/Makefile
--- a/arch/m68k/lib/checksum.c
+++ b/arch/m68k/lib/checksum.c
--- a/arch/m68k/lib/checksum_mm.c
+++ b/arch/m68k/lib/checksum_mm.c
--- a/arch/m68knommu/lib/checksum.c
+++ b/arch/m68knommu/lib/checksum.c
--- a/arch/m68knommu/lib/delay.c
+++ b/arch/m68knommu/lib/delay.c
--- a/arch/m68knommu/lib/divsi3.S
+++ b/arch/m68knommu/lib/divsi3.S
--- a/arch/m68knommu/lib/memcpy.c
+++ b/arch/m68knommu/lib/memcpy.c
--- a/arch/m68knommu/lib/memmove.c
+++ b/arch/m68knommu/lib/memmove.c
--- a/arch/m68knommu/lib/memset.c
+++ b/arch/m68knommu/lib/memset.c
--- a/arch/m68knommu/lib/modsi3.S
+++ b/arch/m68knommu/lib/modsi3.S
--- a/arch/m68k/lib/muldi3.c
+++ b/arch/m68k/lib/muldi3.c
--- a/arch/m68knommu/lib/ashrdi3.c
+++ b/arch/m68knommu/lib/ashrdi3.c
--- a/arch/m68knommu/lib/muldi3.c
+++ b/arch/m68knommu/lib/muldi3.c
--- a/arch/m68knommu/lib/mulsi3.S
+++ b/arch/m68knommu/lib/mulsi3.S
--- a/arch/m68knommu/lib/udivsi3.S
+++ b/arch/m68knommu/lib/udivsi3.S
--- a/arch/m68knommu/lib/umodsi3.S
+++ b/arch/m68knommu/lib/umodsi3.S
--- a/arch/m68k/mm/Makefile
+++ b/arch/m68k/mm/Makefile
--- a/arch/m68k/mm/Makefile_mm
+++ b/arch/m68k/mm/Makefile_mm
--- a/arch/m68knommu/mm/Makefile
+++ b/arch/m68knommu/mm/Makefile
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
--- a/arch/m68k/mm/init_mm.c
+++ b/arch/m68k/mm/init_mm.c
--- a/arch/m68knommu/mm/init.c
+++ b/arch/m68knommu/mm/init.c
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
--- a/arch/m68k/mm/kmap_mm.c
+++ b/arch/m68k/mm/kmap_mm.c
--- a/arch/m68knommu/mm/kmap.c
+++ b/arch/m68knommu/mm/kmap.c
--- a/arch/m68knommu/platform/5206/Makefile
+++ b/arch/m68knommu/platform/5206/Makefile
--- a/arch/m68knommu/platform/5206/config.c
+++ b/arch/m68knommu/platform/5206/config.c
--- a/arch/m68knommu/platform/5206/gpio.c
+++ b/arch/m68knommu/platform/5206/gpio.c
--- a/arch/m68knommu/platform/5206e/Makefile
+++ b/arch/m68knommu/platform/5206e/Makefile
--- a/arch/m68knommu/platform/5206e/config.c
+++ b/arch/m68knommu/platform/5206e/config.c
--- a/arch/m68knommu/platform/5206e/gpio.c
+++ b/arch/m68knommu/platform/5206e/gpio.c
--- a/arch/m68knommu/platform/520x/Makefile
+++ b/arch/m68knommu/platform/520x/Makefile
--- a/arch/m68knommu/platform/520x/config.c
+++ b/arch/m68knommu/platform/520x/config.c
--- a/arch/m68knommu/platform/520x/gpio.c
+++ b/arch/m68knommu/platform/520x/gpio.c
--- a/arch/m68knommu/platform/523x/Makefile
+++ b/arch/m68knommu/platform/523x/Makefile
--- a/arch/m68knommu/platform/523x/config.c
+++ b/arch/m68knommu/platform/523x/config.c
--- a/arch/m68knommu/platform/523x/gpio.c
+++ b/arch/m68knommu/platform/523x/gpio.c
--- a/arch/m68knommu/platform/5249/Makefile
+++ b/arch/m68knommu/platform/5249/Makefile
--- a/arch/m68knommu/platform/5249/config.c
+++ b/arch/m68knommu/platform/5249/config.c
--- a/arch/m68knommu/platform/5249/gpio.c
+++ b/arch/m68knommu/platform/5249/gpio.c
--- a/Show more
+++ b/Show more