On Wed, 14 Nov 2012, Fernando Lopez-Lezcano wrote:
On 11/12/2012 01:28 PM, Thomas Gleixner wrote:Dear RT Folks,
I'm pleased to announce the 3.6.6-rt17 release. 3.6.6-rt16 is just a
not announced update release to 3.6.6.
Got this:
----
net/nfc/llcp/llcp.c: In function 'nfc_llcp_register_device':
net/nfc/llcp/llcp.c:1185:24: error: expected expression before '{' token
net/nfc/llcp/llcp.c:1186:35: error: expected expression before '{' token
----
when building with CONFIG_NFC / CONFIG_NFS_LLCP (builds fine when those are
not set)
Grrr. Damned ignorants.
Does that fix it for you ?
------------>--
Subject: nfc: Use proper lock init functions
From: Thomas Gleixner<tglx@xxxxxxxxxxxxx>
Date: Thu, 15 Nov 2012 19:03:20 +0100
Grmbl. Why insist people on using static initializers if there are
proper init functions? Just because they can?
Signed-off-by: Thomas Gleixner<tglx@xxxxxxxxxxxxx>
---
net/nfc/llcp/llcp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux-stable/net/nfc/llcp/llcp.c
===================================================================
--- linux-stable.orig/net/nfc/llcp/llcp.c
+++ linux-stable/net/nfc/llcp/llcp.c
@@ -1182,8 +1182,8 @@ int nfc_llcp_register_device(struct nfc_
goto err_rx_wq;
}
- local->sockets.lock = __RW_LOCK_UNLOCKED(local->sockets.lock);
- local->connecting_sockets.lock = __RW_LOCK_UNLOCKED(local->connecting_sockets.lock);
+ rwlock_init(&local->sockets.lock);
+ rwlock_init(&local->connecting_sockets.lock);
nfc_llcp_build_gb(local);