From 1fd804a17bcf7d64249990ba42c5182284ebf972 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 17 Jul 2012 14:10:26 -0400 Subject: [PATCH] --- yaml --- r: 320739 b: refs/heads/master c: 71ba8d44da550089bda22b2a921757613b5e0b4e h: refs/heads/master i: 320737: 3ed2017176a6d92d553afa86ed6dcea6ea5ce613 320735: 9bc9ba21382a1d180cd7bc2be7dcb45aad0915fe v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/ldc.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 02313347fb0b..b1e200f295ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14673764249eb2cae4c7e9d73cb261129739563d +refs/heads/master: 71ba8d44da550089bda22b2a921757613b5e0b4e diff --git a/trunk/arch/sparc/kernel/ldc.c b/trunk/arch/sparc/kernel/ldc.c index 435e406fdec3..81d92fc9983b 100644 --- a/trunk/arch/sparc/kernel/ldc.c +++ b/trunk/arch/sparc/kernel/ldc.c @@ -1250,14 +1250,12 @@ int ldc_bind(struct ldc_channel *lp, const char *name) snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", 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_DISABLED, + err = request_irq(lp->cfg.rx_irq, ldc_rx, IRQF_DISABLED, lp->rx_irq_name, lp); if (err) return err; - err = request_irq(lp->cfg.tx_irq, ldc_tx, - IRQF_SAMPLE_RANDOM | IRQF_DISABLED, + err = request_irq(lp->cfg.tx_irq, ldc_tx, IRQF_DISABLED, lp->tx_irq_name, lp); if (err) { free_irq(lp->cfg.rx_irq, lp);