diff options
| author | akpm@osdl.org <akpm@osdl.org> | 2006-04-22 11:36:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-22 18:19:53 +0200 |
| commit | 8c4335a87c9785d2102ab23f09393038e1663314 (patch) | |
| tree | ba1a2301512c4c22336f5cdaf18154a295b898d6 /drivers/char/snsc.c | |
| parent | [PATCH] x86_64: Fix a race in the free_iommu path (diff) | |
| download | linux-8c4335a87c9785d2102ab23f09393038e1663314.tar.xz linux-8c4335a87c9785d2102ab23f09393038e1663314.zip | |
[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: Greg Howard <ghoward@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/snsc.c')
| -rw-r--r-- | drivers/char/snsc.c | 3 |
1 files changed, 2 insertions, 1 deletions
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), |