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

Commit 6c8bfb7f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  m68knommu: include sched.h in ColdFire/SPI driver
  m68knommu: formatting of pointers in printk()
  m68knommu: arch/m68k/include/asm/ide.h fix for nommu
parents d9f5d415 5e1c5335

arch/m68k/include/asm/ide.h

+11 −2
Original line number Diff line number Diff line 
/*

 *  linux/include/asm-m68k/ide.h

 *

 *  Copyright (C) 1994-1996  Linus Torvalds & authors

 */
@@ -34,6 +32,8 @@ 
#include <asm/io.h>

#include <asm/irq.h>



#ifdef CONFIG_MMU



/*

 * Get rid of defs from io.h - ide has its private and conflicting versions

 * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we
@@ -53,5 +53,14 @@ 
#define __ide_mm_outsw(port, addr, n)	raw_outsw((u16 *)port, addr, n)

#define __ide_mm_outsl(port, addr, n)	raw_outsl((u32 *)port, addr, n)



#else



#define __ide_mm_insw(port, addr, n)	io_insw((unsigned int)port, addr, n)

#define __ide_mm_insl(port, addr, n)	io_insl((unsigned int)port, addr, n)

#define __ide_mm_outsw(port, addr, n)	io_outsw((unsigned int)port, addr, n)

#define __ide_mm_outsl(port, addr, n)	io_outsl((unsigned int)port, addr, n)



#endif /* CONFIG_MMU */



#endif /* __KERNEL__ */

#endif /* _M68K_IDE_H */

arch/m68knommu/kernel/process.c

+5 −5
Original line number Diff line number Diff line
@@ -316,14 +316,14 @@ void dump(struct pt_regs *fp) 
		fp->d0, fp->d1, fp->d2, fp->d3);

	printk(KERN_EMERG "d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",

		fp->d4, fp->d5, fp->a0, fp->a1);

	printk(KERN_EMERG "\nUSP: %08x   TRAPFRAME: %08x\n",

		(unsigned int) rdusp(), (unsigned int) fp);

	printk(KERN_EMERG "\nUSP: %08x   TRAPFRAME: %p\n",

		(unsigned int) rdusp(), fp);



	printk(KERN_EMERG "\nCODE:");

	tp = ((unsigned char *) fp->pc) - 0x20;

	for (sp = (unsigned long *) tp, i = 0; (i < 0x40);  i += 4) {

		if ((i % 0x10) == 0)

			printk(KERN_EMERG "%08x: ", (int) (tp + i));

			printk(KERN_EMERG "%p: ", tp + i);

		printk("%08x ", (int) *sp++);

	}

	printk(KERN_EMERG "\n");
@@ -332,7 +332,7 @@ void dump(struct pt_regs *fp) 
	tp = ((unsigned char *) fp) - 0x40;

	for (sp = (unsigned long *) tp, i = 0; (i < 0xc0); i += 4) {

		if ((i % 0x10) == 0)

			printk(KERN_EMERG "%08x: ", (int) (tp + i));

			printk(KERN_EMERG "%p: ", tp + i);

		printk("%08x ", (int) *sp++);

	}

	printk(KERN_EMERG "\n");
@@ -341,7 +341,7 @@ void dump(struct pt_regs *fp) 
	tp = (unsigned char *) (rdusp() - 0x10);

	for (sp = (unsigned long *) tp, i = 0; (i < 0x80); i += 4) {

		if ((i % 0x10) == 0)

			printk(KERN_EMERG "%08x: ", (int) (tp + i));

			printk(KERN_EMERG "%p: ", tp + i);

		printk("%08x ", (int) *sp++);

	}

	printk(KERN_EMERG "\n");

drivers/spi/coldfire_qspi.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/interrupt.h>

#include <linux/errno.h>

#include <linux/platform_device.h>

#include <linux/sched.h>

#include <linux/workqueue.h>

#include <linux/delay.h>

#include <linux/io.h>