Commit 6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8
Exists in
master
and in
7 other branches
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
Showing 3 changed files Side-by-side Diff
arch/m68k/include/asm/ide.h
| 1 | 1 | /* |
| 2 | - * linux/include/asm-m68k/ide.h | |
| 3 | - * | |
| 4 | 2 | * Copyright (C) 1994-1996 Linus Torvalds & authors |
| 5 | 3 | */ |
| 6 | 4 | |
| ... | ... | @@ -34,6 +32,8 @@ |
| 34 | 32 | #include <asm/io.h> |
| 35 | 33 | #include <asm/irq.h> |
| 36 | 34 | |
| 35 | +#ifdef CONFIG_MMU | |
| 36 | + | |
| 37 | 37 | /* |
| 38 | 38 | * Get rid of defs from io.h - ide has its private and conflicting versions |
| 39 | 39 | * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we |
| ... | ... | @@ -52,6 +52,15 @@ |
| 52 | 52 | #define writew(val, port) out_be16(port, val) |
| 53 | 53 | #define __ide_mm_outsw(port, addr, n) raw_outsw((u16 *)port, addr, n) |
| 54 | 54 | #define __ide_mm_outsl(port, addr, n) raw_outsl((u32 *)port, addr, n) |
| 55 | + | |
| 56 | +#else | |
| 57 | + | |
| 58 | +#define __ide_mm_insw(port, addr, n) io_insw((unsigned int)port, addr, n) | |
| 59 | +#define __ide_mm_insl(port, addr, n) io_insl((unsigned int)port, addr, n) | |
| 60 | +#define __ide_mm_outsw(port, addr, n) io_outsw((unsigned int)port, addr, n) | |
| 61 | +#define __ide_mm_outsl(port, addr, n) io_outsl((unsigned int)port, addr, n) | |
| 62 | + | |
| 63 | +#endif /* CONFIG_MMU */ | |
| 55 | 64 | |
| 56 | 65 | #endif /* __KERNEL__ */ |
| 57 | 66 | #endif /* _M68K_IDE_H */ |
arch/m68knommu/kernel/process.c
| ... | ... | @@ -316,14 +316,14 @@ |
| 316 | 316 | fp->d0, fp->d1, fp->d2, fp->d3); |
| 317 | 317 | printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", |
| 318 | 318 | fp->d4, fp->d5, fp->a0, fp->a1); |
| 319 | - printk(KERN_EMERG "\nUSP: %08x TRAPFRAME: %08x\n", | |
| 320 | - (unsigned int) rdusp(), (unsigned int) fp); | |
| 319 | + printk(KERN_EMERG "\nUSP: %08x TRAPFRAME: %p\n", | |
| 320 | + (unsigned int) rdusp(), fp); | |
| 321 | 321 | |
| 322 | 322 | printk(KERN_EMERG "\nCODE:"); |
| 323 | 323 | tp = ((unsigned char *) fp->pc) - 0x20; |
| 324 | 324 | for (sp = (unsigned long *) tp, i = 0; (i < 0x40); i += 4) { |
| 325 | 325 | if ((i % 0x10) == 0) |
| 326 | - printk(KERN_EMERG "%08x: ", (int) (tp + i)); | |
| 326 | + printk(KERN_EMERG "%p: ", tp + i); | |
| 327 | 327 | printk("%08x ", (int) *sp++); |
| 328 | 328 | } |
| 329 | 329 | printk(KERN_EMERG "\n"); |
| ... | ... | @@ -332,7 +332,7 @@ |
| 332 | 332 | tp = ((unsigned char *) fp) - 0x40; |
| 333 | 333 | for (sp = (unsigned long *) tp, i = 0; (i < 0xc0); i += 4) { |
| 334 | 334 | if ((i % 0x10) == 0) |
| 335 | - printk(KERN_EMERG "%08x: ", (int) (tp + i)); | |
| 335 | + printk(KERN_EMERG "%p: ", tp + i); | |
| 336 | 336 | printk("%08x ", (int) *sp++); |
| 337 | 337 | } |
| 338 | 338 | printk(KERN_EMERG "\n"); |
| ... | ... | @@ -341,7 +341,7 @@ |
| 341 | 341 | tp = (unsigned char *) (rdusp() - 0x10); |
| 342 | 342 | for (sp = (unsigned long *) tp, i = 0; (i < 0x80); i += 4) { |
| 343 | 343 | if ((i % 0x10) == 0) |
| 344 | - printk(KERN_EMERG "%08x: ", (int) (tp + i)); | |
| 344 | + printk(KERN_EMERG "%p: ", tp + i); | |
| 345 | 345 | printk("%08x ", (int) *sp++); |
| 346 | 346 | } |
| 347 | 347 | printk(KERN_EMERG "\n"); |
drivers/spi/coldfire_qspi.c