From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [merged] firmware-loader-use-statically-initialized-data-attribute.patch removed from -mm tree Date: Tue, 27 Apr 2010 11:02:15 -0400 Message-ID: <201004271803.o3RI3mSN011017@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:50742 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756672Ab0D0SIb (ORCPT ); Tue, 27 Apr 2010 14:08:31 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: dmitry.torokhov@gmail.com, Valdis.Kletnieks@vt.edu, dtor@mail.ru, greg@kroah.com, peterz@infradead.org, tglx@linutronix.de, w.sang@pengutronix.de, mm-commits@vger.kernel.org The patch titled firmware loader: use statically initialized data attribute has been removed from the -mm tree. Its filename was firmware-loader-use-statically-initialized-data-attribute.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: firmware loader: use statically initialized data attribute From: Dmitry Torokhov There is no reason why we are using a template for binary attribute and copying it into per-firmware data before registering. Using the original works as well and gets rid of the following lockdep complaint: platform microcode: firmware: requesting intel-ucode/06-0f-0b BUG: key ffff88011371be70 not in .data! ------------[ cut here ]------------ WARNING: at kernel/lockdep.c:2706 lockdep_init_map+0x125/0x140() Hardware name: Latitude D630 Modules linked in: ... Pid: 738, comm: modprobe Tainted: P 2.6.34-rc1 #237 Call Trace: [] warn_slowpath_common+0x76/0xb0 [] warn_slowpath_null+0xf/0x20 [] lockdep_init_map+0x125/0x140 [] sysfs_add_file_mode+0x6a/0xc0 [] sysfs_add_file+0xc/0x10 [] sysfs_create_bin_file+0x21/0x30 [] fw_setup_device+0x81/0x120 [] _request_firmware+0xbf/0x270 [] request_firmware+0xe/0x10 [] request_microcode_fw+0x61/0xa0 [microcode] [] microcode_init_cpu+0xb8/0xd0 [microcode] [] mc_sysdev_add+0x56/0x70 [microcode] [] sysdev_driver_register+0x9e/0x130 [] ? microcode_init+0x0/0x12a [microcode] [] microcode_init+0xbd/0x12a [microcode] [] do_one_initcall+0x37/0x190 [] sys_init_module+0xd8/0x250 [] system_call_fastpath+0x16/0x1b ---[ end trace 93c9f72439beee7f ]--- Signed-off-by: Dmitry Torokhov Acked-by: Wolfram Sang Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Valdis Kletnieks Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/base/firmware_class.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff -puN drivers/base/firmware_class.c~firmware-loader-use-statically-initialized-data-attribute drivers/base/firmware_class.c --- a/drivers/base/firmware_class.c~firmware-loader-use-statically-initialized-data-attribute +++ a/drivers/base/firmware_class.c @@ -42,7 +42,6 @@ static DEFINE_MUTEX(fw_lock); struct firmware_priv { char *fw_id; struct completion completion; - struct bin_attribute attr_data; struct firmware *fw; unsigned long status; struct page **pages; @@ -346,8 +345,8 @@ out: return retval; } -static struct bin_attribute firmware_attr_data_tmpl = { - .attr = {.name = "data", .mode = 0644}, +static struct bin_attribute firmware_attr_data = { + .attr = { .name = "data", .mode = 0644 }, .size = 0, .read = firmware_data_read, .write = firmware_data_write, @@ -392,7 +391,6 @@ static int fw_register_device(struct dev } init_completion(&fw_priv->completion); - fw_priv->attr_data = firmware_attr_data_tmpl; fw_priv->fw_id = kstrdup(fw_name, GFP_KERNEL); if (!fw_priv->fw_id) { dev_err(device, "%s: Firmware name allocation failed\n", @@ -445,7 +443,7 @@ static int fw_setup_device(struct firmwa fw_priv->fw = fw; sysfs_bin_attr_init(&fw_priv->attr_data); - retval = sysfs_create_bin_file(&f_dev->kobj, &fw_priv->attr_data); + retval = sysfs_create_bin_file(&f_dev->kobj, &firmware_attr_data); if (retval) { dev_err(device, "%s: sysfs_create_bin_file failed\n", __func__); goto error_unreg; _ Patches currently in -mm which might be from dmitry.torokhov@gmail.com are linux-next.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch leds-route-kbd-leds-through-the-generic-leds-layer-leds-input-depends-on-input.patch leds-route-kbd-leds-through-the-generic-leds-layer-fix.patch vfs-clarify-that-nonseekable_open-will-never-fail.patch