Skip to contentSkip to conversation

net/input: fix net/rfkill/rfkill-input.c bug on 64-bit systems

PATCH Applied Ingo Molnar 3 participants 3 messages Jul 12, 2007 – Jul 15, 2007 Rfkill

lore
Share & tools
lore

Ingo Molnar

author
#0 lore raw

PATCH 1/1 net/input: fix net/rfkill/rfkill-input.c bug on 64-bit systems

From: Ingo Molnar <[email protected]>
Subject: [patch] net/input: fix net/rfkill/rfkill-input.c bug on 64-bit systems

this recent commit:

commit cf4328cd949c2086091c62c5685f1580fe9b55e4
Author: Ivo van Doorn <[email protected]>
Date: Mon May 7 00:34:20 2007 -0700

[NET]: rfkill: add support for input key to control wireless radio

added this 64-bit bug:

        ....
	unsigned int flags;
 	spin_lock_irqsave(&task->lock, flags);
        ....

irq 'flags' must be unsigned long, not unsigned int. The -rt tree has strict checks about this on 64-bit so this triggered a build failure.

For -stable too i suspect.

Signed-off-by Ingo Molnar <[email protected]>
net/rfkill/rfkill-input.c +1 -1
Index: linux-rt.q/net/rfkill/rfkill-input.c
===================================================================
@@ -55,7 +55,7 @@ static void rfkill_task_handler(struct w
 
 static void rfkill_schedule_toggle(struct rfkill_task *task)
 {
-	unsigned int flags;
+	unsigned long flags;
 
 	spin_lock_irqsave(&task->lock, flags);
#1 lore raw
Quoted 13 lines · Ingo Molnar

From: Ingo Molnar <[email protected]>
Subject: [patch] net/input: fix net/rfkill/rfkill-input.c bug on 64-bit systems

this recent commit:

commit cf4328cd949c2086091c62c5685f1580fe9b55e4
Author: Ivo van Doorn <[email protected]>
Date: Mon May 7 00:34:20 2007 -0700

[NET]: rfkill: add support for input key to control wireless radio

added this 64-bit bug:

Quoted 9 lines
       ....
       unsigned int flags;

       spin_lock_irqsave(&task->lock, flags);
       ....

irq 'flags' must be unsigned long, not unsigned int. The -rt tree has strict checks about this on 64-bit so this triggered a build failure.

Yep, my fault.

Quoted 2 lines

For -stable too i suspect.

I don't think anyone uses rfkill in mainline yet. People were asking to add it so that they can develop against it but I guess I should have waited for the real user before pushing rfkill to David... ANyway, I see it is being used in wireless-dev so it is not completely useless ;)

Signature · 1 line
Dmitry
Applied
#2 lore raw
In reply to Ingo Molnar

From: Ingo Molnar <[email protected]>
Date: Thu, 12 Jul 2007 14:45:03 +0200

Quoted 19 lines

From: Ingo Molnar <[email protected]>
Subject: [patch] net/input: fix net/rfkill/rfkill-input.c bug on 64-bit systems

this recent commit:

commit cf4328cd949c2086091c62c5685f1580fe9b55e4
Author: Ivo van Doorn <[email protected]>
Date: Mon May 7 00:34:20 2007 -0700

[NET]: rfkill: add support for input key to control wireless radio

added this 64-bit bug:

        ....
	unsigned int flags;
 	spin_lock_irqsave(&task->lock, flags);
        ....
Quoted 6 lines

irq 'flags' must be unsigned long, not unsigned int. The -rt tree has strict checks about this on 64-bit so this triggered a build failure.

For -stable too i suspect.

Signed-off-by Ingo Molnar <[email protected]>

Applied, thanks Ingo.

I'll push this to -stable.