evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.
This commit is contained in:
Linus Torvalds 2009-10-14 15:31:48 -07:00
commit 655bdb0e07
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/sparc/kernel/ldc.c
View file

@ -1242,13 +1242,13 @@ int ldc_bind(struct ldc_channel *lp, const char *name)
snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name); snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);
err = request_irq(lp->cfg.rx_irq, ldc_rx, err = request_irq(lp->cfg.rx_irq, ldc_rx,
IRQF_SAMPLE_RANDOM | IRQF_SHARED, IRQF_SAMPLE_RANDOM | IRQF_DISABLED | IRQF_SHARED,
lp->rx_irq_name, lp); lp->rx_irq_name, lp);
if (err) if (err)
return err; return err;
err = request_irq(lp->cfg.tx_irq, ldc_tx, err = request_irq(lp->cfg.tx_irq, ldc_tx,
IRQF_SAMPLE_RANDOM | IRQF_SHARED, IRQF_SAMPLE_RANDOM | IRQF_DISABLED | IRQF_SHARED,
lp->tx_irq_name, lp); lp->tx_irq_name, lp);
if (err) { if (err) {
free_irq(lp->cfg.rx_irq, lp); free_irq(lp->cfg.rx_irq, lp);

2
arch/sparc/kernel/perf_event.c
View file

@ -437,7 +437,7 @@ static const struct sparc_pmu niagara2_pmu = {
.lower_shift = 6, .lower_shift = 6,
.event_mask = 0xfff, .event_mask = 0xfff,
.hv_bit = 0x8, .hv_bit = 0x8,
.irq_bit = 0x03, .irq_bit = 0x30,
.upper_nop = 0x220, .upper_nop = 0x220,
.lower_nop = 0x220, .lower_nop = 0x220,
}; };

2
arch/sparc/mm/init_64.c
View file

@ -265,7 +265,7 @@ static void flush_dcache(unsigned long pfn)
struct page *page; struct page *page;
page = pfn_to_page(pfn); page = pfn_to_page(pfn);
if (page && page_mapping(page)) { if (page) {
unsigned long pg_flags; unsigned long pg_flags;
pg_flags = page->flags; pg_flags = page->flags;

2
drivers/watchdog/riowd.c
View file

@ -206,7 +206,7 @@ static int __devinit riowd_probe(struct of_device *op,
dev_set_drvdata(&op->dev, p); dev_set_drvdata(&op->dev, p);
riowd_device = p; riowd_device = p;
err = 0; return 0;
out_iounmap: out_iounmap:
of_iounmap(&op->resource[0], p->regs, 2); of_iounmap(&op->resource[0], p->regs, 2);