Skip to contentSkip to conversation

s390 - fix match in ccw modalias

PATCH In review Bastian Blank 3 participants 3 messages Mar 6, 2006 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390 - fix match in ccw modalias

Hi folks

The attached patch fixes matching of devmodel in modaliases.

Martin: can you please push them through for 2.6.16? It breaks automatic loading of any dasd module.

Bastian

Signature · 2 lines
The sight of death frightens them [Earthers].
		-- Kras the Klingon, "Friday's Child", stardate 3497.2
scripts/mod/file2alias.c +1 -1
index be97caf..c164b23 100644
@@ -246,7 +246,7 @@ static int do_ccw_entry(const char *file
 	    id->cu_model);
 	ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
 	    id->dev_type);
-	ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
+	ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
 	    id->dev_model);
 	return 1;
 }
#1 lore raw

scripts/mod/file2alias.c static int do_ccw_entry(const char *file · line 252

Quoted 13 lines · On Mon, 6 Mar 2006 03:00:24 +0100 Bastian Blank <[email protected]> wrote:
scripts/mod/file2alias.c +1 -1
index be97caf..c164b23 100644
@@ -246,7 +246,7 @@ static int do_ccw_entry(const char *file
 	    id->cu_model);
 	ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
 	    id->dev_type);
-	ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
+	ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
 	    id->dev_model);
 	return 1;
 }

Patch makes sense to me.

Quoted 2 lines

Martin: can you please push them through for 2.6.16? It breaks automatic loading of any dasd module.

I don't know whether Martin is operational this week, but I'd second an inclusion into 2.6.16.

Cornelia

#2 lore raw
Quoted 19 lines · Cornelia Huck

scripts/mod/file2alias.c static int do_ccw_entry(const char *file · line 252

Quoted 13 lines · On Mon, 6 Mar 2006 03:00:24 +0100 Bastian Blank <[email protected]> wrote:
scripts/mod/file2alias.c +1 -1
index be97caf..c164b23 100644
@@ -246,7 +246,7 @@ static int do_ccw_entry(const char *file
          id->cu_model);
      ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
          id->dev_type);
-     ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
+     ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
          id->dev_model);
      return 1;
 }

Patch makes sense to me.

Quoted 5 lines
Quoted 2 lines

Martin: can you please push them through for 2.6.16? It breaks automatic loading of any dasd module.

I don't know whether Martin is operational this week, but I'd second an inclusion into 2.6.16.

No really operational since I'm in Seattle. I'm watching lkml though. The patch makes much sense to me as well and if Cornelia doesn't object the patch should get integrated.

--
blue skies,
Martin