From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org, Yinghai Lu <yinghai@kernel•org>,
Thomas Bogendoerfer <tsbogend@alpha•franken.de>,
Ralf Baechle <ralf@linux-mips•org>
Subject: linux-next: manual merge of the genirq tree with Linus' tree
Date: Mon, 18 May 2009 11:25:14 +1000 [thread overview]
Message-ID: <20090518112514.c3ec8ea3.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the genirq tree got a conflict in
arch/mips/sibyte/bcm1480/irq.c and arch/mips/sibyte/sb1250/irq.c between
commit 5d81b83d03eb32085c569854695e102dde7af544 ("MIPS: Sibyte: Fix
locking in set_irq_affinity") from Linus' tree and commit
d5dedd4507d307eb3f35f21b6e16f336fdc0d82a ("irq: change ->set_affinity()
to return status") from the genirq tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/mips/sibyte/bcm1480/irq.c
index c147c4b,4f256a1..0000000
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@@ -151,7 -153,10 +151,9 @@@ static int bcm1480_set_affinity(unsigne
____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING)));
}
}
- spin_unlock(&bcm1480_imr_lock);
- spin_unlock_irqrestore(&desc->lock, flags);
+ spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
+
+ return 0;
}
#endif
diff --cc arch/mips/sibyte/sb1250/irq.c
index 38cb998,e389507..0000000
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@@ -142,7 -144,10 +142,9 @@@ static int sb1250_set_affinity(unsigne
____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
R_IMR_INTERRUPT_MASK));
}
- spin_unlock(&sb1250_imr_lock);
- spin_unlock_irqrestore(&desc->lock, flags);
+ spin_unlock_irqrestore(&sb1250_imr_lock, flags);
+
+ return 0;
}
#endif
reply other threads:[~2009-05-18 1:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090518112514.c3ec8ea3.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=ralf@linux-mips$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=yinghai@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox