mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-07 03:59:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/arch/m68k/kernel
History
Linus Torvalds b57cb7231b Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 
Pull m68knommu arch updates from Greg Ungerer:
 "Includes a cleanup of the non-MMU linker script (it now almost
  exclusively uses the well defined linker script support macros and
  definitions).  Some more merging of MMU and non-MMU common files
  (specifically the arch process.c, ptrace and time.c).  And a big
  cleanup of the massively duplicated ColdFire device definition code.

  Overall we remove about 2000 lines of code, and end up with a single
  set of platform device definitions for the serial ports, ethernet
  ports and QSPI ports common in most ColdFire SoCs.

  I expect you will get a merge conflict on arch/m68k/kernel/process.c,
  in cpu_idle().  It should be relatively strait forward to fixup."

And cpu_idle() conflict resolution was indeed trivial (merging the
nommu/mmu versions of process.c trivially conflicting with the
conversion to use the schedule_preempt_disabled() helper function)

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (57 commits)
  m68knommu: factor more common ColdFire cpu reset code
  m68knommu: make 528x CPU reset register addressing consistent
  m68knommu: make 527x CPU reset register addressing consistent
  m68knommu: make 523x CPU reset register addressing consistent
  m68knommu: factor some common ColdFire cpu reset code
  m68knommu: move old ColdFire timers init from CPU init to timers code
  m68knommu: clean up init code in ColdFire 532x startup
  m68knommu: clean up init code in ColdFire 528x startup
  m68knommu: clean up init code in ColdFire 523x startup
  m68knommu: merge common ColdFire QSPI platform setup code
  m68knommu: make 532x QSPI platform addressing consistent
  m68knommu: make 528x QSPI platform addressing consistent
  m68knommu: make 527x QSPI platform addressing consistent
  m68knommu: make 5249 QSPI platform addressing consistent
  m68knommu: make 523x QSPI platform addressing consistent
  m68knommu: make 520x QSPI platform addressing consistent
  m68knommu: merge common ColdFire FEC platform setup code
  m68knommu: make 532x FEC platform addressing consistent
  m68knommu: make 528x FEC platform addressing consistent
  m68knommu: make 527x FEC platform addressing consistent
  ...
2012-03-21 18:17:51 -07:00
..
.gitignore
asm-offsets.c m68k: remove thread_info struct from thread struct 2011-12-24 21:47:56 +10:00
dma.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
dma_mm.c m68k: Add export.h to the m68k specific files as required 2011-10-31 19:30:59 -04:00
dma_no.c m68k: Add export.h to the m68k specific files as required 2011-10-31 19:30:59 -04:00
entry.S m68k: use non-MMU entry.S code when compiling for ColdFire CPU 2011-12-30 10:20:41 +10:00
entry_mm.S m68k: remove thread_info struct from thread struct 2011-12-24 21:47:56 +10:00
entry_no.S m68k: set register a2 to current if MMU enabled on ColdFire 2011-12-30 10:20:24 +10:00
head.S m68k/mac: early console 2011-12-10 19:52:45 +01:00
init_task.c m68k: merge the init_task code for mmu and non-mmu targets 2011-12-24 21:47:56 +10:00
ints.c m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
irq.c m68k: Revive reporting of spurious interrupts 2011-07-25 11:20:41 +10:00
m68k_ksyms.c m68k: handle presence of 64bit mul/div instructions cleanly 2011-12-24 21:47:57 +10:00
Makefile m68k: do not use m68k startup or interrupt code for ColdFire CPUs 2011-12-30 10:20:48 +10:00
module.c m68k: merge the non-mmu and mmu versions of module.c 2011-07-25 11:20:40 +10:00
module.lds
process.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2012-03-21 18:17:51 -07:00
ptrace.c m68k: merge the mmu and non-mmu versions of ptrace.c 2012-03-05 09:43:04 +10:00
setup.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
setup_mm.c m68k: add ColdFire FPU support for the V4e ColdFire CPUs 2011-12-30 10:20:47 +10:00
setup_no.c m68knommu: modify timer init code to make it consistent with m68k code 2012-03-05 09:43:04 +10:00
signal.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
signal_mm.c m68k: add ColdFire FPU support for the V4e ColdFire CPUs 2011-12-30 10:20:47 +10:00
signal_no.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
sun3-head.S
sys_m68k.c m68k: merge the mmu and non-mmu versions of sys_m68k.c 2011-05-24 15:17:21 +10:00
syscalltable.S m68k: Wire up process_vm_{read,write}v 2011-12-06 20:37:58 +01:00
time.c m68k: remove dead timer code 2012-03-05 09:43:04 +10:00
traps.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2012-01-26 12:43:57 -08:00
vectors.c m68k: move hardware vector setting from traps.c to its own file 2011-10-18 14:22:25 +10:00
vmlinux-nommu.lds m68knommu: clean up linker script 2012-03-05 09:43:03 +10:00
vmlinux-std.lds m68k: print memory layout info in boot log 2011-12-24 21:47:57 +10:00
vmlinux-sun3.lds m68k: print memory layout info in boot log 2011-12-24 21:47:57 +10:00
vmlinux.lds.S m68k: use non-MMU linker script for ColdFire MMU builds 2011-12-30 10:20:44 +10:00