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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
watchdog: Fix rio watchdog probe function
sparc64: Set IRQF_DISABLED on LDC channel IRQs.
sparc64: Fix D-cache flushing on swapin from SW devices.
sparc64: Fix niagara2 perf IRQ bits.

Linus Torvalds 655bdb0e e7d688ec

+5 -5
unified split
+2 -2
arch/sparc/kernel/ldc.c
··· 1242 1242 snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name); 1243 1243 1244 1244 err = request_irq(lp->cfg.rx_irq, ldc_rx, 1245 - IRQF_SAMPLE_RANDOM | IRQF_SHARED, 1245 + IRQF_SAMPLE_RANDOM | IRQF_DISABLED | IRQF_SHARED, 1246 1246 lp->rx_irq_name, lp); 1247 1247 if (err) 1248 1248 return err; 1249 1249 1250 1250 err = request_irq(lp->cfg.tx_irq, ldc_tx, 1251 - IRQF_SAMPLE_RANDOM | IRQF_SHARED, 1251 + IRQF_SAMPLE_RANDOM | IRQF_DISABLED | IRQF_SHARED, 1252 1252 lp->tx_irq_name, lp); 1253 1253 if (err) { 1254 1254 free_irq(lp->cfg.rx_irq, lp);
+1 -1
arch/sparc/kernel/perf_event.c
··· 437 437 .lower_shift = 6, 438 438 .event_mask = 0xfff, 439 439 .hv_bit = 0x8, 440 - .irq_bit = 0x03, 440 + .irq_bit = 0x30, 441 441 .upper_nop = 0x220, 442 442 .lower_nop = 0x220, 443 443 };
+1 -1
arch/sparc/mm/init_64.c
··· 265 265 struct page *page; 266 266 267 267 page = pfn_to_page(pfn); 268 - if (page && page_mapping(page)) { 268 + if (page) { 269 269 unsigned long pg_flags; 270 270 271 271 pg_flags = page->flags;
+1 -1
drivers/watchdog/riowd.c
··· 206 206 207 207 dev_set_drvdata(&op->dev, p); 208 208 riowd_device = p; 209 - err = 0; 209 + return 0; 210 210 211 211 out_iounmap: 212 212 of_iounmap(&op->resource[0], p->regs, 2);