2 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c
index 2dfa52bcdfe2..5502b289341b 100644
--- a/arch/x86/kernel/cpu/match.c
+++ b/arch/x86/kernel/cpu/match.c
@@ -63,7 +63,7 @@ ssize_t arch_print_cpu_modalias(struct device *dev,
                 boot_cpu_data.x86_model);
         size -= n;
         buf += n;
-        size -= 2;
+        size -= 1;
         for (i = 0; i < NCAPINTS*32; i++) {
                 if (boot_cpu_has(i)) {
                         n = snprintf(buf, size, ",%04X", i);
@@ -75,7 +75,6 @@ ssize_t arch_print_cpu_modalias(struct device *dev,
                         buf += n;
                 }
         }
-        *buf++ = ',';
         *buf++ = '\n';
         return buf - bufptr;
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index a468af059834..78fd81fb9732 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1021,8 +1021,9 @@ static int do_x86cpu_entry(const char *filename, struct x86_cpu_id *id,
         ADD(alias, "vendor:",  id->vendor != X86_VENDOR_ANY, id->vendor);
         ADD(alias, ":family:", id->family != X86_FAMILY_ANY, id->family);
         ADD(alias, ":model:",  id->model  != X86_MODEL_ANY,  id->model);
-        ADD(alias, ":feature:*,", id->feature != X86_FEATURE_ANY, id->feature);
-        strcat(alias, ",*");
+        strcat(alias, ":feature:*");
+        if (id->feature != X86_FEATURE_ANY)
+                sprintf(alias + strlen(alias), "%04X*", id->feature);
         return 1;
 }
 ADD_TO_DEVTABLE("x86cpu", struct x86_cpu_id, do_x86cpu_entry);