From 1f6ad287e84a7215de43bd9702be387f604bf051 Mon Sep 17 00:00:00 2001 From: Greg Howard Date: Sun, 23 Apr 2006 17:10:42 +0000 Subject: [PATCH] Altix snsc: duplicate kobject fix Fix Altix system controller (snsc) device names to include the slot number of the blade whose associated system controller is the target of the device interface. Including the slot number avoids a problem we're currently having where slots within the same enclosure are attempting to create multiple kobjects with identical names. Signed-off-by: Greg Howard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/char/snsc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/char') diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index 0e7d216e7eb..d22da98dfe4 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c @@ -391,7 +391,8 @@ scdrv_init(void) format_module_id(devnamep, geo_module(geoid), MODULE_FORMAT_BRIEF); devnamep = devname + strlen(devname); - sprintf(devnamep, "#%d", geo_slab(geoid)); + sprintf(devnamep, "^%d#%d", geo_slot(geoid), + geo_slab(geoid)); /* allocate sysctl device data */ scd = kmalloc(sizeof (struct sysctl_data_s), -- cgit v1.2.3-18-g5258