Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 847f9c60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits)
  m68k: Define sigcontext ABI of ColdFire
  m68knommu: NPTL support for uClinux
  m68k: Add NPTL support
  m68k: Eliminate unused variable in page_to_phys()
  m68k: Switch to generic siginfo layout
  macfb: fix 24-bit visual and stuff
  macfb: cleanup
  fbdev: add some missing mac modes
  mac68k: start CUDA early
  valkyriefb: various fixes
  fbdev: mac_var_to_mode() fix
  mac68k: move macsonic and macmace platform devices
  mac68k: move mac_esp platform device
  mac68k: replace mac68k SCC code with platform device
  pmac-zilog: add platform driver
  pmac-zilog: cleanup
  mac68k: rework SWIM platform device
  mac68k: cleanup
  ataflop: Killl warning about unused variable flags
  m68k: Use DIV_ROUND_CLOSEST
  ...
parents 79811647 00ebfe58

arch/h8300/mm/memory.c

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ void cache_push_v (unsigned long vaddr, int len) 
{

}



/* Map some physical address range into the kernel address space. The

 * code is copied and adapted from map_chunk().

/*

 * Map some physical address range into the kernel address space.

 */



unsigned long kernel_map(unsigned long paddr, unsigned long size,

arch/m68k/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -536,10 +536,6 @@ config GVPIOEXT_PLIP 
	  Say Y to enable doing IP over the parallel port on your GVP

	  IO-Extender card, N otherwise.



config MAC_SCC

	tristate "Macintosh serial support"

	depends on MAC



config MAC_HID

	bool

	depends on INPUT_ADBHID
@@ -595,7 +591,7 @@ config DN_SERIAL 


config SERIAL_CONSOLE

	bool "Support for serial port console"

	depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)

	depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)

	---help---

	  If you say Y here, it will be possible to use a serial port as the

	  system console (the system console is the device which receives all

arch/m68k/amiga/config.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static void __init amiga_sched_init(irq_handler_t timer_routine) 
	static struct resource sched_res = {

		.name = "timer", .start = 0x00bfd400, .end = 0x00bfd5ff,

	};

	jiffy_ticks = (amiga_eclock+HZ/2)/HZ;

	jiffy_ticks = DIV_ROUND_CLOSEST(amiga_eclock, HZ);



	if (request_resource(&mb_resources._ciab, &sched_res))

		printk("Cannot allocate ciab.ta{lo,hi}\n");

arch/m68k/configs/mac_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -701,6 +701,11 @@ CONFIG_VT_HW_CONSOLE_BINDING=y 
#

# Non-8250 serial port support

#

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_PMACZILOG=y

CONFIG_SERIAL_PMACZILOG_TTYS=y

CONFIG_SERIAL_PMACZILOG_CONSOLE=y

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y
@@ -834,9 +839,7 @@ CONFIG_HIDRAW=y 
#

# Character devices

#

CONFIG_MAC_SCC=y

CONFIG_MAC_HID=y

CONFIG_SERIAL_CONSOLE=y



#

# File systems

arch/m68k/configs/multi_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -822,6 +822,11 @@ CONFIG_A2232=y 
#

# Non-8250 serial port support

#

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_PMACZILOG=y

CONFIG_SERIAL_PMACZILOG_TTYS=y

CONFIG_SERIAL_PMACZILOG_CONSOLE=y

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y
@@ -982,7 +987,6 @@ CONFIG_ATARI_MIDI=y 
CONFIG_ATARI_DSP56K=m

CONFIG_AMIGA_BUILTIN_SERIAL=y

CONFIG_MULTIFACE_III_TTY=m

CONFIG_MAC_SCC=y

CONFIG_MAC_HID=y

CONFIG_MVME147_SCC=y

CONFIG_SERIAL167=y