Commit 8c4335a8 authored by akpm@osdl.org's avatar akpm@osdl.org Committed by Linus Torvalds

[PATCH] Altix snsc: duplicate kobject fix

from: Greg Howard <ghoward@sgi.com>

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: default avatarGreg Howard <ghoward@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5b201927
...@@ -390,7 +390,8 @@ scdrv_init(void) ...@@ -390,7 +390,8 @@ scdrv_init(void)
format_module_id(devnamep, geo_module(geoid), format_module_id(devnamep, geo_module(geoid),
MODULE_FORMAT_BRIEF); MODULE_FORMAT_BRIEF);
devnamep = devname + strlen(devname); devnamep = devname + strlen(devname);
sprintf(devnamep, "#%d", geo_slab(geoid)); sprintf(devnamep, "^%d#%d", geo_slot(geoid),
geo_slab(geoid));
/* allocate sysctl device data */ /* allocate sysctl device data */
scd = kzalloc(sizeof (struct sysctl_data_s), scd = kzalloc(sizeof (struct sysctl_data_s),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment