Driver core patches for 2.6.20-rc1
Subsystems (3)
PATCH 1/1 Driver core patches for 2.6.20-rc1
Here are some minor driver core patches for 2.6.20-rc1
The descriptions of them are below.
All of these patches have been in the -mm tree for a while.
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
Patches will be sent as a follow-on to this message to lkml for people to see.
thanks,
greg k-h
drivers/acpi/ibm_acpi.c | 4 ++-- include/linux/device.h | 2 ++ include/linux/kobject.h | 11 ++++++----- init/main.c | 2 +- lib/kobject_uevent.c | 44 ++++++++++++++++++++++++++++++-------------- lib/kref.c | 7 +------ 6 files changed, 42 insertions(+), 28 deletions(-)
---------------
Adrian Bunk (1):
Driver core: proper prototype for drivers/base/init.c:driver_init()
Aneesh Kumar K.V (1):
kobject: kobject_uevent() returns manageable value
Venkatesh Pallipadi (1):
kref refcnt and false positives
PATCH 1/3 kref refcnt and false positives
From: Venkatesh Pallipadi <[email protected]>
With WARN_ON addition to kobject_init()
[ http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.19/2.6.19-mm1/dont-use/broken-out/gregkh-driver-kobject-warn.patch ]
I started seeing following WARNING on CPU offline followed by online on my x86_64 system.
WARNING at lib/kobject.c:172 kobject_init()
Call Trace: [<ffffffff8020ab45>] dump_trace+0xaa/0x3ef [<ffffffff8020aec4>] show_trace+0x3a/0x50 [<ffffffff8020b0f6>] dump_stack+0x15/0x17 [<ffffffff80350abc>] kobject_init+0x3f/0x8a [<ffffffff80350be1>] kobject_register+0x1a/0x3e [<ffffffff803bbd89>] sysdev_register+0x5b/0xf9 [<ffffffff80211d0b>] mce_create_device+0x77/0xf4 [<ffffffff80211dc2>] mce_cpu_callback+0x3a/0xe5 [<ffffffff805632fd>] notifier_call_chain+0x26/0x3b [<ffffffff8023f6f3>] raw_notifier_call_chain+0x9/0xb [<ffffffff802519bf>] _cpu_up+0xb4/0xdc [<ffffffff80251a12>] cpu_up+0x2b/0x42 [<ffffffff803bef00>] store_online+0x4a/0x72 [<ffffffff803bb6ce>] sysdev_store+0x24/0x26 [<ffffffff802baaa2>] sysfs_write_file+0xcf/0xfc [<ffffffff8027fc6f>] vfs_write+0xae/0x154 [<ffffffff80280418>] sys_write+0x47/0x6f [<ffffffff8020963e>] system_call+0x7e/0x83 DWARF2 unwinder stuck at system_call+0x7e/0x83
Leftover inexact backtrace:
This is a false positive as mce.c is unregistering/registering sysfs interfaces cleanly on hotplug.
kref_put() and conditional decrement of refcnt seems to be the root cause for this and the patch below resolves the issue for me.
--- lib/kref.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
lib/kref.c +1 -6
@@ -52,12 +52,7 @@ int kref_put(struct kref *kref, void (*release)(struct kref *kref))WARN_ON (release ==NULL );WARN_ON (release == (void (*)(struct kref *))kfree); -/* -* if current count is one, we are the last user and can release object -* right now, avoiding an atomic operation on 'refcount' -*/ -if ((atomic_read (&kref->refcount) ==1 ) || - (atomic_dec_and_test (&kref->refcount))) { +if (atomic_dec_and_test (&kref->refcount)) {release (kref);return 1 ; }
Signature · 1 line
1.4.4.2
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 3/3 Driver core: proper prototype for drivers/base/init.c:driver_init()
From: Adrian Bunk <[email protected]>
Add a prototype for driver_init() in include/linux/device.h.
Also remove a static function of the same name in drivers/acpi/ibm_acpi.c to ibm_acpi_driver_init() to fix the namespace collision.
--- drivers/acpi/ibm_acpi.c | 4 ++-- include/linux/device.h | 2 ++ init/main.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
drivers/acpi/ibm_acpi.c +2 -2
@@ -352,7 +352,7 @@ static char *next_cmd(char **cmds)return start; } -static int driver_init (void ) +static int ibm_acpi_driver_init (void ) {printk (IBM_INFO "%s v%s\n" ,IBM_DESC ,IBM_VERSION );printk (IBM_INFO "%s\n" ,IBM_URL );
@@ -1605,7 +1605,7 @@ static int fan_write(char *buf)static struct ibm_struct ibms[] = { { .name ="driver" , - .init = driver_init, + .init = ibm_acpi_driver_init, .read = driver_read, }, {
include/linux/device.h +2 -0
@@ -433,6 +433,8 @@ static inline int device_is_registered(struct device *dev)return dev->is_registered; } +void driver_init (void ); +/* * High level routines for use by the bus drivers */
init/main.c +1 -1
@@ -53,6 +53,7 @@#include <linux/utsrelease.h> #include <linux/pid_namespace.h> #include <linux/compile.h> +#include <linux/device.h> #include <asm/io.h> #include <asm/bugs.h>
@@ -94,7 +95,6 @@ extern void pidmap_init(void);extern void prio_tree_init (void );extern void radix_tree_init (void );extern void free_initmem (void ); -extern void driver_init (void );extern void prepare_namespace (void );#ifdef CONFIG_ACPI extern void acpi_early_init (void );
Signature · 1 line
1.4.4.2