korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 09:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
b57cb7231b
linux/arch/m68k
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
..
amiga treewide: convert uses of ATTRIB_NORETURN to __noreturn 2012-01-12 20:13:03 -08:00
apollo m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
atari m68k: Fix assembler constraint to prevent overeager gcc optimisation 2012-01-22 14:50:20 +01:00
bvme6000 m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
configs m68k/serial: Remove references to obsolete serial config options 2011-12-28 20:14:41 +01:00
emu TTY: remove re-assignments to tty_driver members 2012-03-08 11:37:58 -08:00
fpsp040 Fix common misspellings 2011-03-31 11:26:23 -03:00
hp300 m68k/hp300: Export hp300_ledstate 2011-12-10 19:52:48 +01:00
ifpsp060 Fix common misspellings 2011-03-31 11:26:23 -03:00
include/asm Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2012-03-21 18:17:51 -07:00
kernel Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2012-03-21 18:17:51 -07:00
lib m68k: modify user space access functions to support ColdFire CPUs 2011-12-30 10:20:21 +10:00
mac m68k/mac: cleanup macro case 2011-12-10 19:52:48 +01:00
math-emu m68k/math-emu: Remove unnecessary code 2011-07-30 21:21:40 +02:00
mm m68k: Do not set global share for non-kernel shared pages 2012-02-07 11:25:57 +10:00
mvme16x m68k/mvme16x: Add support for EARLY_PRINTK 2011-12-10 19:52:45 +01:00
mvme147 m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
platform m68knommu: factor more common ColdFire cpu reset code 2012-03-05 10:42:28 +10:00
q40 m68k/irq: Remove obsolete m68k irq framework 2011-11-08 22:35:52 +01:00
sun3 m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
sun3x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
tools/amiga Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
Kconfig m68k: make support for FPU hardware configurable 2012-03-05 09:43:05 +10:00
Kconfig.bus m68k: Revive lost DIO bus config option 2011-11-08 22:35:46 +01:00
Kconfig.cpu m68k: allow ColdFire 547x and 548x CPUs to be built with MMU enabled 2011-12-30 10:20:50 +10:00
Kconfig.debug Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2012-01-06 18:28:12 -08:00
Kconfig.devices m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac 2012-01-04 22:23:50 +01:00
Kconfig.machine m68k/Kconfig: Separate classic m68k and coldfire early 2011-12-30 10:20:49 +10:00
Makefile m68k: merge mmu and non-mmu arch Makefiles 2011-10-18 14:22:25 +10:00