Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 655bdb0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents e7d688ec 03717e3d

arch/sparc/kernel/ldc.c

+2 −2
Original line number Diff line number Diff line
@@ -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);



	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);

	if (err)

		return err;



	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);

	if (err) {

		free_irq(lp->cfg.rx_irq, lp);

arch/sparc/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static const struct sparc_pmu niagara2_pmu = { 
	.lower_shift	= 6,

	.event_mask	= 0xfff,

	.hv_bit		= 0x8,

	.irq_bit	= 0x03,

	.irq_bit	= 0x30,

	.upper_nop	= 0x220,

	.lower_nop	= 0x220,

};

arch/sparc/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void flush_dcache(unsigned long pfn) 
	struct page *page;



	page = pfn_to_page(pfn);

	if (page && page_mapping(page)) {

	if (page) {

		unsigned long pg_flags;



		pg_flags = page->flags;

drivers/watchdog/riowd.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int __devinit riowd_probe(struct of_device *op, 


	dev_set_drvdata(&op->dev, p);

	riowd_device = p;

	err = 0;

	return 0;



out_iounmap:

	of_iounmap(&op->resource[0], p->regs, 2);