From: Robert P. J. Day Date: Wed, 30 Jul 2008 19:48:55 +0000 (-0700) Subject: xtensa: use newer __SPIN_LOCK_UNLOCKED macro X-Git-Tag: v2.6.28-rc1~50^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ef9c2f04dbeef3bf8ffcb43aeb5d8738f4141718;p=linux-2.6-omap-h63xx.git xtensa: use newer __SPIN_LOCK_UNLOCKED macro SPIN_LOCK_UNLOCKED() breaks lockdep and is deprecated. Signed-off-by: Robert P. J. Day Signed-off-by: Andrew Morton Signed-off-by: Chris Zankel --- diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c index a2e25221742..11a20adc140 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c @@ -640,7 +640,7 @@ static int iss_net_configure(int index, char *init) *lp = ((struct iss_net_private) { .device_list = LIST_HEAD_INIT(lp->device_list), .opened_list = LIST_HEAD_INIT(lp->opened_list), - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(lp.lock), .dev = dev, .index = index, //.fd = -1,