Merge commit 'v2.6.35' into kbuild/kconfig

Conflicts:
	scripts/kconfig/Makefile

22 files changed, 670 insertions, 402 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
index 52cab46ae35a..c5d5db54c009 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -6,5 +6,4 @@ kallsyms
 pnmtologo
 bin2c
 unifdef
-binoffset
 ihex2fw
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index f3ccdb1b302b..54fd1b700131 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -245,3 +245,7 @@ quiet_cmd_lzo = LZO     $@
 cmd_lzo = (cat $(filter-out FORCE,$^) | \
         lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
         (rm -f $@ ; false)
+
+# misc stuff
+# ---------------------------------------------------------------------------
+quote:="
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
index 102a276f6eea..1adb974e6950 100644
--- a/scripts/Makefile.modbuiltin
+++ b/scripts/Makefile.modbuiltin
@@ -14,6 +14,11 @@ __modbuiltin:
 
 include scripts/Kbuild.include
 
+ifneq ($(KBUILD_SRC),)
+# Create output directory if not already present
+_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
+endif
+
 # The filename Kbuild has precedence over Makefile
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
 kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
diff --git a/scripts/binoffset.c b/scripts/binoffset.c
deleted file mode 100644
index 1a2e39b8e3e5..000000000000
--- a/scripts/binoffset.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/***************************************************************************
- * binoffset.c
- * (C) 2002 Randy Dunlap <rdunlap@xenotime.net>
-
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# binoffset.c:
-# - searches a (binary) file for a specified (binary) pattern
-# - returns the offset of the located pattern or ~0 if not found
-# - exits with exit status 0 normally or non-0 if pattern is not found
-#   or any other error occurs.
-
-****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#define VERSION         "0.1"
-#define BUF_SIZE        (16 * 1024)
-#define PAT_SIZE        100
-
-char            *progname;
-char            *inputname;
-int             inputfd;
-unsigned int    bix;                    /* buf index */
-unsigned char   patterns [PAT_SIZE] = {0}; /* byte-sized pattern array */
-int             pat_len;                /* actual number of pattern bytes */
-unsigned char   *madr;                  /* mmap address */
-size_t          filesize;
-int             num_matches = 0;
-off_t           firstloc = 0;
-
-void usage (void)
-{
-        fprintf (stderr, "%s ver. %s\n", progname, VERSION);
-        fprintf (stderr, "usage:  %s filename pattern_bytes\n",
-                        progname);
-        fprintf (stderr, "        [prints location of pattern_bytes in file]\n");
-        exit (1);
-}
-
-void get_pattern (int pat_count, char *pats [])
-{
-        int ix, err, tmp;
-
-#ifdef DEBUG
-        fprintf (stderr,"get_pattern: count = %d\n", pat_count);
-        for (ix = 0; ix < pat_count; ix++)
-                fprintf (stderr, "  pat # %d:  [%s]\n", ix, pats[ix]);
-#endif
-
-        for (ix = 0; ix < pat_count; ix++) {
-                tmp = 0;
-                err = sscanf (pats[ix], "%5i", &tmp);
-                if (err != 1 || tmp > 0xff) {
-                        fprintf (stderr, "pattern or value error in pattern # %d [%s]\n",
-                                        ix, pats[ix]);
-                        usage ();
-                }
-                patterns [ix] = tmp;
-        }
-        pat_len = pat_count;
-}
-
-void search_pattern (void)
-{
-        for (bix = 0; bix < filesize; bix++) {
-                if (madr[bix] == patterns[0]) {
-                        if (memcmp (&madr[bix], patterns, pat_len) == 0) {
-                                if (num_matches == 0)
-                                        firstloc = bix;
-                                num_matches++;
-                        }
-                }
-        }
-}
-
-#ifdef NOTDEF
-size_t get_filesize (int fd)
-{
-        off_t end_off = lseek (fd, 0, SEEK_END);
-        lseek (fd, 0, SEEK_SET);
-        return (size_t) end_off;
-}
-#endif
-
-size_t get_filesize (int fd)
-{
-        int err;
-        struct stat stat;
-
-        err = fstat (fd, &stat);
-        fprintf (stderr, "filesize: %ld\n", err < 0 ? (long)err : stat.st_size);
-        if (err < 0)
-                return err;
-        return (size_t) stat.st_size;
-}
-
-int main (int argc, char *argv [])
-{
-        progname = argv[0];
-
-        if (argc < 3)
-                usage ();
-
-        get_pattern (argc - 2, argv + 2);
-