Merge /spare/repo/linux-2.6/

29 files changed, 543 insertions, 485 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
new file mode 100644
index 000000000000..9087273abf91
--- /dev/null
+++ b/scripts/Kbuild.include
@@ -0,0 +1,96 @@
+####
+# kbuild: Generic definitions
+
+# Convinient variables
+comma   := ,
+empty   :=
+space   := $(empty) $(empty)
+
+###
+# The temporary file to save gcc -MD generated dependencies must not
+# contain a comma
+depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
+
+###
+# filechk is used to check if the content of a generated file is updated.
+# Sample usage:
+# define filechk_sample
+#       echo $KERNELRELEASE
+# endef
+# version.h : Makefile
+#       $(call filechk,sample)
+# The rule defined shall write to stdout the content of the new file.
+# The existing file will be compared with the new one.
+# - If no file exist it is created
+# - If the content differ the new file is used
+# - If they are equal no change, and no timestamp update
+# - stdin is piped in from the first prerequisite ($<) so one has
+#   to specify a valid file as first prerequisite (often the kbuild file)
+define filechk
+        $(Q)set -e;                             \
+        echo '  CHK     $@';                    \
+        mkdir -p $(dir $@);                     \
+        $(filechk_$(1)) < $< > $@.tmp;          \
+        if [ -r $@ ] && cmp -s $@ $@.tmp; then  \
+                rm -f $@.tmp;                   \
+        else                                    \
+                echo '  UPD     $@';            \
+                mv -f $@.tmp $@;                \
+        fi
+endef
+
+###
+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
+# Usage:
+# $(Q)$(MAKE) $(build)=dir
+build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
+
+# If quiet is set, only print short version of command
+cmd = @$(if $($(quiet)cmd_$(1)),\
+      echo '  $(subst ','\'',$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))
+
+###
+# if_changed      - execute command if any prerequisite is newer than 
+#                   target, or command line has changed
+# if_changed_dep  - as if_changed, but uses fixdep to reveal dependencies
+#                   including used config symbols
+# if_changed_rule - as if_changed but execute rule instead
+# See Documentation/kbuild/makefiles.txt for more info
+
+ifneq ($(KBUILD_NOCMDDEP),1)
+# Check if both arguments has same arguments. Result in empty string if equal
+# User may override this check using make KBUILD_NOCMDDEP=1
+arg-check = $(strip $(filter-out $(1), $(2)) $(filter-out $(2), $(1)) )
+endif
+
+# echo command. Short version is $(quiet) equals quiet, otherwise full command
+echo-cmd = $(if $($(quiet)cmd_$(1)), \
+        echo '  $(subst ','\'',$($(quiet)cmd_$(1)))';)
+
+# function to only execute the passed command if necessary
+# >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file
+# note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars
+# 
+if_changed = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \
+        @set -e; \
+        $(echo-cmd) \
+        $(cmd_$(1)); \
+        echo 'cmd_$@ := $(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).cmd)
+
+# execute the command and also postprocess generated .d dependencies
+# file
+if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\
+        $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),                  \
+        @set -e; \
+        $(echo-cmd) \
+        $(cmd_$(1)); \
+        scripts/basic/fixdep $(depfile) $@ '$(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \
+        rm -f $(depfile); \
+        mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
+
+# Usage: $(call if_changed_rule,foo)
+# will check if $(cmd_foo) changed, or any of the prequisites changed,
+# and if so will execute $(rule_foo)
+if_changed_rule = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\
+                        @set -e; \
+                        $(rule_$(1)))
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 76ba6be3dfc9..506e3f3befe3 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -10,8 +10,11 @@ __build:
 # Read .config if it exist, otherwise ignore
 -include .config
 
-include $(if $(wildcard $(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile)
+# The filename Kbuild has precedence over Makefile
+kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
+include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
 
+include scripts/Kbuild.include
 include scripts/Makefile.lib
 
 ifdef host-progs
@@ -169,7 +172,7 @@ cmd_modversions =							\
                         -T $(@D)/.tmp_$(@F:.o=.ver);                    \
                 rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);        \
         else                                                            \
-                mv $(@D)/.tmp_$(@F) $@;                                 \
+                mv -f $(@D)/.tmp_$(@F) $@;                              \
         fi;
 endif
 
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index ff3e87dbf387..8974ea5fc878 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -7,7 +7,14 @@ src := $(obj)
 .PHONY: __clean
 __clean:
 
-include $(if $(wildcard $(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile)
+# Shorthand for $(Q)$(MAKE) scripts/Makefile.clean obj=dir
+# Usage:
+# $(Q)$(MAKE) $(clean)=dir
+clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj
+
+# The filename Kbuild has precedence over Makefile
+kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
+include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
 
 # Figure out what we need to build from the various variables
 # ==========================================================================
@@ -87,8 +94,3 @@ $(subdir-ymn):
 # If quiet is set, only print short version of command
 
 cmd = @$(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))' &&) $(cmd_$(1))
-
-# Shorthand for $(Q)$(MAKE) scripts/Makefile.clean obj=dir
-# Usage:
-# $(Q)$(MAKE) $(clean)=dir
-clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 2821a2b83bbb..2d519704b8fd 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -98,7 +98,8 @@ hostcxx_flags  = -Wp,-MD,$(depfile) $(__hostcxx_flags)
 # Create executable from a single .c file
 # host-csingle -> Executable
 quiet_cmd_host-csingle  = HOSTCC  $@
-      cmd_host-csingle  = $(HOSTCC) $(hostc_flags) $(HOST_LOADLIBES) -o $@ $<
+      cmd_host-csingle  = $(HOSTCC) $(hostc_flags) -o $@ $< \
+                $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
 $(host-csingle): %: %.c FORCE
         $(call if_changed_dep,host-csingle)
 
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 7cf75cc4f849..0f81dcfd6909 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -1,13 +1,3 @@
-# ===========================================================================
-# kbuild: Generic definitions
-# ===========================================================================
-
-# Standard vars
-
-comma   := ,
-empty   :=
-space   := $(empty) $(empty)
-
 # Backward compatibility - to be removed...
 extra-y += $(EXTRA_TARGETS)
 # Figure out what we need to build from the various variables
@@ -84,10 +74,6 @@ multi-objs-m	:= $(addprefix $(obj)/,$(multi-objs-m))
 subdir-ym       := $(addprefix $(obj)/,$(subdir-ym))
 obj-dirs        := $(addprefix $(obj)/,$(obj-dirs))
 
-# The temporary file to save gcc -MD generated dependencies must not
-# contain a comma
-depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
-
 # These flags are needed for modversions and compiling, so we define them here
 # already
 # $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will 
@@ -179,89 +165,4 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 quiet_cmd_gzip = GZIP    $@
 cmd_gzip = gzip -f -9 < $< > $@
 
-# ===========================================================================
-# Generic stuff
-# ===========================================================================
-
-ifneq ($(KBUILD_NOCMDDEP),1)
-# Check if both arguments has same arguments. Result in empty string if equal
-# User may override this check using make KBUILD_NOCMDDEP=1
-arg-check = $(strip $(filter-out $(1), $(2)) $(filter-out $(2), $(1)) )
-
-endif
-
-# echo command. Short version is $(quiet) equals quiet, otherwise full command
-echo-cmd = $(if $($(quiet)cmd_$(1)), \
-        echo '  $(subst ','\'',$($(quiet)cmd_$(1)))';)
-
-# function to only execute the passed command if necessary
-# >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file
-# note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars
-# 
-if_changed = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \
-        @set -e; \
-        $(echo-cmd) \
-        $(cmd_$(1)); \
-        echo 'cmd_$@ := $(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).cmd)
-
-
-# execute the command and also postprocess generated .d dependencies
-# file
-
-if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\
-        $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),                  \
-        @set -e; \
-        $(echo-cmd) \
-        $(cmd_$(1)); \
-        scripts/basic/fixdep $(depfile) $@ '$(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \
-        rm -f $(depfile); \
-        mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
-
-# Usage: $(call if_changed_rule,foo)
-# will check if $(cmd_foo) changed, or any of the prequisites changed,
-# and if so will execute $(rule_foo)
-
-if_changed_rule = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\
-                        @set -e; \
-                        $(rule_$(1)))
-
-# If quiet is set, only print short version of command
-
-cmd = @$(if $($(quiet)cmd_$(1)),echo '  $(subst ','\'',$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))
-
-#       $(call descend,<dir>,<target>)
-#       Recursively call a sub-make in <dir> with target <target> 
-# Usage is deprecated, because make do not see this as an invocation of make.
-descend =$(Q)$(MAKE) -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj=$(1) $(2)
-
-# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
-# Usage:
-# $(Q)$(MAKE) $(build)=dir
-build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
-
-# filechk is used to check if the content of a generated file is updated.
-# Sample usage:
-# define filechk_sample
-#       echo $KERNELRELEASE
-# endef
-# version.h : Makefile
-#       $(call filechk,sample)
-# The rule defined shall write to stdout the content of the new file.
-# The existing file will be compared with the new one.
-# - If no file exist it is created
-# - If the content differ the new file is used
-# - If they are equal no change, and no timestamp update
-
-define filechk
-        $(Q)set -e;                             \
-        echo '  CHK     $@';                    \
-        mkdir -p $(dir $@);                     \
-        $(filechk_$(1)) $(2) > $@.tmp;          \
-        if [ -r $@ ] && cmp -s $@ $@.tmp; then  \
-                rm -f $@.tmp;                   \
-        else                                    \
-                echo '  UPD     $@';            \
-                mv -f $@.tmp $@;                \
-        fi
-endef
 
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 85d6494e3c24..23fd1bdc25ce 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -5,7 +5,7 @@
 .PHONY: __modinst
 __modinst:
 
-include scripts/Makefile.lib
+include scripts/Kbuild.include
 
 #
 
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 94b550e21be8..0c4f3a9f2ea9 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -36,6 +36,7 @@
 _modpost: __modpost
 
 include .config
+include scripts/Kbuild.include
 include scripts/Makefile.lib
 
 symverfile := $(objtree)/Module.symvers
diff --git a/scripts/conmakehash.c b/scripts/conmakehash.c
index 93dd23f21ec9..e0c6891a9ad4 100644
--- a/scripts/conmakehash.c
+++ b/scripts/conmakehash.c
@@ -33,7 +33,7 @@ void usage(char *argv0)
 
 int getunicode(char **p0)
 {
-  unsigned char *p = *p0;
+  char *p = *p0;
 
   while (*p == ' ' || *p == '\t')
     p++;
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index d3d2e5341051..d591578bd3b2 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -24,75 +24,37 @@
  *
  */
 
+#define _GNU_SOURCE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
-/* maximum token length used. It doesn't pay to increase it a lot, because
- * very long substrings probably don't repeat themselves too often. */
-#define MAX_TOK_SIZE            11
 #define KSYM_NAME_LEN           127
 
-/* we use only a subset of the complete symbol table to gather the token count,
- * to speed up compression, at the expense of a little compression ratio */
-#define WORKING_SET             1024
-
-/* first find the best token only on the list of tokens that would profit more
- * than GOOD_BAD_THRESHOLD. Only if this list is empty go to the "bad" list.
- * Increasing this value will put less tokens on the "good" list, so the search
- * is faster. However, if the good list runs out of tokens, we must painfully
- * search the bad list. */
-#define GOOD_BAD_THRESHOLD      10
-
-/* token hash parameters */
-#define HASH_BITS               18
-#define HASH_TABLE_SIZE         (1 << HASH_BITS)
-#define HASH_MASK               (HASH_TABLE_SIZE - 1)
-#define HASH_BASE_OFFSET        2166136261U
-#define HASH_FOLD(a)            ((a)&(HASH_MASK))
-
-/* flags to mark symbols */
-#define SYM_FLAG_VALID          1
-#define SYM_FLAG_SAMPLED        2
 
 struct sym_entry {
         unsigned long long addr;
-        char type;
-        unsigned char flags;
-        unsigned char len;
+        unsigned int len;
         unsigned char *sym;
 };
 
 
 static struct sym_entry *table;
-static int size, cnt;
+static unsigned int table_size, table_cnt;
 static unsigned long long _stext, _etext, _sinittext, _einittext, _sextratext, _eextratext;
 static int all_symbols = 0;
 static char symbol_prefix_char = '\0';
 
-struct token {
-        unsigned char data[MAX_TOK_SIZE];
-        unsigned char len;
-        /* profit: the number of bytes that could be saved by inserting this
-         * token into the table */
-        int profit;
-        struct token *next;     /* next token on the hash list */
-        struct token *right;    /* next token on the good/bad list */
-        struct token *left;    /* previous token on the good/bad list */
-        struct token *smaller; /* token that is less one letter than this one */
-        };
-
-struct token bad_head, good_head;
-struct token *hash_table[HASH_TABLE_SIZE];
+int token_profit[0x10000];
 
 /* the table that holds the result of the compression */
-unsigned char best_table[256][MAX_TOK_SIZE+1];
+unsigned char best_table[256][2];
 unsigned char best_table_len[256];
 
 
-static void
-usage(void)
+static void usage(void)
 {
         fprintf(stderr, "Usage: kallsyms [--all-symbols] [--symbol-prefix=<prefix char>] < in.map > out.S\n");
         exit(1);
@@ -102,21 +64,19 @@ usage(void)
  * This ignores the intensely annoying "mapping symbols" found
  * in ARM ELF files: $a, $t and $d.
  */
-static inline int
-is_arm_mapping_symbol(const char *str)
+static inline int is_arm_mapping_symbol(const char *str)
 {
         return str[0] == '$' && strchr("atd", str[1])
                && (str[2] == '\0' || str[2] == '.');
 }
 
-static int
-read_symbol(FILE *in, struct sym_entry *s)
+static int read_symbol(FILE *in, struct sym_entry *s)
 {
         char str[500];
-        char *sym;
+        char *sym, stype;
         int rc;
 
-        rc = fscanf(in, "%llx %c %499s\n", &s->addr, &s->type, str);
+        rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str);
         if (rc != 3) {
                 if (rc != EOF) {
                         /* skip line */
@@ -143,7 +103,7 @@ read_symbol(FILE *in, struct sym_entry *s)
                 _sextratext = s->addr;
         else if (strcmp(sym, "_eextratext") == 0)
                 _eextratext = s->addr;
-        else if (toupper(s->type) == 'A')
+        else if (toupper(stype) == 'A')
         {
                 /* Keep these useful absolute symbols */
                 if (strcmp(sym, "__kernel_syscall_via_break") &&
@@ -153,22 +113,24 @@ read_symbol(FILE *in, struct sym_entry *s)
                         return -1;
 
         }
-        else if (toupper(s->type) == 'U' ||
+        else if (toupper(stype) == 'U' ||
                  is_arm_mapping_symbol(sym))
                 return -1;
+        /* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
+        else if (str[0] == '$')
+                return -1;
 
         /* include the type field in the symbol name, so that it gets
          * compressed together */
         s->len = strlen(str) + 1;
-        s->sym = (char *) malloc(s->len + 1);
-        strcpy(s->sym + 1, str);
-        s->sym[0] = s->type;
+        s->sym = malloc(s->len + 1);
+        strcpy((char *)s->sym + 1, str);
+        s->sym[0] = stype;
 
         return 0;
 }
 
-static int
-symbol_valid(struct sym_entry *s)
+static int symbol_valid(struct sym_entry *s)
 {
         /* Symbols which vary between passes.  Passes 1 and 2 must have
          * identical symbol lists.  The kallsyms_* symbols below are only added
@@ -207,37 +169,36 @@ symbol_valid(struct sym_entry *s)
                  * move then they may get dropped in pass 2, which breaks the
                  * kallsyms rules.
                  */
-                if ((s->addr == _etext && strcmp(s->sym + offset, "_etext")) ||
-                    (s->addr == _einittext && strcmp(s->sym + offset, "_einittext")) ||
-                    (s->addr == _eextratext && strcmp(s->sym + offset, "_eextratext")))
+                if ((s->addr == _etext && strcmp((char*)s->sym + offset, "_etext")) ||
+                    (s->addr == _einittext && strcmp((char*)s->sym + offset, "_einittext")) ||
+                    (s->addr == _eextratext && strcmp((char*)s->sym + offset, "_eextratext")))
                         return 0;
         }
 
         /* Exclude symbols which vary between passes. */
-        if (strstr(s->sym + offset, "_compiled."))
+        if (strstr((char *)s->sym + offset, "_compiled."))
                 return 0;
 
         for (i = 0; special_symbols[i]; i++)
-                if( strcmp(s->sym + offset, special_symbols[i]) == 0 )
+                if( strcmp((char *)s->sym + offset, special_symbols[i]) == 0 )
                         return 0;
 
         return 1;
 }
 
-static void
-read_map(FILE *in)
+static void read_map(FILE *in)
 {
         while (!feof(in)) {
-                if (cnt >= size) {
-                        size += 10000;
-                        table = realloc(table, sizeof(*table) * size);
+                if (table_cnt >= table_size) {
+                        table_size += 10000;
+                        table = realloc(table, sizeof(*table) * table_size);
                         if (!table) {
                                 fprintf(stderr, "out of memory\n");
                                 exit (1);
                         }
                 }
-                if (read_symbol(in, &table[cnt]) == 0)
-                        cnt++;
+                if (read_symbol(in, &table[table_cnt]) == 0)
+                        table_cnt++;
         }
 }
 
@@ -281,10 +242,9 @@ static int expand_symbol(unsigned char *data, int len, char *result)
         return total;
 }
 
-static void
-write_src(void)
+static void write_src(void)
 {
-        int i, k, off, valid;
+        unsigned int i, k, off;
         unsigned int best_idx[256];
         unsigned int *markers;
         char buf[KSYM_NAME_LEN+1];
@@ -301,33 +261,24 @@ write_src(void)
         printf(".data\n");
 
         output_label("kallsyms_addresses");
-        valid = 0;
-        for (i = 0; i < cnt; i++) {
-                if (table[i].flags & SYM_FLAG_VALID) {
-                        printf("\tPTR\t%#llx\n", table[i].addr);
-                        valid++;
-                }
+        for (i = 0; i < table_cnt; i++) {
+                printf("\tPTR\t%#llx\n", table[i].addr);
         }
         printf("\n");
 
         output_label("kallsyms_num_syms");
-        printf("\tPTR\t%d\n", valid);
+        printf("\tPTR\t%d\n", table_cnt);
         printf("\n");
 
         /* table of offset markers, that give the offset in the compressed stream
          * every 256 symbols */
-        markers = (unsigned int *) malloc(sizeof(unsigned int)*((valid + 255) / 256));
+        markers = (unsigned int *) malloc(sizeof(unsigned int) * ((table_cnt + 255) / 256));
 
         output_label("kallsyms_names");
-        valid = 0;
         off = 0;
-        for (i = 0; i < cnt; i++) {
-
-                if (!table[i].flags & SYM_FLAG_VALID)
-                        continue;
-
-                if ((valid & 0xFF) == 0)
-                        markers[valid >> 8] = off;
+        for (i = 0; i < table_cnt; i++) {
+                if ((i & 0xFF) == 0)
+                        markers[i >> 8] = off;
 
                 printf("\t.byte 0x%02x", table[i].len);
                 for (k = 0; k < table[i].len; k++)
@@ -335,12 +286,11 @@ write_src(void)
                 printf("\n");
 
                 off += table[i].len + 1;
-                valid++;
         }
         printf("\n");
 
         output_label("kallsyms_markers");
-        for (i = 0; i < ((valid + 255) >> 8); i++)
+        for (i = 0; i < ((table_cnt + 255) >> 8); i++)
                 printf("\tPTR\t%d\n", markers[i]);
         printf("\n");
 
@@ -350,7 +300,7 @@ write_src(void)
         off = 0;
         for (i = 0; i < 256; i++) {
                 best_idx[i] = off;
-                expand_symbol(best_table[i],best_table_len[i],buf);
+                expand_symbol(best_table[i], best_table_len[i], buf);
                 printf("\t.asciz\t\"%s\"\n", buf);
                 off += strlen(buf) + 1;
         }
@@ -365,153 +315,13 @@ write_src(void)
 
 /* table lookup compression functions */
 
-static inline unsigned int rehash_token(unsigned int hash, unsigned char data)
-{
-        return ((hash * 16777619) ^ data);
-}
-
-static unsigned int hash_token(unsigned char *data, int len)
-{
-        unsigned int hash=HASH_BASE_OFFSET;
-        int i;
-
-        for (i = 0; i < len; i++)
-                hash = rehash_token(hash, data[i]);
-
-        return HASH_FOLD(hash);
-}
-
-/* find a token given its data and hash value */
-static struct token *find_token_hash(unsigned char *data, int len, unsigned int hash)
-{
-        struct token *ptr;
-
-        ptr = hash_table[hash];
-
-        while (ptr) {
-                if ((ptr->len == len) && (memcmp(ptr->data, data, len) == 0))
-                        return ptr;
-                ptr=ptr->next;
-        }
-
-        return NULL;
-}
-
-static inline void insert_token_in_group(struct token *head, struct token *ptr)
-{
-        ptr->right = head->right;
-        ptr->right->left = ptr;
-        head->right = ptr;
-        ptr->left = head;
-}
-
-static inline void remove_token_from_group(struct token *ptr)
-{
-        ptr->left->right = ptr->right;
-        ptr->right->left = ptr->left;
-}
-
-
-/* build the counts for all the tokens that start with "data", and have lenghts
- * from 2 to "len" */
-static void learn_token(unsigned char *data, int len)
-{
-        struct token *ptr,*last_ptr;
-        int i, newprofit;
-        unsigned int hash = HASH_BASE_OFFSET;
-        unsigned int hashes[MAX_TOK_SIZE + 1];
-
-        if (len > MAX_TOK_SIZE)
-                len = MAX_TOK_SIZE;
-
-        /* calculate and store the hash values for all the sub-tokens */
-        hash = rehash_token(hash, data[0]);
-        for (i = 2; i <= len; i++) {
-                hash = rehash_token(hash, data[i-1]);
-                hashes[i] = HASH_FOLD(hash);
-        }
-
-        last_ptr = NULL;
-        ptr = NULL;
-
-        for (i = len; i >= 2; i--) {
-                hash = hashes[i];
-
-                if (!ptr) ptr = find_token_hash(data, i, hash);
-
-                if (!ptr) {
-                        /* create a new token entry */
-                        ptr = (struct token *) malloc(sizeof(*ptr));
-
-                        memcpy(ptr->data, data, i);
-                        ptr->len = i;
-
-                        /* when we create an entry, it's profit is 0 because
-                         * we also take into account the size of the token on
-                         * the compressed table. We then subtract GOOD_BAD_THRESHOLD
-                         * so that the test to see if this token belongs to
-                         * the good or bad list, is a comparison to zero */
-                        ptr->profit = -GOOD_BAD_THRESHOLD;
-
-                        ptr->next = hash_table[hash];
-                        hash_table[hash] = ptr;
-
-                        insert_token_in_group(&bad_head, ptr);
-
-                        ptr->smaller = NULL;
-                } else {
-                        newprofit = ptr->profit + (ptr->len - 1);
-                        /* check to see if this token needs to be moved to a
-                         * different list */
-                        if((ptr->profit < 0) && (newprofit >= 0)) {
-                                remove_token_from_group(ptr);
-                                insert_token_in_group(&good_head,ptr);
-                        }
-                        ptr->profit = newprofit;
-                }
-
-                if (last_ptr) last_ptr->smaller = ptr;
-                last_ptr = ptr;
-
-                ptr = ptr->smaller;
-        }
-}
-
-/* decrease the counts for all the tokens that start with "data", and have lenghts
- * from 2 to "len". This function is much simpler than learn_token because we have
- * more guarantees (tho tokens exist, the ->smaller pointer is set, etc.)
- * The two separate functions exist only because of compression performance */
-static void forget_token(unsigned char *data, int len)
-{
-        struct token *ptr;
-        int i, newprofit;
-        unsigned int hash=0;
-
-        if (len > MAX_TOK_SIZE) len = MAX_TOK_SIZE;
-
-        hash = hash_token(data, len);
-        ptr = find_token_hash(data, len, hash);
-
-        for (i = len; i >= 2; i--) {
-
-                newprofit = ptr->profit - (ptr->len - 1);
-                if ((ptr->profit >= 0) && (newprofit < 0)) {
-                        remove_token_from_group(ptr);
-                        insert_token_in_group(&bad_head, ptr);
-                }
-                ptr->profit=newprofit;
-
-                ptr=ptr->smaller;
-        }
-}
-
 /* count all the possible tokens in a symbol */
 static void learn_symbol(unsigned char *symbol, int len)
 {
         int i;
 
         for (i = 0; i < len - 1; i++)
-                learn_token(symbol + i, len - i);
+                token_profit[ symbol[i] + (symbol[i + 1] << 8) ]++;
 }
 
 /* decrease the count for all the possible tokens in a symbol */
@@ -520,117 +330,90 @@ static void forget_symbol(unsigned char *symbol, int len)
         int i;
 
         for (i = 0; i < len - 1; i++)
-                forget_token(symbol + i, len - i);
+                token_profit[ symbol[i] + (symbol[i + 1] << 8) ]--;
 }
 
-/* set all the symbol flags and do the initial token count */
+/* remove all the invalid symbols from the table and do the initial token count */
 static void build_initial_tok_table(void)
 {
-        int i, use_it, valid;
+        unsigned int i, pos;
 
-        valid = 0;
-        for (i = 0; i < cnt; i++) {
-                table[i].flags = 0;
+        pos = 0;
+        for (i = 0; i < table_cnt; i++) {
                 if ( symbol_valid(&table[i]) ) {
-                        table[i].flags |= SYM_FLAG_VALID;
-                        valid++;
+                        if (pos != i)
+                                table[pos] = table[i];
+                        learn_symbol(table[pos].sym, table[pos].len);
+                        pos++;
                 }
         }
-
-        use_it = 0;
-        for (i = 0; i < cnt; i++) {
-
-                /* subsample the available symbols. This method is almost like
-                 * a Bresenham's algorithm to get uniformly distributed samples
-                 * across the symbol table */
-                if (table[i].flags & SYM_FLAG_VALID) {
-
-                        use_it += WORKING_SET;
-
-                        if (use_it >= valid) {
-                                table[i].flags |= SYM_FLAG_SAMPLED;
-                                use_it -= valid;
-                        }
-                }
-                if (table[i].flags & SYM_FLAG_SAMPLED)
-                        learn_symbol(table[i].sym, table[i].len);
-        }
+        table_cnt = pos;
 }
 
 /* replace a given token in all the valid symbols. Use the sampled symbols
  * to update the counts */
-static void compress_symbols(unsigned char *str, int tlen, int idx)
+static void compress_symbols(unsigned char *str, int idx)
 {
-        int i, len, learn, size;
-        unsigned char *p;
+        unsigned int i, len, size;
+        unsigned char *p1, *p2;
 
-        for (i = 0; i < cnt; i++) {
-
-                if (!(table[i].flags & SYM_FLAG_VALID)) continue;
+        for (i = 0; i < table_cnt; i++) {
 
                 len = table[i].len;
-                learn = 0;
-                p = table[i].sym;
+                p1 = table[i].sym;
+
+                /* find the token on the symbol */
+                p2 = memmem(p1, len, str, 2);
+                if (!p2) continue;
+
+                /* decrease the counts for this symbol's tokens */
+                forget_symbol(table[i].sym, len);
+
+                size = len;
 
                 do {
+                        *p2 = idx;
+                        p2++;
+                        size -= (p2 - p1);
+                        memmove(p2, p2 + 1, size);
+                        p1 = p2;
+                        len--;
+
+                        if (size < 2) break;
+
                         /* find the token on the symbol */
-                        p = (unsigned char *) strstr((char *) p, (char *) str);
-                        if (!p) break;
-
-                        if (!learn) {
-                                /* if this symbol was used to count, decrease it */
-                                if (table[i].flags & SYM_FLAG_SAMPLED)
-                                        forget_symbol(table[i].sym, len);
-                                learn = 1;
-                        }
+                        p2 = memmem(p1, size, str, 2);
 
-                        *p = idx;
-                        size = (len - (p - table[i].sym)) - tlen + 1;
-                        memmove(p + 1, p + tlen, size);
-                        p++;
-                        len -= tlen - 1;
+                } while (p2);
 
-                } while (size >= tlen);
+                table[i].len = len;
 
-                if(learn) {
-                        table[i].len = len;
-                        /* if this symbol was used to count, learn it again */
-                        if(table[i].flags & SYM_FLAG_SAMPLED)
-                                learn_symbol(table[i].sym, len);
-                }
+                /* increase the counts for this symbol's new tokens */
+                learn_symbol(table[i].sym, len);
         }
 }
 
 /* search the token with the maximum profit */
-static struct token *find_best_token(void)
+static int find_best_token(void)
 {
-        struct token *ptr,*best,*head;
-        int bestprofit;
+        int i, best, bestprofit;
 
         bestprofit=-10000;
+        best = 0;
 
-        /* failsafe: if the "good" list is empty search from the "bad" list */
-        if(good_head.right == &good_head) head = &bad_head;
-        else head = &good_head;
-
-        ptr = head->right;
-        best = NULL;
-        while (ptr != head) {
-                if (ptr->profit > bestprofit) {
-                        bestprofit = ptr->profit;
-                        best = ptr;
+        for (i = 0; i < 0x10000; i++) {
+                if (token_profit[i] > bestprofit) {
+                        best = i;
+                        bestprofit = token_profit[i];
                 }
-                ptr = ptr->right;
         }
-
         return best;
 }
 
 /* this is the core of the algorithm: calculate the "best" table */
 static void optimize_result(void)
 {
-        struct token *best;
-        int i;
+        int i, best;
 
         /* using the '\0' symbol last allows compress_symbols to use standard
          * fast string functions */
@@ -644,14 +427,12 @@ static void optimize_result(void)
                         best = find_best_token();
 
                         /* place it in the "best" table */
-                        best_table_len[i] = best->len;
-                        memcpy(best_table[i], best->data, best_table_len[i]);
-                        /* zero terminate the token so that we can use strstr
-                           in compress_symbols */
-                        best_table[i][best_table_len[i]]='\0';
+                        best_table_len[i] = 2;
+                        best_table[i][0] = best & 0xFF;
+                        best_table[i][1] = (best >> 8) & 0xFF;
 
                         /* replace this token in all the valid symbols */
-                        compress_symbols(best_table[i], best_table_len[i], i);
+                        compress_symbols(best_table[i], i);
                 }
         }
 }
@@ -659,39 +440,28 @@ static void optimize_result(void)
 /* start by placing the symbols that are actually used on the table */
 static void insert_real_symbols_in_table(void)
 {
-        int i, j, c;
+        unsigned int i, j, c;
 
         memset(best_table, 0, sizeof(best_table));
         memset(best_table_len, 0, sizeof(best_table_len));
 
-        for (i = 0; i < cnt; i++) {
-                if (table[i].flags & SYM_FLAG_VALID) {
-                        for (j = 0; j < table[i].len; j++) {
-                                c = table[i].sym[j];
-                                best_table[c][0]=c;
-                                best_table_len[c]=1;
-                        }
+        for (i = 0; i < table_cnt; i++) {
+                for (j = 0; j < table[i].len; j++) {
+                        c = table[i].sym[j];
+                        best_table[c][0]=c;
+                        best_table_len[c]=1;
                 }
         }
 }
 
 static void optimize_token_table(void)
 {
-        memset(hash_table, 0, sizeof(hash_table));
-
-        good_head.left = &good_head;
-        good_head.right = &good_head;
-
-        bad_head.left = &bad_head;
-        bad_head.right = &bad_head;
-
         build_initial_tok_table();
 
         insert_real_symbols_in_table();
 
         /* When valid symbol is not registered, exit to error */
-        if (good_head.left == good_head.right &&
-            bad_head.left == bad_head.right) {
+        if (!table_cnt) {
                 fprintf(stderr, "No valid symbol.\n");
                 exit(1);
         }
@@ -700,8 +470,7 @@ static void optimize_token_table(void)
 }
 
 
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
         if (argc >= 2) {
                 int i;
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 09abb891d11f..2fcb244a9e18 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -27,8 +27,20 @@ update-po-config: $(obj)/kxgettext
         xgettext --default-domain=linux \
           --add-comments --keyword=_ --keyword=N_ \
           --files-from=scripts/kconfig/POTFILES.in \
-        -o scripts/kconfig/linux.pot
-        scripts/kconfig/kxgettext arch/$(ARCH)/Kconfig >> scripts/kconfig/linux.pot
+          --output scripts/kconfig/config.pot
+        $(Q)ln -fs Kconfig_i386 arch/um/Kconfig_arch
+        $(Q)for i in `ls arch/`; \
+        do \
+          scripts/kconfig/kxgettext arch/$$i/Kconfig \
+            | msguniq -o scripts/kconfig/linux_$${i}.pot; \
+        done
+        $(Q)msgcat scripts/kconfig/config.pot \
+          `find scripts/kconfig/ -type f -name linux_*.pot` \
+          --output scripts/kconfig/linux_raw.pot
+        $(Q)msguniq --sort-by-file scripts/kconfig/linux_raw.pot \
+            --output scripts/kconfig/linux.pot
+        $(Q)rm -f arch/um/Kconfig_arch
+        $(Q)rm -f scripts/kconfig/linux_*.pot scripts/kconfig/config.pot
 
 .PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig
 
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
index 1c88d7c6d5a7..abee55ca6174 100644
--- a/scripts/kconfig/kxgettext.c
+++ b/scripts/kconfig/kxgettext.c
@@ -14,6 +14,11 @@ static char *escape(const char* text, char *bf, int len)
 {
         char *bfp = bf;
         int multiline = strchr(text, '\n') != NULL;
+        int eol = 0;
+        int textlen = strlen(text);
+
+        if ((textlen > 0) && (text[textlen-1] == '\n'))
+                eol = 1;
 
         *bfp++ = '"';
         --len;
@@ -43,7 +48,7 @@ next:
                 --len;
         }
 
-        if (multiline)
+        if (multiline && eol)
                 bfp -= 3;
 
         *bfp++ = '"';
@@ -179,7 +184,11 @@ static void message__print_file_lineno(struct message *self)
 {
         struct file_line *fl = self->files;
 
-        printf("\n#: %s:%d", fl->file, fl->lineno);
+        putchar('\n');
+        if (self->option != NULL)
+                printf("# %s:00000\n", self->option);
+
+        printf("#: %s:%d", fl->file, fl->lineno);
         fl = fl->next;
 
         while (fl != NULL) {
@@ -187,9 +196,6 @@ static void message__print_file_lineno(struct message *self)
                 fl = fl->next;
         }
 
-        if (self->option != NULL)
-                printf(", %s:00000", self->option);
-
         putchar('\n');
 }
 
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 8b84c42b49b5..c3d25786a64d 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -59,7 +59,7 @@ void menu_add_entry(struct symbol *sym);
 void menu_end_entry(void);
 void menu_add_dep(struct expr *dep);
 struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep);
-void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
+struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
 void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
 void menu_finalize(struct menu *parent);
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 8c59b212722d..5cfa6c405cf0 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -136,9 +136,9 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
         return prop;
 }
 
-void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep)
+struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep)
 {
-        menu_add_prop(type, prompt, NULL, dep);
+        return menu_add_prop(type, prompt, NULL, dep);
 }
 
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep)
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index f163d8d2d9ef..ff4fcc09720e 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -1531,7 +1531,7 @@ yyreduce:
 
     {
         menu_add_entry(NULL);
-        menu_add_prop(P_MENU, yyvsp[-1].string, NULL, NULL);
+        menu_add_prompt(P_MENU, yyvsp[-1].string, NULL);
         printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
 ;}
     break;
@@ -1586,7 +1586,7 @@ yyreduce:
 
     {
         menu_add_entry(NULL);
-        menu_add_prop(P_COMMENT, yyvsp[-1].string, NULL, NULL);
+        menu_add_prompt(P_COMMENT, yyvsp[-1].string, NULL);
         printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
 ;}
     break;
@@ -1640,7 +1640,7 @@ yyreduce:
   case 86:
 
     {
-        menu_add_prop(P_PROMPT, yyvsp[-1].string, NULL, yyvsp[0].expr);
+        menu_add_prompt(P_PROMPT, yyvsp[-1].string, yyvsp[0].expr);
 ;}
     break;
 
@@ -1925,7 +1925,7 @@ void conf_parse(const char *name)
         sym_init();
         menu_init();
         modules_sym = sym_lookup("MODULES", 0);
-        rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL);
+        rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
 
         //zconfdebug = 1;
         zconfparse();
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 54460f8d3696..e1a0f455d4a8 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -342,7 +342,7 @@ if_block:
 menu: T_MENU prompt T_EOL
 {
         menu_add_entry(NULL);
-        menu_add_prop(P_MENU, $2, NULL, NULL);
+        menu_add_prompt(P_MENU, $2, NULL);
         printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
 };
 
@@ -392,7 +392,7 @@ source_stmt: source
 comment: T_COMMENT prompt T_EOL
 {
         menu_add_entry(NULL);
-        menu_add_prop(P_COMMENT, $2, NULL, NULL);
+        menu_add_prompt(P_COMMENT, $2, NULL);
         printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
 };
 
@@ -443,7 +443,7 @@ prompt_stmt_opt:
           /* empty */
         | prompt if_expr
 {
-        menu_add_prop(P_PROMPT, $1, NULL, $2);
+        menu_add_prompt(P_PROMPT, $1, $2);
 };
 
 prompt:   T_WORD
@@ -487,7 +487,7 @@ void conf_parse(const char *name)
         sym_init();
         menu_init();
         modules_sym = sym_lookup("MODULES", 0);
-        rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL);
+        rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
 
         //zconfdebug = 1;
         zconfparse();
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 0835dc2a8aa9..8aaf74e64183 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1665,11 +1665,17 @@ sub xml_escape($) {
 }
 
 sub process_file($) {
-    my ($file) = "$ENV{'SRCTREE'}@_";
+    my $file;
     my $identifier;
     my $func;
     my $initial_section_counter = $section_counter;
 
+    if (defined($ENV{'SRCTREE'})) {
+        $file = "$ENV{'SRCTREE'}" . "/" . "@_";
+    }
+    else {
+        $file = "@_";
+    }
     if (defined($source_map{$file})) {
         $file = $source_map{$file};
     }
diff --git a/scripts/lxdialog/dialog.h b/scripts/lxdialog/dialog.h
index c571548daa82..eb63e1bb63a3 100644
--- a/scripts/lxdialog/dialog.h
+++ b/scripts/lxdialog/dialog.h
@@ -163,7 +163,7 @@ int dialog_menu (const char *title, const char *prompt, int height, int width,
 int dialog_checklist (const char *title, const char *prompt, int height,
                 int width, int list_height, int item_no,
                 const char * const * items, int flag);
-extern unsigned char dialog_input_result[];
+extern char dialog_input_result[];
 int dialog_inputbox (const char *title, const char *prompt, int height,
                 int width, const char *init);
 
diff --git a/scripts/lxdialog/inputbox.c b/scripts/lxdialog/inputbox.c
index fa7bebc693b9..074d2d68bd31 100644
--- a/scripts/lxdialog/inputbox.c
+++ b/scripts/lxdialog/inputbox.c
@@ -21,7 +21,7 @@
 
 #include "dialog.h"
 
-unsigned char dialog_input_result[MAX_LEN + 1];
+char dialog_input_result[MAX_LEN + 1];
 
 /*
  *  Print the termination buttons
@@ -48,7 +48,7 @@ dialog_inputbox (const char *title, const char *prompt, int height, int width,
 {
     int i, x, y, box_y, box_x, box_width;
     int input_x = 0, scroll = 0, key = 0, button = -1;
-    unsigned char *instr = dialog_input_result;
+    char *instr = dialog_input_result;
     WINDOW *dialog;
 
     /* center dialog box on screen */
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 8d118d181950..d7b8a384b4a7 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -1,7 +1,8 @@
 TARGET=$1
 ARCH=$2
 SMP=$3
-CC=$4
+PREEMPT=$4
+CC=$5
 
 # If compile.h exists already and we don't own autoconf.h
 # (i.e. we're not the same user who did make *config), don't
@@ -26,8 +27,10 @@ fi
 
 
 UTS_VERSION="#$VERSION"
-if [ -n "$SMP" ] ; then UTS_VERSION="$UTS_VERSION SMP"; fi
-UTS_VERSION="$UTS_VERSION `LC_ALL=C LANG=C date`"
+CONFIG_FLAGS=""
+if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
+if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi
+UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS `LC_ALL=C LANG=C date`"
 
 # Truncate to maximum length
 
@@ -37,7 +40,8 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
 # Generate a temporary compile.h
 
 ( echo /\* This file is auto generated, version $VERSION \*/
-
+  if [ -n "$CONFIG_FLAGS" ] ; then echo "/* $CONFIG_FLAGS */"; fi
+  
   echo \#define UTS_MACHINE \"$ARCH\"
 
   echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 5180405c1a84..d8ee38aede26 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -341,6 +341,22 @@ static int do_of_entry (const char *filename, struct of_device_id *of, char *ali
     return 1;
 }
 
+static int do_vio_entry(const char *filename, struct vio_device_id *vio,
+                char *alias)
+{
+        char *tmp;
+
+        sprintf(alias, "vio:T%sS%s", vio->type[0] ? vio->type : "*",
+                        vio->compat[0] ? vio->compat : "*");
+
+        /* Replace all whitespace with underscores */
+        for (tmp = alias; tmp && *tmp; tmp++)
+                if (isspace (*tmp))
+                        *tmp = '_';
+
+        return 1;
+}
+
 /* Ignore any prefix, eg. v850 prepends _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -422,6 +438,9 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
         else if (sym_is(symname, "__mod_of_device_table"))
                 do_table(symval, sym->st_size, sizeof(struct of_device_id),
                          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_vio_entry, mod);
 
 }
 
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 1112347245c0..43271a1ca01e 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -252,9 +252,9 @@ static int parse_comment(const char *file, unsigned long len)
 }
 
 /* FIXME: Handle .s files differently (eg. # starts comments) --RR */
-static int parse_file(const signed char *fname, struct md4_ctx *md)
+static int parse_file(const char *fname, struct md4_ctx *md)
 {
-        signed char *file;
+        char *file;
         unsigned long i, len;
 
         file = grab_file(fname, &len);
@@ -332,7 +332,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
            Sum all files in the same dir or subdirs.
         */
         while ((line = get_next_line(&pos, file, flen)) != NULL) {
-                signed char* p = line;
+                char* p = line;
                 if (strncmp(line, "deps_", sizeof("deps_")-1) == 0) {
                         check_files = 1;
                         continue;
@@ -458,7 +458,7 @@ out:
         close(fd);
 }
 
-static int strip_rcs_crap(signed char *version)
+static int strip_rcs_crap(char *version)
 {
         unsigned int len, full_len;
 
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 3b1f2eff2584..f3e7e8e4a500 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -59,7 +59,7 @@ $(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile
         $(CONFIG_SHELL) $(MKSPEC) prebuilt > $@
         
 binrpm-pkg: $(objtree)/binkernel.spec
-        $(MAKE)
+        $(MAKE) KBUILD_SRC=
         set -e; \
         $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
         set -e; \
@@ -74,16 +74,30 @@ clean-files += $(objtree)/binkernel.spec
 #
 .PHONY: deb-pkg
 deb-pkg:
-        $(MAKE)
+        $(MAKE) KBUILD_SRC=
         $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
 
 clean-dirs += $(objtree)/debian/
 
 
+# tarball targets
+# ---------------------------------------------------------------------------
+.PHONY: tar%pkg
+tar%pkg:
+        $(MAKE)
+        $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@
+
+clean-dirs += $(objtree)/tar-install/
+
+
 # Help text displayed when executing 'make help'
 # ---------------------------------------------------------------------------
 help:
-        @echo  '  rpm-pkg         - Build the kernel as an RPM package'
-        @echo  '  binrpm-pkg      - Build an rpm package containing the compiled kernel & modules'
-        @echo  '  deb-pkg         - Build the kernel as an deb package'
+        @echo '  rpm-pkg         - Build the kernel as an RPM package'
+        @echo '  binrpm-pkg      - Build an rpm package containing the compiled kernel'
+        @echo '                    and modules'
+        @echo '  deb-pkg         - Build the kernel as an deb package'
+        @echo '  tar-pkg         - Build the kernel as an uncompressed tarball'
+        @echo '  targz-pkg       - Build the kernel as a gzip compressed tarball'
+        @echo '  tarbz2-pkg      - Build the kernel as a bzip2 compressed tarball'
 
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index c279b6310f02..6edb29f2b4a6 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -14,18 +14,38 @@ set -e
 # Some variables and settings used throughout the script
 version=$KERNELRELEASE
 tmpdir="$objtree/debian/tmp"
+packagename=linux-$version
+
+if [ "$ARCH" == "um" ] ; then
+        packagename=user-mode-linux-$version
+fi
 
 # Setup the directory structure
 rm -rf "$tmpdir"
 mkdir -p "$tmpdir/DEBIAN" "$tmpdir/lib" "$tmpdir/boot"
+if [ "$ARCH" == "um" ] ; then
+        mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/share/doc/$packagename" "$tmpdir/usr/bin"
+fi
 
 # Build and install the kernel
-cp System.map "$tmpdir/boot/System.map-$version"
-cp .config "$tmpdir/boot/config-$version"
-cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+if [ "$ARCH" == "um" ] ; then
+        $MAKE linux
+        cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
+        cp .config "$tmpdir/usr/share/doc/$packagename/config"
+        gzip "$tmpdir/usr/share/doc/$packagename/config"
+        cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version"
+else 
+        cp System.map "$tmpdir/boot/System.map-$version"
+        cp .config "$tmpdir/boot/config-$version"
+        cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+fi
 
 if grep -q '^CONFIG_MODULES=y' .config ; then
-        INSTALL_MOD_PATH="$tmpdir" make modules_install
+        INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
+        if [ "$ARCH" == "um" ] ; then
+                mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
+                rmdir "$tmpdir/lib/modules/$version"
+        fi
 fi
 
 # Install the maintainer scripts
@@ -53,6 +73,8 @@ linux ($version) unstable; urgency=low
 EOF
 
 # Generate a control file
+if [ "$ARCH" == "um" ]; then
+
 cat <<EOF > debian/control
 Source: linux
 Section: base
@@ -60,12 +82,34 @@ Priority: optional
 Maintainer: $name
 Standards-Version: 3.6.1
 
-Package: linux-$version
+Package: $packagename
+Architecture: any
+Description: User Mode Linux kernel, version $version
+ User-mode Linux is a port of the Linux kernel to its own system call
+ interface.  It provides a kind of virtual machine, which runs Linux
+ as a user process under another Linux kernel.  This is useful for
+ kernel development, sandboxes, jails, experimentation, and
+ many other things.
+ .
+ This package contains the Linux kernel, modules and corresponding other
+ files version $version
+EOF
+
+else
+cat <<EOF > debian/control
+Source: linux
+Section: base
+Priority: optional
+Maintainer: $name
+Standards-Version: 3.6.1
+
+Package: $packagename
 Architecture: any
 Description: Linux kernel, version $version
  This package contains the Linux kernel, modules and corresponding other
- files version $version.
+ files version $version
 EOF
+fi
 
 # Fix some ownership and permissions
 chown -R root:root "$tmpdir"
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
new file mode 100644
index 000000000000..d8fffe6f8906
--- /dev/null
+++ b/scripts/package/buildtar
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+#
+# buildtar 0.0.3
+#
+# (C) 2004-2005 by Jan-Benedict Glaw <jbglaw@lug-owl.de>
+#
+# This script is used to compile a tarball from the currently
+# prepared kernel. Based upon the builddeb script from
+# Wichert Akkerman <wichert@wiggy.net>.
+#
+
+set -e
+
+#
+# Some variables and settings used throughout the script
+#
+version="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}${EXTRANAME}"
+tmpdir="${objtree}/tar-install"
+tarball="${objtree}/linux-${version}.tar"
+
+
+#
+# Figure out how to compress, if requested at all
+#
+case "${1}" in
+        tar-pkg)
+                compress="cat"
+                file_ext=""
+                ;;
+        targz-pkg)
+                compress="gzip -c9"
+                file_ext=".gz"
+                ;;
+        tarbz2-pkg)
+                compress="bzip2 -c9"
+                file_ext=".bz2"
+                ;;
+        *)
+                echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2
+                exit 1
+                ;;
+esac
+
+
+#
+# Clean-up and re-create the temporary directory
+#
+rm -rf -- "${tmpdir}"
+mkdir -p -- "${tmpdir}/boot"
+
+
+#
+# Try to install modules
+#
+if ! make INSTALL_MOD_PATH="${tmpdir}" modules_install; then
+        echo "" >&2
+        echo "Ignoring error at module_install time, since that could be" >&2
+        echo "a result of missing local modutils/module-init-tools," >&2
+        echo "or you just didn't compile in module support at all..." >&2
+        echo "" >&2
+fi
+
+
+#
+# Install basic kernel files
+#
+cp -v -- System.map "${tmpdir}/boot/System.map-${version}"
+cp -v -- .config "${tmpdir}/boot/config-${version}"
+cp -v -- vmlinux "${tmpdir}/boot/vmlinux-${version}"
+
+
+#
+# Install arch-specific kernel image(s)
+#
+case "${ARCH}" in
+        i386)
+                [ -f arch/i386/boot/bzImage ] && cp -v -- arch/i386/boot/bzImage "${tmpdir}/boot/vmlinuz-${version}"
+                ;;
+        alpha)
+                [ -f arch/alpha/boot/vmlinux.gz ] && cp -v -- arch/alpha/boot/vmlinux.gz "${tmpdir}/boot/vmlinuz-${version}"
+                ;;
+        vax)
+                [ -f vmlinux.SYS ] && cp -v -- vmlinux.SYS "${tmpdir}/boot/vmlinux-${version}.SYS"
+                [ -f vmlinux.dsk ] && cp -v -- vmlinux.dsk "${tmpdir}/boot/vmlinux-${version}.dsk"
+                ;;
+        *)
+                [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${version}"
+                echo "" >&2
+                echo '** ** **  WARNING  ** ** **' >&2
+                echo "" >&2
+                echo "Your architecture did not define any architecture-dependant files" >&2
+                echo "to be placed into the tarball. Please add those to ${0} ..." >&2
+                echo "" >&2
+                sleep 5
+                ;;
+esac
+
+
+#
+# Create the tarball
+#
+(
+        cd "${tmpdir}"
+        tar cf - . | ${compress} > "${tarball}${file_ext}"
+)
+
+echo "Tarball successfully created in ${tarball}${file_ext}"
+
+exit 0
+
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 6e7a58f145ad..0b1038737548 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -62,10 +62,19 @@ echo ""
 fi
 
 echo "%install"
+echo "%ifarch ia64"
+echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+echo "%else"
 echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+echo "%endif"
 
 echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} modules_install'
+echo "%ifarch ia64"
+echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
+echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
+echo "%else"
 echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
+echo "%endif"
 
 echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"
 
diff --git a/scripts/reference_discarded.pl b/scripts/reference_discarded.pl
index d5cabb81bd1b..f04f62736851 100644
--- a/scripts/reference_discarded.pl
+++ b/scripts/reference_discarded.pl
@@ -96,6 +96,7 @@ foreach $object (keys(%object)) {
                      $from !~ /\.debug_ranges$/ &&
                      $from !~ /\.debug_line$/ &&
                      $from !~ /\.debug_frame$/ &&
+                     $from !~ /\.debug_loc$/ &&
                      $from !~ /\.exitcall\.exit$/ &&
                      $from !~ /\.eh_frame$/ &&
                      $from !~ /\.stab$/)) {
diff --git a/scripts/reference_init.pl b/scripts/reference_init.pl
index 9a2408453869..7f6960b175a2 100644
--- a/scripts/reference_init.pl
+++ b/scripts/reference_init.pl
@@ -98,6 +98,7 @@ foreach $object (sort(keys(%object))) {
                      $from !~ /\.pdr$/ &&
                      $from !~ /\__param$/ &&
                      $from !~ /\.altinstructions/ &&
+                     $from !~ /\.eh_frame/ &&
                      $from !~ /\.debug_/)) {
                         printf("Error: %s %s refers to %s\n", $object, $from, $line);
                 }
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
new file mode 100644
index 000000000000..7c805c8fccd2
--- /dev/null
+++ b/scripts/setlocalversion
@@ -0,0 +1,56 @@
+#!/usr/bin/perl
+# Copyright 2004 - Ryan Anderson <ryan@michonline.com>  GPL v2
+
+use strict;
+use warnings;
+use Digest::MD5;
+require 5.006;
+
+if (@ARGV != 1) {
+        print <<EOT;
+Usage: setlocalversion <srctree>
+EOT
+        exit(1);
+}
+
+my ($srctree) = @ARGV;
+chdir($srctree);
+
+my @LOCALVERSIONS = ();
+
+# We are going to use the following commands to try and determine if this
+# repository is at a Version boundary (i.e, 2.6.10 vs 2.6.10 + some patches) We
+# currently assume that all meaningful version boundaries are marked by a tag.
+# We don't care what the tag is, just that something exists.
+
+# Git/Cogito store the top-of-tree "commit" in .git/HEAD
+# A list of known tags sits in .git/refs/tags/
+#
+# The simple trick here is to just compare the two of these, and if we get a
+# match, return nothing, otherwise, return a subset of the SHA-1 hash in
+# .git/HEAD
+
+sub do_git_checks {
+        open(H,"<.git/HEAD") or return;
+        my $head = <H>;
+        chomp $head;
+        close(H);
+
+        opendir(D,".git/refs/tags") or return;
+        foreach my $tagfile (grep !/^\.{1,2}$/, readdir(D)) {
+                open(F,"<.git/refs/tags/" . $tagfile) or return;
+                my $tag = <F>;
+                chomp $tag;
+                close(F);
+                return if ($tag eq $head);
+        }
+        closedir(D);
+
+        push @LOCALVERSIONS, "g" . substr($head,0,8);
+}
+
+if ( -d ".git") {
+        do_git_checks();
+}
+
+printf "-%s\n", join("-",@LOCALVERSIONS) if (scalar @LOCALVERSIONS > 0);
diff --git a/scripts/ver_linux b/scripts/ver_linux
index a28c279c49dd..beb43ef7f761 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -25,9 +25,11 @@ ld -v | awk -F\) '{print $1}' | awk \
 '/BFD/{print "binutils              ",$NF} \
 /^GNU/{print "binutils              ",$4}'
 
-fdformat --version | awk -F\- '{print "util-linux            ", $NF}'
+echo -n "util-linux             "
+fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//
 
-mount --version | awk -F\- '{print "mount                 ", $NF}'
+echo -n "mount                  "
+mount --version | awk '{print $NF}' | sed -e s/^mount-// -e s/\)$//
 
 depmod -V  2>&1 | awk 'NR==1 {print "module-init-tools     ",$NF}'