3 files changed, 25 insertions, 0 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 3d523899fd..4f5ff19b99 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -63,6 +63,13 @@ as-option = $(shell if $(CC) $(CFLAGS) $(1) -Wa,-Z -c -o /dev/null \
              -xassembler /dev/null > /dev/null 2>&1; then echo "$(1)"; \
              else echo "$(2)"; fi ;)
 
+# as-instr
+# Usage: cflags-y += $(call as-instr, instr, option1, option2)
+
+as-instr = $(shell if echo -e "$(1)" | $(AS) >/dev/null 2>&1 -W -Z -o astest$$$$.out ; \
+                   then echo "$(2)"; else echo "$(3)"; fi; \
+                   rm -f astest$$$$.out)
+
 # cc-option
 # Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586)
 
diff --git a/scripts/gcc-x86_64-has-stack-protector.sh b/scripts/gcc-x86_64-has-stack-protector.sh
new file mode 100644
index 0000000000..325c0a1b03
--- /dev/null
+++ b/scripts/gcc-x86_64-has-stack-protector.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "int foo(void) { char X[200]; return 3; }" | $1 -S -xc -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+if [ "$?" -eq "0" ] ; then
+        echo $2
+fi
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index de76da8044..f61c9ccef6 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -444,6 +444,14 @@ static int do_input_entry(const char *filename, struct input_device_id *id,
         return 1;
 }
 
+static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
+                char *alias)
+{
+        if (eisa->sig[0])
+                sprintf(alias, EISA_DEVICE_MODALIAS_FMT "*", eisa->sig);
+        return 1;
+}
+
 /* Ignore any prefix, eg. v850 prepends _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -547,6 +555,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct input_device_id), "input",
                          do_input_entry, mod);
+        else if (sym_is(symname, "__mod_eisa_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct eisa_device_id), "eisa",
+                         do_eisa_entry, mod);
 }
 
 /* Now add out buffered information to the generated C source */