diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-22 14:05:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-22 14:05:55 -0700 |
| commit | 7897de8f80641c3795e749c42e1b71c3bfae1629 (patch) | |
| tree | 639af176f47c0774958c9782b61d3aecbffb119f | |
| parent | 9983e69ddaacc64fd16daf9d18b6810d768d4df6 (diff) | |
| download | patches-7897de8f80641c3795e749c42e1b71c3bfae1629.tar.gz | |
sysfs fix patch
| -rw-r--r-- | driver-core.current/sysfs-use-sysfs_attr_init-in-asus-atk0110-driver.patch | 118 | ||||
| -rw-r--r-- | series | 2 |
2 files changed, 120 insertions, 0 deletions
diff --git a/driver-core.current/sysfs-use-sysfs_attr_init-in-asus-atk0110-driver.patch b/driver-core.current/sysfs-use-sysfs_attr_init-in-asus-atk0110-driver.patch new file mode 100644 index 00000000000000..abe153ceb23de0 --- /dev/null +++ b/driver-core.current/sysfs-use-sysfs_attr_init-in-asus-atk0110-driver.patch @@ -0,0 +1,118 @@ +From jkosina@suse.cz Thu Apr 22 13:58:15 2010 +From: Jiri Kosina <jkosina@suse.cz> +Date: Thu, 15 Apr 2010 02:45:25 +0200 (CEST) +Subject: sysfs: use sysfs_attr_init in ASUS atk0110 driver +To: Dhaval Giani <dhaval.giani@gmail.com>, Greg Kroah-Hartman <gregkh@suse.de> +Cc: a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, "Eric W. Biederman" <ebiederm@xmission.com> +Message-ID: <alpine.LRH.2.00.1004150239391.28179@twin.jikos.cz> + +From: Jiri Kosina <jkosina@suse.cz> + +Annotate dynamic sysfs attribute in atk_create_files(). This gets +rid of the following lockdep warning: + + BUG: key ffff8800379ca670 not in .data! + ------------[ cut here ]------------ + WARNING: at kernel/lockdep.c:2696 lockdep_init_map+0xd2/0x108() + Hardware name: P5K PRO + Modules linked in: asus_atk0110(+) pata_acpi firewire_ohci ata_generic + dm_multipath firewire_core crc_itu_t pata_marvell floppy + Pid: 599, comm: modprobe Not tainted 2.6.34-rc4 #27 + Call Trace: + [<ffffffff8104cdb0>] warn_slowpath_common+0x7c/0x94 + [<ffffffff8104cddc>] warn_slowpath_null+0x14/0x16 + [<ffffffff81077c4d>] lockdep_init_map+0xd2/0x108 + [<ffffffff81165873>] sysfs_add_file_mode+0x66/0xa2 + [<ffffffff811658c0>] sysfs_add_file+0x11/0x13 + [<ffffffff8116594b>] sysfs_create_file+0x2a/0x2c + [<ffffffff812c1f9c>] device_create_file+0x19/0x1b + [<ffffffffa005b4fd>] atk_add+0x58b/0x72e [asus_atk0110] + [<ffffffff812572a1>] acpi_device_probe+0x50/0x122 + [<ffffffff812c46af>] driver_probe_device+0xa2/0x127 + [<ffffffff812c4783>] __driver_attach+0x4f/0x6b + [<ffffffff812c4734>] ? __driver_attach+0x0/0x6b + [<ffffffff812c3c94>] bus_for_each_dev+0x59/0x8e + [<ffffffff812c4519>] driver_attach+0x1e/0x20 + [<ffffffff812c4152>] bus_add_driver+0xb9/0x207 + [<ffffffff812c4a5f>] driver_register+0x9d/0x10e + [<ffffffffa005f000>] ? atk0110_init+0x0/0x31 [asus_atk0110] + [<ffffffff81257c7c>] acpi_bus_register_driver+0x43/0x45 + [<ffffffffa005f015>] atk0110_init+0x15/0x31 [asus_atk0110] + [<ffffffffa005f000>] ? atk0110_init+0x0/0x31 [asus_atk0110] + [<ffffffff81002069>] do_one_initcall+0x5e/0x15e + [<ffffffff81085075>] sys_init_module+0xd8/0x239 + [<ffffffff81009cf2>] system_call_fastpath+0x16/0x1b + ---[ end trace 4d0c84007055efb9 ]--- + BUG: key ffff8800379ca638 not in .data! + BUG: key ffff8800379ca6a8 not in .data! + BUG: key ffff8800379ca6e0 not in .data! + BUG: key ffff880036f73670 not in .data! + BUG: key ffff880036f73638 not in .data! + BUG: key ffff880036f736a8 not in .data! + BUG: key ffff880036f736e0 not in .data! + BUG: key ffff880036f76c70 not in .data! + BUG: key ffff880036f76c38 not in .data! + BUG: key ffff880036f76ca8 not in .data! + BUG: key ffff880036f76ce0 not in .data! + BUG: key ffff8800368e7670 not in .data! + BUG: key ffff8800368e7638 not in .data! + BUG: key ffff8800368e76a8 not in .data! + BUG: key ffff8800368e76e0 not in .data! + BUG: key ffff880036ef7670 not in .data! + BUG: key ffff880036ef7638 not in .data! + BUG: key ffff880036ef76a8 not in .data! + BUG: key ffff880036ef76e0 not in .data! + BUG: key ffff8800373ccc70 not in .data! + BUG: key ffff8800373ccc38 not in .data! + BUG: key ffff8800373ccca8 not in .data! + BUG: key ffff8800373ccce0 not in .data! + BUG: key ffff880037a60870 not in .data! + BUG: key ffff880037a60838 not in .data! + BUG: key ffff880037a608a8 not in .data! + BUG: key ffff880037a608e0 not in .data! + BUG: key ffff880037355070 not in .data! + BUG: key ffff880037355038 not in .data! + BUG: key ffff8800373550a8 not in .data! + BUG: key ffff8800373550e0 not in .data! + BUG: key ffff8800378c2670 not in .data! + BUG: key ffff8800378c2638 not in .data! + BUG: key ffff8800378c26a8 not in .data! + BUG: key ffff8800378c26e0 not in .data! + BUG: key ffff880036ef7e70 not in .data! + BUG: key ffff880036ef7e38 not in .data! + BUG: key ffff880036ef7ea8 not in .data! + BUG: key ffff880036ef7ee0 not in .data! + +Cc: Eric W. Biederman <ebiederm@xmission.com> +Reported-by: Dhaval Giani <dhaval.giani@gmail.com> +Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Tested-by: Dhaval Giani <dhaval.giani@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + drivers/hwmon/asus_atk0110.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/hwmon/asus_atk0110.c ++++ b/drivers/hwmon/asus_atk0110.c +@@ -1169,15 +1169,19 @@ static int atk_create_files(struct atk_d + int err; + + list_for_each_entry(s, &data->sensor_list, list) { ++ sysfs_attr_init(&s->input_attr.attr); + err = device_create_file(data->hwmon_dev, &s->input_attr); + if (err) + return err; ++ sysfs_attr_init(&s->label_attr.attr); + err = device_create_file(data->hwmon_dev, &s->label_attr); + if (err) + return err; ++ sysfs_attr_init(&s->limit1_attr.attr); + err = device_create_file(data->hwmon_dev, &s->limit1_attr); + if (err) + return err; ++ sysfs_attr_init(&s->limit2_attr.attr); + err = device_create_file(data->hwmon_dev, &s->limit2_attr); + if (err) + return err; @@ -10,6 +10,7 @@ gregkh/gkh-version.patch ################################# driver-core.current/documentation-stable-rules-upstream-commit-id-requirement-reworded.patch driver-core.current/documentation-howto-update-git-home-url.patch +driver-core.current/sysfs-use-sysfs_attr_init-in-asus-atk0110-driver.patch ################################# # TTY patches for 2.6.34 @@ -92,3 +93,4 @@ usb/usb-console-pass-baud-from-console-to-the-initial-tty-open.patch ####################################### + |