leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

Browse Source 
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Kludge IP27 build for 2.6.39.
  MIPS: AR7: Fix GPIO register size for Titan variant.
  MIPS: Fix duplicate invocation of notify_die.
  MIPS: RB532: Fix iomap resource size miscalculation.
This commit is contained in:
Linus Torvalds 2011-05-18 13:21:43 -07:00
commit 7103dbed8e
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/ar7/gpio.c
View File

@ -325,9 +325,7 @@ int __init ar7_gpio_init(void)
size = 0x1f; size = 0x1f;
} }
gpch->regs = ioremap_nocache(AR7_REGS_GPIO, gpch->regs = ioremap_nocache(AR7_REGS_GPIO, size);
AR7_REGS_GPIO + 0x10);
if (!gpch->regs) { if (!gpch->regs) {
printk(KERN_ERR "%s: failed to ioremap regs\n", printk(KERN_ERR "%s: failed to ioremap regs\n",
gpch->chip.label); gpch->chip.label);

2
arch/mips/include/asm/dma-mapping.h
View File

@ -5,7 +5,9 @@
#include <asm/cache.h> #include <asm/cache.h>
#include <asm-generic/dma-coherent.h> #include <asm-generic/dma-coherent.h>
#ifndef CONFIG_SGI_IP27 /* Kludge to fix 2.6.39 build for IP27 */
#include <dma-coherence.h> #include <dma-coherence.h>
#endif
extern struct dma_map_ops *mips_dma_map_ops; extern struct dma_map_ops *mips_dma_map_ops;

6
arch/mips/kernel/traps.c
View File

@ -374,7 +374,8 @@ void __noreturn die(const char *str, struct pt_regs *regs)
unsigned long dvpret = dvpe(); unsigned long dvpret = dvpe();
#endif /* CONFIG_MIPS_MT_SMTC */ #endif /* CONFIG_MIPS_MT_SMTC */
notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV); if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP)
sig = 0;
console_verbose(); console_verbose();
spin_lock_irq(&die_lock); spin_lock_irq(&die_lock);
@ -383,9 +384,6 @@ void __noreturn die(const char *str, struct pt_regs *regs)
mips_mt_regdump(dvpret); mips_mt_regdump(dvpret);
#endif /* CONFIG_MIPS_MT_SMTC */ #endif /* CONFIG_MIPS_MT_SMTC */
if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP)
sig = 0;
printk("%s[#%d]:\n", str, ++die_counter); printk("%s[#%d]:\n", str, ++die_counter);
show_registers(regs); show_registers(regs);
add_taint(TAINT_DIE); add_taint(TAINT_DIE);

2
arch/mips/rb532/gpio.c
View File

@ -185,7 +185,7 @@ int __init rb532_gpio_init(void)
struct resource *r; struct resource *r;
r = rb532_gpio_reg0_res; r = rb532_gpio_reg0_res;
rb532_gpio_chip->regbase = ioremap_nocache(r->start, r->end - r->start); rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r));
if (!rb532_gpio_chip->regbase) { if (!rb532_gpio_chip->regbase) {
printk(KERN_ERR "rb532: cannot remap GPIO register 0\n"); printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");