• R/O
  • HTTP
  • SSH
  • HTTPS

linux-2.4.36: コミット

2.4.36-stable kernel tree


コミットメタ情報

リビジョン9c99598b7afdf19504daa9fac9f7d296726c3791 (tree)
日時2006-11-26 06:45:04
作者Willy Tarreau <w@1wt....>
コミッターWilly Tarreau

ログメッセージ

[PATCH] arm: incorrect use of "&&" instead of "&"

In integrator_init_irq(), the use of "&&" in the following
statement causes all interrupts to be marked valid regardless
of INTEGRATOR_SC_VALID_INT, as long as it's non-zero :

if (((1 << i) && INTEGRATOR_SC_VALID_INT) != 0)

Obvious fix is to replace it with "&". This was already fixed
in 2.6.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Acked-by: Russell King <rmk+lkml@arm.linux.org.uk>

変更サマリ

差分

--- a/arch/arm/mach-integrator/irq.c
+++ b/arch/arm/mach-integrator/irq.c
@@ -55,7 +55,7 @@ void __init integrator_init_irq(void)
5555 unsigned int i;
5656
5757 for (i = 0; i < NR_IRQS; i++) {
58- if (((1 << i) && INTEGRATOR_SC_VALID_INT) != 0) {
58+ if (((1 << i) & INTEGRATOR_SC_VALID_INT) != 0) {
5959 irq_desc[i].valid = 1;
6060 irq_desc[i].probe_ok = 1;
6161 irq_desc[i].mask_ack = sc_mask_irq;
旧リポジトリブラウザで表示