5 files changed, 54 insertions, 23 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 2180c88cfe89..bb19c1561f1e 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -77,14 +77,20 @@ cc-option-align = $(subst -functions=0,,\
 
 # cc-version
 # Usage gcc-ver := $(call cc-version, $(CC))
-cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh \
-              $(if $(1), $(1), $(CC)))
+cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
 
 # cc-ifversion
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
 cc-ifversion = $(shell if [ $(call cc-version, $(CC)) $(1) $(2) ]; then \
                        echo $(3); fi;)
 
+# ld-option
+# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)
+ld-option = $(shell if $(CC) $(1) \
+                             -nostdlib -o ldtest$$$$.out -xc /dev/null \
+             > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi; \
+             rm -f ldtest$$$$.out)
+
 ###
 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
 # Usage:
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index a49550205dcc..0a64688c2b5d 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -40,7 +40,7 @@ include scripts/Kbuild.include
 include scripts/Makefile.lib
 
 kernelsymfile := $(objtree)/Module.symvers
-modulesymfile := $(KBUILD_EXTMOD)/Modules.symvers
+modulesymfile := $(KBUILD_EXTMOD)/Module.symvers
 
 # Step 1), find all modules listed in $(MODVERDIR)/
 __modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 2ee48c377b66..a69d8acbf274 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -357,7 +357,7 @@ int conf_read(const char *name)
                 for (e = prop->expr; e; e = e->left.expr)
                         if (e->right.sym->visible != no)
                                 flags &= e->right.sym->flags;
-                sym->flags |= flags & SYMBOL_DEF_USER;
+                sym->flags &= flags | ~SYMBOL_DEF_USER;
         }
 
         sym_change_count += conf_warnings || conf_unsaved;
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index f9460a6218de..c9ca0c23bd91 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1518,6 +1518,7 @@ sub dump_function($$) {
     $prototype =~ s/^asmlinkage +//;
     $prototype =~ s/^inline +//;
     $prototype =~ s/^__inline__ +//;
+    $prototype =~ s/__devinit +//;
     $prototype =~ s/^#define +//; #ak added
     $prototype =~ s/__attribute__ \(\([a-z,]*\)\)//;
 
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 37f67c23e11b..44312926b849 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -52,6 +52,23 @@ do {                                                            \
                 sprintf(str + strlen(str), "*");                \
 } while(0)
 
+/**
+ * Check that sizeof(device_id type) are consistent with size of section
+ * in .o file. If in-consistent then userspace and kernel does not agree
+ * on actual size which is a bug.
+ **/
+static void device_id_size_check(const char *modname, const char *device_id,
+                                 unsigned long size, unsigned long id_size)
+{
+        if (size % id_size || size < id_size) {
+                fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
+                      "of the size of section __mod_%s_device_table=%lu.\n"
+                      "Fix definition of struct %s_device_id "
+                      "in mod_devicetable.h\n",
+                      modname, device_id, id_size, device_id, size, device_id);
+        }
+}
+
 /* USB is special because the bcdDevice can be matched against a numeric range */
 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */
 static void do_usb_entry(struct usb_device_id *id,
@@ -152,10 +169,8 @@ static void do_usb_table(void *symval, unsigned long size,
         unsigned int i;
         const unsigned long id_size = sizeof(struct usb_device_id);
 
-        if (size % id_size || size < id_size) {
-                warn("%s ids %lu bad size "
-                     "(each on %lu)\n", mod->name, size, id_size);
-        }
+        device_id_size_check(mod->name, "usb", size, id_size);
+
         /* Leave last one: it's the terminator. */
         size -= id_size;
 
@@ -434,6 +449,7 @@ static inline int sym_is(const char *symbol, const char *name)
 
 static void do_table(void *symval, unsigned long size,
                      unsigned long id_size,
+                     const char *device_id,
                      void *function,
                      struct module *mod)
 {
@@ -441,10 +457,7 @@ static void do_table(void *symval, unsigned long size,
         char alias[500];
         int (*do_entry)(const char *, void *entry, char *alias) = function;
 
-        if (size % id_size || size < id_size) {
-                warn("%s ids %lu bad size "
-                     "(each on %lu)\n", mod->name, size, id_size);
-        }
+        device_id_size_check(mod->name, device_id, size, id_size);
         /* Leave last one: it's the terminator. */
         size -= id_size;
 
@@ -476,40 +489,51 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 + sym->st_value;
 
         if (sym_is(symname, "__mod_pci_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct pci_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct pci_device_id), "pci",
                          do_pci_entry, mod);
         else if (sym_is(symname, "__mod_usb_device_table"))
                 /* special case to handle bcdDevice ranges */
                 do_usb_table(symval, sym->st_size, mod);
         else if (sym_is(symname, "__mod_ieee1394_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct ieee1394_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct ieee1394_device_id), "ieee1394",
                          do_ieee1394_entry, mod);
         else if (sym_is(symname, "__mod_ccw_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct ccw_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct ccw_device_id), "ccw",
                          do_ccw_entry, mod);
         else if (sym_is(symname, "__mod_serio_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct serio_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct serio_device_id), "serio",
                          do_serio_entry, mod);
         else if (sym_is(symname, "__mod_pnp_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct pnp_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct pnp_device_id), "pnp",
                          do_pnp_entry, mod);
         else if (sym_is(symname, "__mod_pnp_card_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct pnp_card_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct pnp_card_device_id), "pnp_card",
                          do_pnp_card_entry, mod);
         else if (sym_is(symname, "__mod_pcmcia_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct pcmcia_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct pcmcia_device_id), "pcmcia",
                          do_pcmcia_entry, mod);
         else if (sym_is(symname, "__mod_of_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct of_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct of_device_id), "of",
                          do_of_entry, mod);
         else if (sym_is(symname, "__mod_vio_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct vio_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct vio_device_id), "vio",
                          do_vio_entry, mod);
         else if (sym_is(symname, "__mod_i2c_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct i2c_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct i2c_device_id), "i2c",
                          do_i2c_entry, mod);
         else if (sym_is(symname, "__mod_input_device_table"))
-                do_table(symval, sym->st_size, sizeof(struct input_device_id),
+                do_table(symval, sym->st_size,
+                         sizeof(struct input_device_id), "input",
                          do_input_entry, mod);
 }