From: akpm@osdl.org Date: Sat, 22 Apr 2006 09:36:15 +0000 (-0700) Subject: [PATCH] Altix snsc: duplicate kobject fix X-Git-Tag: MMI-PSA29.97-13-9~50010 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c4335a87c9785d2102ab23f09393038e1663314;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [PATCH] Altix snsc: duplicate kobject fix from: Greg Howard 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 --- diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index b543821d8cb4..56c8243cdb73 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c @@ -390,7 +390,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 = kzalloc(sizeof (struct sysctl_data_s),