From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764666AbYDYSEd (ORCPT ); Fri, 25 Apr 2008 14:04:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762725AbYDYR5b (ORCPT ); Fri, 25 Apr 2008 13:57:31 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:53141 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764046AbYDYR5W (ORCPT ); Fri, 25 Apr 2008 13:57:22 -0400 Date: Fri, 25 Apr 2008 13:56:15 -0400 From: Jeff Dike To: Andrew Morton , LKML , uml-devel Cc: "Robert P. J. Day" Subject: [PATCH 15/19] UML - use __SPIN_LOCK_UNLOCKED Message-ID: <20080425175615.GA11200@c2.user-mode-linux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robert P. J. Day Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro. Signed-off-by: Robert P. J. Day Signed-off-by: Jeff Dike --- arch/um/include/line.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.22/arch/um/include/line.h =================================================================== --- linux-2.6.22.orig/arch/um/include/line.h 2007-07-08 19:32:17.000000000 -0400 +++ linux-2.6.22/arch/um/include/line.h 2008-03-17 13:42:36.000000000 -0400 @@ -58,11 +58,11 @@ struct line { }; #define LINE_INIT(str, d) \ - { .count_lock = SPIN_LOCK_UNLOCKED, \ + { .count_lock = __SPIN_LOCK_UNLOCKED((str).count_lock), \ .init_str = str, \ .init_pri = INIT_STATIC, \ .valid = 1, \ - .lock = SPIN_LOCK_UNLOCKED, \ + .lock = __SPIN_LOCK_UNLOCKED((str).lock), \ .driver = d } extern void line_close(struct tty_struct *tty, struct file * filp);