tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

* '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.

Linus Torvalds 7103dbed a2b9c1f6

+6 -8
+1 -3
arch/mips/ar7/gpio.c
··· 325 325 size = 0x1f; 326 326 } 327 327 328 - gpch->regs = ioremap_nocache(AR7_REGS_GPIO, 329 - AR7_REGS_GPIO + 0x10); 330 - 328 + gpch->regs = ioremap_nocache(AR7_REGS_GPIO, size); 331 329 if (!gpch->regs) { 332 330 printk(KERN_ERR "%s: failed to ioremap regs\n", 333 331 gpch->chip.label);
+2
arch/mips/include/asm/dma-mapping.h
··· 5 5 #include <asm/cache.h> 6 6 #include <asm-generic/dma-coherent.h> 7 7 8 + #ifndef CONFIG_SGI_IP27 /* Kludge to fix 2.6.39 build for IP27 */ 8 9 #include <dma-coherence.h> 10 + #endif 9 11 10 12 extern struct dma_map_ops *mips_dma_map_ops; 11 13
+2 -4
arch/mips/kernel/traps.c
··· 374 374 unsigned long dvpret = dvpe(); 375 375 #endif /* CONFIG_MIPS_MT_SMTC */ 376 376 377 - notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV); 377 + if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP) 378 + sig = 0; 378 379 379 380 console_verbose(); 380 381 spin_lock_irq(&die_lock); ··· 383 382 #ifdef CONFIG_MIPS_MT_SMTC 384 383 mips_mt_regdump(dvpret); 385 384 #endif /* CONFIG_MIPS_MT_SMTC */ 386 - 387 - if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP) 388 - sig = 0; 389 385 390 386 printk("%s[#%d]:\n", str, ++die_counter); 391 387 show_registers(regs);
+1 -1
arch/mips/rb532/gpio.c
··· 185 185 struct resource *r; 186 186 187 187 r = rb532_gpio_reg0_res; 188 - rb532_gpio_chip->regbase = ioremap_nocache(r->start, r->end - r->start); 188 + rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r)); 189 189 190 190 if (!rb532_gpio_chip->regbase) { 191 191 printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");