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

Commit 587a9e1f 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 

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Make sys_atomic_cmpxchg_32 work on classic m68k
  m68k/apollo: Rename "timer" to "apollo_timer"
  zorro: Remove unused zorro_bus.devices
  m68k: Remove never used asm/shm.h
  m68k/sun3: Remove unselectable code in prom_init()
  m68k: Use asm-generic version of <asm/sections.h>
  m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop}
  mtd/uclinux: Use generic __bss_stop instead of _ebss
  m68knommu: Allow ColdFire CPUs to use unaligned accesses
  m68k: Remove five unused headers
  m68k: CPU32 does not support unaligned accesses
  m68k: Introduce config option CPU_HAS_NO_UNALIGNED
  m68k: delay, muldi3 - Use CONFIG_CPU_HAS_NO_MULDIV64
  m68k: Move CPU_HAS_* config options
  m68k: Remove duplicate FPU config option
  m68knommu: Clean up printing of sections
  m68k: Use asm-generic version of <asm/types.h>
  m68k: Use Kbuild logic to import asm-generic headers
parents 0d7614f0 9e2760d1

arch/blackfin/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ EXPORT_SYMBOL(reserved_mem_dcache_on); 
#ifdef CONFIG_MTD_UCLINUX

extern struct map_info uclinux_ram_map;

unsigned long memory_mtd_end, memory_mtd_start, mtd_size;

unsigned long _ebss;

EXPORT_SYMBOL(memory_mtd_end);

EXPORT_SYMBOL(memory_mtd_start);

EXPORT_SYMBOL(mtd_size);

arch/m68k/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -54,18 +54,6 @@ config ZONE_DMA 
	bool

	default y



config CPU_HAS_NO_BITFIELDS

	bool



config CPU_HAS_NO_MULDIV64

	bool



config CPU_HAS_ADDRESS_SPACES

	bool



config FPU

	bool



config HZ

	int

	default 1000 if CLEOPATRA

arch/m68k/Kconfig.cpu

+14 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ config M68000 
	bool

	select CPU_HAS_NO_BITFIELDS

	select CPU_HAS_NO_MULDIV64

	select CPU_HAS_NO_UNALIGNED

	select GENERIC_CSUM

	help

	  The Freescale (was Motorola) 68000 CPU is the first generation of
@@ -48,6 +49,7 @@ config M68000 
config MCPU32

	bool

	select CPU_HAS_NO_BITFIELDS

	select CPU_HAS_NO_UNALIGNED

	help

	  The Freescale (was then Motorola) CPU32 is a CPU core that is

	  based on the 68020 processor. For the most part it is used in
@@ -376,6 +378,18 @@ config NODES_SHIFT 
	default "3"

	depends on !SINGLE_MEMORY_CHUNK



config CPU_HAS_NO_BITFIELDS

	bool



config CPU_HAS_NO_MULDIV64

	bool



config CPU_HAS_NO_UNALIGNED

	bool



config CPU_HAS_ADDRESS_SPACES

	bool



config FPU

	bool

arch/m68k/apollo/config.c

+8 −8
Original line number Diff line number Diff line
@@ -177,8 +177,8 @@ irqreturn_t dn_timer_int(int irq, void *dev_id) 


	timer_handler(irq, dev_id);



	x=*(volatile unsigned char *)(timer+3);

	x=*(volatile unsigned char *)(timer+5);

	x = *(volatile unsigned char *)(apollo_timer + 3);

	x = *(volatile unsigned char *)(apollo_timer + 5);



	return IRQ_HANDLED;

}
@@ -186,17 +186,17 @@ irqreturn_t dn_timer_int(int irq, void *dev_id) 
void dn_sched_init(irq_handler_t timer_routine)

{

	/* program timer 1 */

	*(volatile unsigned char *)(timer+3)=0x01;

	*(volatile unsigned char *)(timer+1)=0x40;

	*(volatile unsigned char *)(timer+5)=0x09;

	*(volatile unsigned char *)(timer+7)=0xc4;

	*(volatile unsigned char *)(apollo_timer + 3) = 0x01;

	*(volatile unsigned char *)(apollo_timer + 1) = 0x40;

	*(volatile unsigned char *)(apollo_timer + 5) = 0x09;

	*(volatile unsigned char *)(apollo_timer + 7) = 0xc4;



	/* enable IRQ of PIC B */

	*(volatile unsigned char *)(pica+1)&=(~8);



#if 0

	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3));

	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3));

	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(apollo_timer + 0x3));

	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(apollo_timer + 0x3));

#endif



	if (request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", timer_routine))

arch/m68k/include/asm/Kbuild

+25 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm

header-y += cachectl.h



generic-y += bitsperlong.h

generic-y += cputime.h

generic-y += device.h

generic-y += emergency-restart.h

generic-y += errno.h

generic-y += futex.h

generic-y += ioctl.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += kmap_types.h

generic-y += kvm_para.h

generic-y += local64.h

generic-y += local.h

generic-y += mman.h

generic-y += mutex.h

generic-y += percpu.h

generic-y += resource.h

generic-y += scatterlist.h

generic-y += sections.h

generic-y += siginfo.h

generic-y += statfs.h

generic-y += topology.h

generic-y += types.h

generic-y += word-at-a-time.h

generic-y += xor.h