aboutsummaryrefslogtreecommitdiffstats
path: root/net/rfkill
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2007-07-14 18:50:15 -0700
committerDavid S. Miller <davem@davemloft.net>2007-07-14 18:50:15 -0700
commite6c9116d1dc984cb7ecf1b0fe26ca4a8ab36bb57 (patch)
tree4097167cef775da1006b762f30ceff323ccf6071 /net/rfkill
parentRevert "SELinux: use SECINITSID_NETMSG instead of SECINITSID_UNLABELED for NetLabel" (diff)
downloadlinux-dev-e6c9116d1dc984cb7ecf1b0fe26ca4a8ab36bb57.tar.xz
linux-dev-e6c9116d1dc984cb7ecf1b0fe26ca4a8ab36bb57.zip
[RFKILL]: fix net/rfkill/rfkill-input.c bug on 64-bit systems
Subject: [patch] net/input: fix net/rfkill/rfkill-input.c bug on 64-bit systems this recent commit: commit cf4328cd949c2086091c62c5685f1580fe9b55e4 Author: Ivo van Doorn <IvDoorn@gmail.com> 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. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rfkill')
-rw-r--r--net/rfkill/rfkill-input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c
index e5c840c30284..230e35c59786 100644
--- a/net/rfkill/rfkill-input.c
+++ b/net/rfkill/rfkill-input.c
@@ -55,7 +55,7 @@ static void rfkill_task_handler(struct work_struct *work)
static void rfkill_schedule_toggle(struct rfkill_task *task)
{
- unsigned int flags;
+ unsigned long flags;
spin_lock_irqsave(&task->lock, flags);