From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753222AbZIUHBB (ORCPT ); Mon, 21 Sep 2009 03:01:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751532AbZIUHBA (ORCPT ); Mon, 21 Sep 2009 03:01:00 -0400 Received: from mx2.mail.elte.hu ([157.181.151.9]:37955 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751384AbZIUHBA (ORCPT ); Mon, 21 Sep 2009 03:01:00 -0400 Date: Mon, 21 Sep 2009 09:00:55 +0200 From: Ingo Molnar To: Greg KH Cc: Linus Torvalds , Andrew Morton , linux-kernel@vger.kernel.org, Kay Sievers , "Eric W. Biederman" Subject: [origin tree build fix] [PATCH] Driver-Core: extend devnode callbacks to provide permissions, fix Message-ID: <20090921070055.GA14698@elte.hu> References: <20090919213332.GA7668@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090919213332.GA7668@kroah.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Greg KH wrote: > Here is one driver core patch > > It fixes the problem that Ingo found with devtmpfs and makes it so > that a user can boot a kernel using devtmpfs and no version of udev > on the system, making this option a much more useful thing. > > Thanks to Ingo for reporting and testing this, and for Eric's review > comments, which Kay has made in this patch as well. > > Please pull from: > master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/ [...] > > Kay Sievers (1): > Driver-Core: extend devnode callbacks to provide permissions Looks good here - except that you missed a driver which broke the upstream build - fix patch attached below. Thanks, Ingo ------------------> >>From 7a9906a8f51df1bf30789aa7c74609928ddb8d0e Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 21 Sep 2009 08:56:58 +0200 Subject: [PATCH] Driver-Core: extend devnode callbacks to provide permissions, fix The build of the dabusb driver broke: drivers/media/video/dabusb.c:758: error: unknown field 'nodename' specified in initializer drivers/media/video/dabusb.c:758: warning: initialization from incompatible pointer type make[3]: *** wait: No child processes. Stop. Due to this commit: e454cea: Driver-Core: extend devnode callbacks to provide permissions Missing the dabusb driver's dabusb_nodename() callback. Signed-off-by: Ingo Molnar --- drivers/media/video/dabusb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index 0664d11..ee43876 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c @@ -748,14 +748,14 @@ static const struct file_operations dabusb_fops = .release = dabusb_release, }; -static char *dabusb_nodename(struct device *dev) +static char *dabusb_devnode(struct device *dev, mode_t *mode) { return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); } static struct usb_class_driver dabusb_class = { .name = "dabusb%d", - .nodename = dabusb_nodename, + .devnode = dabusb_devnode, .fops = &dabusb_fops, .minor_base = DABUSB_MINOR, };