Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits)
  kconfig: fix mconf segmentation fault
  kbuild: enable use of code from a different dir
  kconfig: error out if recursive dependencies are found
  kbuild: scripts/basic/fixdep segfault on pathological string-o-death
  kconfig: correct minor typo in Kconfig warning message.
  kconfig: fix path to modules.txt in Kconfig help
  usr/Kconfig: fix typo
  kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs'
  kbuild: be more explicit on missing .config file
  kbuild: clarify the creation of the LOCALVERSION_AUTO string.
  kbuild: propagate errors from find in scripts/gen_initramfs_list.sh
  kconfig: refer to qt3 if we cannot find qt libraries
  kbuild: handle compressed cpio initramfs-es
  kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text
  kbuild: remove stale comment in modpost.c
  kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE
  kbuild: fix make mrproper for Documentation/DocBook/man
  kbuild: remove kconfig binaries during make mrproper
  kconfig/menuconfig: do not hardcode '.config'
  kbuild: override build timestamp & version
  ...

4 files changed, 122 insertions, 46 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index b2f73ffb40bd..ed1244dd58d0 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -37,7 +37,6 @@ typedef unsigned char	__u8;
  * even potentially has different endianness and word sizes, since
  * we handle those differences explicitly below */
 #include "../../include/linux/mod_devicetable.h"
-#include "../../include/linux/input.h"
 
 #define ADD(str, sep, cond, field)                              \
 do {                                                            \
@@ -416,31 +415,33 @@ static int do_input_entry(const char *filename, struct input_device_id *id,
 
         sprintf(alias + strlen(alias), "-e*");
         if (id->flags & INPUT_DEVICE_ID_MATCH_EVBIT)
-                do_input(alias, id->evbit, 0, EV_MAX);
+                do_input(alias, id->evbit, 0, INPUT_DEVICE_ID_EV_MAX);
         sprintf(alias + strlen(alias), "k*");
         if (id->flags & INPUT_DEVICE_ID_MATCH_KEYBIT)
-                do_input(alias, id->keybit, KEY_MIN_INTERESTING, KEY_MAX);
+                do_input(alias, id->keybit,
+                         INPUT_DEVICE_ID_KEY_MIN_INTERESTING,
+                         INPUT_DEVICE_ID_KEY_MAX);
         sprintf(alias + strlen(alias), "r*");
         if (id->flags & INPUT_DEVICE_ID_MATCH_RELBIT)
-                do_input(alias, id->relbit, 0, REL_MAX);
+                do_input(alias, id->relbit, 0, INPUT_DEVICE_ID_REL_MAX);
         sprintf(alias + strlen(alias), "a*");
         if (id->flags & INPUT_DEVICE_ID_MATCH_ABSBIT)
-                do_input(alias, id->absbit, 0, ABS_MAX);
+                do_input(alias, id->absbit, 0, INPUT_DEVICE_ID_ABS_MAX);
         sprintf(alias + strlen(alias), "m*");
         if (id->flags & INPUT_DEVICE_ID_MATCH_MSCIT)
-                do_input(alias, id->mscbit, 0, MSC_MAX);
+                do_input(alias, id->mscbit, 0, INPUT_DEVICE_ID_MSC_MAX);
         sprintf(alias + strlen(alias), "l*");
         if (id->flags & INPUT_DEVICE_ID_MATCH_LEDBIT)
-                do_input(alias, id->ledbit, 0, LED_MAX);
+                do_input(alias, id->ledbit, 0, INPUT_DEVICE_ID_LED_MAX);
         sprintf(alias + strlen(alias), "s*");
         if (id->flags & INPUT_DEVICE_ID_MATCH_SNDBIT)
-                do_input(alias, id->sndbit, 0, SND_MAX);
+                do_input(alias, id->sndbit, 0, INPUT_DEVICE_ID_SND_MAX);
         sprintf(alias + strlen(alias), "f*");
         if (id->flags & INPUT_DEVICE_ID_MATCH_FFBIT)
-                do_input(alias, id->ffbit, 0, FF_MAX);
+                do_input(alias, id->ffbit, 0, INPUT_DEVICE_ID_FF_MAX);
         sprintf(alias + strlen(alias), "w*");
         if (id->flags & INPUT_DEVICE_ID_MATCH_SWBIT)
-                do_input(alias, id->swbit, 0, SW_MAX);
+                do_input(alias, id->swbit, 0, INPUT_DEVICE_ID_SW_MAX);
         return 1;
 }
 
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 78d659cbb36a..4ab36de45aa2 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -55,6 +55,17 @@ void warn(const char *fmt, ...)
         va_end(arglist);
 }
 
+void merror(const char *fmt, ...)
+{
+        va_list arglist;
+
+        fprintf(stderr, "ERROR: ");
+
+        va_start(arglist, fmt);
+        vfprintf(stderr, fmt, arglist);
+        va_end(arglist);
+}
+
 static int is_vmlinux(const char *modname)
 {
         const char *myname;
@@ -333,10 +344,10 @@ void release_file(void *file, unsigned long size)
         munmap(file, size);
 }
 
-static void parse_elf(struct elf_info *info, const char *filename)
+static int parse_elf(struct elf_info *info, const char *filename)
 {
         unsigned int i;
-        Elf_Ehdr *hdr = info->hdr;
+        Elf_Ehdr *hdr;
         Elf_Shdr *sechdrs;
         Elf_Sym  *sym;
 
@@ -346,9 +357,18 @@ static void parse_elf(struct elf_info *info, const char *filename)
                 exit(1);
         }
         info->hdr = hdr;
-        if (info->size < sizeof(*hdr))
-                goto truncated;
-
+        if (info->size < sizeof(*hdr)) {
+                /* file too small, assume this is an empty .o file */
+                return 0;
+        }
+        /* Is this a valid ELF file? */
+        if ((hdr->e_ident[EI_MAG0] != ELFMAG0) ||
+            (hdr->e_ident[EI_MAG1] != ELFMAG1) ||
+            (hdr->e_ident[EI_MAG2] != ELFMAG2) ||
+            (hdr->e_ident[EI_MAG3] != ELFMAG3)) {
+                /* Not an ELF file - silently ignore it */
+                return 0;
+        }
         /* Fix endianness in ELF header */
         hdr->e_shoff    = TO_NATIVE(hdr->e_shoff);
         hdr->e_shstrndx = TO_NATIVE(hdr->e_shstrndx);
@@ -371,8 +391,10 @@ static void parse_elf(struct elf_info *info, const char *filename)
                         = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
                 const char *secname;
 
-                if (sechdrs[i].sh_offset > info->size)
-                        goto truncated;
+                if (sechdrs[i].sh_offset > info->size) {
+                        fatal("%s is truncated. sechdrs[i].sh_offset=%u > sizeof(*hrd)=%ul\n", filename, (unsigned int)sechdrs[i].sh_offset, sizeof(*hdr));
+                        return 0;
+                }
                 secname = secstrings + sechdrs[i].sh_name;
                 if (strcmp(secname, ".modinfo") == 0) {
                         info->modinfo = (void *)hdr + sechdrs[i].sh_offset;
@@ -407,10 +429,7 @@ static void parse_elf(struct elf_info *info, const char *filename)
                 sym->st_value = TO_NATIVE(sym->st_value);
                 sym->st_size  = TO_NATIVE(sym->st_size);
         }
-        return;
-
- truncated:
-        fatal("%s is truncated.\n", filename);
+        return 1;
 }
 
 static void parse_elf_finish(struct elf_info *info)
@@ -581,9 +600,17 @@ static int strrcmp(const char *s, const char *sub)
  *   the pattern is identified by:
  *   tosec   = .init.text | .exit.text | .init.data
  *   fromsec = .data
- *   atsym = *driver, *_template, *_sht, *_ops, *_probe, *probe_one
+ *   atsym = *driver, *_template, *_sht, *_ops, *_probe, *probe_one, *_console
  *
  * Pattern 3:
+ *   Whitelist all references from .pci_fixup* section to .init.text
+ *   This is part of the PCI init when built-in
+ *
+ * Pattern 4:
+ *   Whitelist all refereces from .text.head to .init.data
+ *   Whitelist all refereces from .text.head to .init.text
+ *
+ * Pattern 5:
  *   Some symbols belong to init section but still it is ok to reference
  *   these from non-init sections as these symbols don't have any memory
  *   allocated for them and symbol address and value are same. So even
@@ -591,6 +618,30 @@ static int strrcmp(const char *s, const char *sub)
  *   For ex. symbols marking the init section boundaries.
  *   This pattern is identified by
  *   refsymname = __init_begin, _sinittext, _einittext
+ *
+ * Pattern 6:
+ *   During the early init phase we have references from .init.text to
+ *   .text we have an intended section mismatch - do not warn about it.
+ *   See kernel_init() in init/main.c
+ *   tosec   = .init.text
+ *   fromsec = .text
+ *   atsym = kernel_init
+ *
+ * Pattern 7:
+ *  Logos used in drivers/video/logo reside in __initdata but the
+ *  funtion that references them are EXPORT_SYMBOL() so cannot be
+ *  marker __init. So we whitelist them here.
+ *  The pattern is:
+ *  tosec      = .init.data
+ *  fromsec    = .text*
+ *  refsymname = logo_
+ *
+ * Pattern 8:
+ *  Symbols contained in .paravirtprobe may safely reference .init.text.
+ *  The pattern is:
+ *  tosec   = .init.text
+ *  fromsec  = .paravirtprobe
+ *
  **/
 static int secref_whitelist(const char *modname, const char *tosec,
                             const char *fromsec, const char *atsym,
@@ -642,25 +693,39 @@ static int secref_whitelist(const char *modname, const char *tosec,
         if (f1 && f2)
                 return 1;
 
-        /* Whitelist all references from .pci_fixup section if vmlinux
-         * Whitelist all refereces from .text.head to .init.data if vmlinux
-         * Whitelist all refereces from .text.head to .init.text if vmlinux
-         */
-        if (is_vmlinux(modname)) {
-                if ((strcmp(fromsec, ".pci_fixup") == 0) &&
-                    (strcmp(tosec, ".init.text") == 0))
+        /* Check for pattern 3 */
+        if ((strncmp(fromsec, ".pci_fixup", strlen(".pci_fixup")) == 0) &&
+            (strcmp(tosec, ".init.text") == 0))
+        return 1;
+
+        /* Check for pattern 4 */
+        if ((strcmp(fromsec, ".text.head") == 0) &&
+                ((strcmp(tosec, ".init.data") == 0) ||
+                (strcmp(tosec, ".init.text") == 0)))
+        return 1;
+
+        /* Check for pattern 5 */
+        for (s = pat3refsym; *s; s++)
+                if (strcmp(refsymname, *s) == 0)
+                        return 1;
+
+        /* Check for pattern 6 */
+        if ((strcmp(tosec, ".init.text") == 0) &&
+            (strcmp(fromsec, ".text") == 0) &&
+            (strcmp(refsymname, "kernel_init") == 0))
                 return 1;
 
-                if ((strcmp(fromsec, ".text.head") == 0) &&
-                        ((strcmp(tosec, ".init.data") == 0) ||
-                        (strcmp(tosec, ".init.text") == 0)))
+        /* Check for pattern 7 */
+        if ((strcmp(tosec, ".init.data") == 0) &&
+            (strncmp(fromsec, ".text", strlen(".text")) == 0) &&
+            (strncmp(refsymname, "logo_", strlen("logo_")) == 0))
+                return 1;
+
+        /* Check for pattern 8 */
+        if ((strcmp(tosec, ".init.text") == 0) &&
+            (strcmp(fromsec, ".paravirtprobe") == 0))
                 return 1;
 
-                /* Check for pattern 3 */
-                for (s = pat3refsym; *s; s++)
-                        if (strcmp(refsymname, *s) == 0)
-                                return 1;
-        }
         return 0;
 }
 
@@ -1090,7 +1155,8 @@ static void read_symbols(char *modname)
         struct elf_info info = { };
         Elf_Sym *sym;
 
-        parse_elf(&info, modname);
+        if (!parse_elf(&info, modname))
+                return;
 
         mod = new_module(modname);
 
@@ -1265,9 +1331,14 @@ static int add_versions(struct buffer *b, struct module *mod)
                 exp = find_symbol(s->name);
                 if (!exp || exp->module == mod) {
                         if (have_vmlinux && !s->weak) {
-                                warn("\"%s\" [%s.ko] undefined!\n",
-                                     s->name, mod->name);
-                                err = warn_unresolved ? 0 : 1;
+                                if (warn_unresolved) {
+                                        warn("\"%s\" [%s.ko] undefined!\n",
+                                             s->name, mod->name);
+                                } else {
+                                        merror("\"%s\" [%s.ko] undefined!\n",
+                                                  s->name, mod->name);
+                                        err = 1;
+                                }
                         }
                         continue;
                 }
@@ -1318,6 +1389,7 @@ static void add_depends(struct buffer *b, struct module *mod,
         buf_printf(b, "__attribute__((section(\".modinfo\"))) =\n");
         buf_printf(b, "\"depends=");
         for (s = mod->unres; s; s = s->next) {
+                const char *p;
                 if (!s->module)
                         continue;
 
@@ -1325,8 +1397,11 @@ static void add_depends(struct buffer *b, struct module *mod,
                         continue;
 
                 s->module->seen = 1;
-                buf_printf(b, "%s%s", first ? "" : ",",
-                           strrchr(s->module->name, '/') + 1);
+                if ((p = strrchr(s->module->name, '/')) != NULL)
+                        p++;
+                else
+                        p = s->module->name;
+                buf_printf(b, "%s%s", first ? "" : ",", p);
                 first = 0;
         }
         buf_printf(b, "\";\n");
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index d398c61e55ef..0858caa9c03f 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -145,3 +145,4 @@ void release_file(void *file, unsigned long size);
 
 void fatal(const char *fmt, ...);
 void warn(const char *fmt, ...);
+void merror(const char *fmt, ...);
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 8a2875689e4d..6873d5af80d5 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -397,10 +397,9 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen)
                 (int) strlen(basename) - 2, basename);
 
         file = grab_file(filelist, &len);
-        if (!file) {
-                warn("could not find versions for %s\n", filelist);
+        if (!file)
+                /* not a module or .mod file missing - ignore */
                 return;
-        }
 
         sources = strchr(file, '\n');
         if (!sources) {