The patch titled
eisa-bus-modalias-attributes-support-1 fix
has been added to the -mm tree. Its filename is
eisa-bus-modalias-attributes-support-1-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: eisa-bus-modalias-attributes-support-1 fix
From: Michael Tokarev <mjt@xxxxxxxxxx>
Fix two issues discovered in eisa-modalias-1.patch:
o unsigned long should really be kernel_ulong_t in mod_devicetable.h,
so that cross-compiling will work (correct sizeof in file2alias.c)
o don't emit eisa aliases for empty (trailing/terminating)
eisa_device_id entries.
Signed-off-by: Michael Tokarev <mjt@xxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/mod_devicetable.h | 2 +-
scripts/mod/file2alias.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff -puN include/linux/mod_devicetable.h~eisa-bus-modalias-attributes-support-1-fix include/linux/mod_devicetable.h
--- a/include/linux/mod_devicetable.h~eisa-bus-modalias-attributes-support-1-fix
+++ a/include/linux/mod_devicetable.h
@@ -304,7 +304,7 @@ struct input_device_id {
/* The EISA signature, in ASCII form, null terminated */
struct eisa_device_id {
char sig[EISA_SIG_LEN];
- unsigned long driver_data;
+ kernel_ulong_t driver_data;
};
#define EISA_DEVICE_MODALIAS_FMT "eisa:s%s"
diff -puN scripts/mod/file2alias.c~eisa-bus-modalias-attributes-support-1-fix scripts/mod/file2alias.c
--- a/scripts/mod/file2alias.c~eisa-bus-modalias-attributes-support-1-fix
+++ a/scripts/mod/file2alias.c
@@ -439,7 +439,8 @@ static int do_input_entry(const char *fi
static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
char *alias)
{
- sprintf(alias, EISA_DEVICE_MODALIAS_FMT "*", eisa->sig);
+ if (eisa->sig[0])
+ sprintf(alias, EISA_DEVICE_MODALIAS_FMT "*", eisa->sig);
return 1;
}
_
Patches currently in -mm which might be from mjt@xxxxxxxxxx are
eisa-bus-modalias-attributes-support-1.patch
eisa-bus-modalias-attributes-support-1-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
