Contents of /trunk/kernel26-magellan/patches-2.6.16-r12/0116-2.6.16.12-kobject-fix.patch
Parent Directory
| 
Revision Log
Revision 72 -
(show annotations)
(download)
Mon Jun 5 09:25:38 2006 UTC (17 years, 11 months ago) by niro
File size: 1263 byte(s)
Mon Jun 5 09:25:38 2006 UTC (17 years, 11 months ago) by niro
File size: 1263 byte(s)
ver bump to 2.6.16-r12: - updated to linux-2.6.16.19 - updated to ck11
| 1 | From: Greg Howard <ghoward@sgi.com> |
| 2 | Date: Sun, 23 Apr 2006 17:10:42 +0000 (+0000) |
| 3 | Subject: [PATCH] Altix snsc: duplicate kobject fix |
| 4 | X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/stable/linux-2.6.16.y.git;a=commitdiff;h=1f6ad287e84a7215de43bd9702be387f604bf051 |
| 5 | |
| 6 | [PATCH] Altix snsc: duplicate kobject fix |
| 7 | |
| 8 | Fix Altix system controller (snsc) device names to include the slot number |
| 9 | of the blade whose associated system controller is the target of the device |
| 10 | interface. Including the slot number avoids a problem we're currently |
| 11 | having where slots within the same enclosure are attempting to create |
| 12 | multiple kobjects with identical names. |
| 13 | |
| 14 | Signed-off-by: Greg Howard <ghoward@sgi.com> |
| 15 | Signed-off-by: Andrew Morton <akpm@osdl.org> |
| 16 | Signed-off-by: Linus Torvalds <torvalds@osdl.org> |
| 17 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| 18 | --- |
| 19 | |
| 20 | --- a/drivers/char/snsc.c |
| 21 | +++ b/drivers/char/snsc.c |
| 22 | @@ -391,7 +391,8 @@ scdrv_init(void) |
| 23 | format_module_id(devnamep, geo_module(geoid), |
| 24 | MODULE_FORMAT_BRIEF); |
| 25 | devnamep = devname + strlen(devname); |
| 26 | - sprintf(devnamep, "#%d", geo_slab(geoid)); |
| 27 | + sprintf(devnamep, "^%d#%d", geo_slot(geoid), |
| 28 | + geo_slab(geoid)); |
| 29 | |
| 30 | /* allocate sysctl device data */ |
| 31 | scd = kmalloc(sizeof (struct sysctl_data_s), |