Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756100Ab0D0OZH (ORCPT ); Tue, 27 Apr 2010 10:25:07 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:57281 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756063Ab0D0OZE (ORCPT ); Tue, 27 Apr 2010 10:25:04 -0400 From: Arnd Bergmann To: John Kacur Cc: lkml , Linus Torvalds , Frederic Weisbecker , Jan Blunck , Thomas Gleixner , Arnd Bergmann Subject: [PATCH 5/7] um/mmapper: remove BKL usage Date: Tue, 27 Apr 2010 16:24:23 +0200 Message-Id: <1272378265-10909-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: References: X-Provags-ID: V01U2FsdGVkX19M24tfqfK2ZPjTD0/JHqLvbZeXaMs+qFyC5CT SSbvwZjFJ9+QwEA27IJEl/g8aKJsTFNOio66YhP0wyRBmAOVk8 toLk9tcovE1vl5DzmxNWw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1266 Lines: 38 An empty function does not need the BKL, so just remove it. Signed-off-by: Arnd Bergmann --- arch/um/drivers/mmapper_kern.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c index d22f9e5..7158393 100644 --- a/arch/um/drivers/mmapper_kern.c +++ b/arch/um/drivers/mmapper_kern.c @@ -46,8 +46,7 @@ static ssize_t mmapper_write(struct file *file, const char __user *buf, return count; } -static int mmapper_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static long mmapper_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { return -ENOIOCTLCMD; } @@ -90,7 +89,7 @@ static const struct file_operations mmapper_fops = { .owner = THIS_MODULE, .read = mmapper_read, .write = mmapper_write, - .ioctl = mmapper_ioctl, + .unlocked_ioctl = mmapper_ioctl, .mmap = mmapper_mmap, .open = mmapper_open, .release = mmapper_release, -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/