Patched in Tegra support.

119 files changed, 1531 insertions, 10993 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 978416dd31c..d897278b1f9 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -98,24 +98,24 @@ try-run = $(shell set -e;		\
 # Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,)
 
 as-option = $(call try-run,\
-        $(CC) $(KBUILD_CFLAGS) $(1) -c -x assembler /dev/null -o "$$TMP",$(1),$(2))
+        $(CC) $(KBUILD_CFLAGS) $(1) -c -xassembler /dev/null -o "$$TMP",$(1),$(2))
 
 # as-instr
 # Usage: cflags-y += $(call as-instr,instr,option1,option2)
 
 as-instr = $(call try-run,\
-        printf "%b\n" "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))
+        /bin/echo -e "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" -,$(2),$(3))
 
 # cc-option
 # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
 
 cc-option = $(call try-run,\
-        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))
+        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",$(1),$(2))
 
 # cc-option-yn
 # Usage: flag := $(call cc-option-yn,-march=winchip-c6)
 cc-option-yn = $(call try-run,\
-        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)
+        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",y,n)
 
 # cc-option-align
 # Prefix align with either -falign or -malign
@@ -125,7 +125,7 @@ cc-option-align = $(subst -functions=0,,\
 # cc-disable-warning
 # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
 cc-disable-warning = $(call try-run,\
-        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
+        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -xc /dev/null -o "$$TMP",-Wno-$(strip $(1)))
 
 # cc-version
 # Usage gcc-ver := $(call cc-version)
@@ -143,7 +143,7 @@ cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
 # cc-ldoption
 # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
 cc-ldoption = $(call try-run,\
-        $(CC) $(1) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2))
+        $(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP",$(1),$(2))
 
 # ld-option
 # Usage: LDFLAGS += $(call ld-option, -X)
@@ -209,7 +209,7 @@ endif
 # >$< substitution to preserve $ when reloading .cmd file
 # note: when using inline perl scripts [perl -e '...$$t=1;...']
 # in $(cmd_xxx) double $$ your perl vars
-make-cmd = $(subst \\,\\\\,$(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1))))))
+make-cmd = $(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1)))))
 
 # Find any prerequisites that is newer than target or that does not exist.
 # PHONY targets skipped in both cases.
diff --git a/scripts/Makefile b/scripts/Makefile
index 01e7adb838d..df7678febf2 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -8,18 +8,11 @@
 # conmakehash:   Create arrays for initializing the kernel console tables
 # docproc:       Used in Documentation/DocBook
 
-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
-
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash
 hostprogs-$(CONFIG_IKCONFIG)     += bin2c
 hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
-hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable
-hostprogs-$(CONFIG_ASN1)         += asn1_compiler
-
-HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
-HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
 
 always          := $(hostprogs-y) $(hostprogs-m)
 
diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
index d17e0ea911e..40caf3c26cd 100644
--- a/scripts/Makefile.asm-generic
+++ b/scripts/Makefile.asm-generic
@@ -5,7 +5,7 @@
 # and for each file listed in this file with generic-y creates
 # a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm)
 
-kbuild-file := $(srctree)/arch/$(SRCARCH)/include/$(src)/Kbuild
+kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild
 -include $(kbuild-file)
 
 include scripts/Kbuild.include
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 0e801c3cdaf..a0fd5029cfe 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -46,7 +46,7 @@ include $(kbuild-file)
 # If the save-* variables changed error out
 ifeq ($(KBUILD_NOPEDANTIC),)
         ifneq ("$(save-cflags)","$(CFLAGS)")
-                $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use ccflags-y)
+                $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use EXTRA_CFLAGS)
         endif
 endif
 
@@ -69,7 +69,6 @@ warning-1 += -Wmissing-prototypes
 warning-1 += -Wold-style-definition
 warning-1 += $(call cc-option, -Wmissing-include-dirs)
 warning-1 += $(call cc-option, -Wunused-but-set-variable)
-warning-1 += $(call cc-disable-warning, missing-field-initializers)
 
 warning-2 := -Waggregate-return
 warning-2 += -Wcast-align
@@ -77,7 +76,6 @@ warning-2 += -Wdisabled-optimization
 warning-2 += -Wnested-externs
 warning-2 += -Wshadow
 warning-2 += $(call cc-option, -Wlogical-op)
-warning-2 += $(call cc-option, -Wmissing-field-initializers)
 
 warning-3 := -Wbad-function-cast
 warning-3 += -Wcast-qual
@@ -354,17 +352,6 @@ quiet_cmd_cpp_lds_S = LDS     $@
 $(obj)/%.lds: $(src)/%.lds.S FORCE
         $(call if_changed_dep,cpp_lds_S)
 
-# ASN.1 grammar
-# ---------------------------------------------------------------------------
-quiet_cmd_asn1_compiler = ASN.1   $@
-      cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \
-                                $(subst .h,.c,$@) $(subst .c,.h,$@)
-
-.PRECIOUS: $(objtree)/$(obj)/%-asn1.c $(objtree)/$(obj)/%-asn1.h
-
-$(obj)/%-asn1.c $(obj)/%-asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler
-        $(call cmd,asn1_compiler)
-
 # Build the compiled-in targets
 # ---------------------------------------------------------------------------
 
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
index 4d908d16c03..6bf8e87f1dc 100644
--- a/scripts/Makefile.fwinst
+++ b/scripts/Makefile.fwinst
@@ -27,7 +27,7 @@ endif
 installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
 
 installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
-installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/./
+installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
 
 # Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.
 PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 06ba4a70bd4..a57f5bd5a13 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -3,77 +3,57 @@
 #
 # header-y  - list files to be installed. They are preprocessed
 #             to remove __KERNEL__ section of the file
-# genhdr-y  - Same as header-y but in a generated/ directory
+# objhdr-y  - Same as header-y but for generated files
 #
 # ==========================================================================
 
 # called may set destination dir (when installing to asm/)
-_dst := $(or $(destination-y),$(dst),$(obj))
-
-# generated header directory
-gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj)))
+_dst := $(if $(dst),$(dst),$(obj))
 
 kbuild-file := $(srctree)/$(obj)/Kbuild
 include $(kbuild-file)
 
-old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild
-ifneq ($(wildcard $(old-kbuild-file)),)
-include $(old-kbuild-file)
-endif
+_dst := $(if $(destination-y),$(destination-y),$(_dst))
 
 include scripts/Kbuild.include
 
-installdir    := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst))
+install       := $(INSTALL_HDR_PATH)/$(_dst)
 
 header-y      := $(sort $(header-y))
 subdirs       := $(patsubst %/,%,$(filter %/, $(header-y)))
 header-y      := $(filter-out %/, $(header-y))
 
 # files used to track state of install/check
-install-file  := $(installdir)/.install
-check-file    := $(installdir)/.check
+install-file  := $(install)/.install
+check-file    := $(install)/.check
 
 # generic-y list all files an architecture uses from asm-generic
 # Use this to build a list of headers which require a wrapper
 wrapper-files := $(filter $(header-y), $(generic-y))
 
-srcdir        := $(srctree)/$(obj)
-gendir        := $(objtree)/$(gen)
-
-oldsrcdir     := $(srctree)/$(subst /uapi,,$(obj))
-
 # all headers files for this dir
 header-y      := $(filter-out $(generic-y), $(header-y))
-all-files     := $(header-y) $(genhdr-y) $(wrapper-files)
-output-files  := $(addprefix $(installdir)/, $(all-files))
-
-input-files   := $(foreach hdr, $(header-y), \
-                   $(or \
-                        $(wildcard $(srcdir)/$(hdr)), \
-                        $(wildcard $(oldsrcdir)/$(hdr)), \
-                        $(error Missing UAPI file $(srcdir)/$(hdr)) \
-                   )) \
-                 $(foreach hdr, $(genhdr-y), \
-                   $(or \
-                        $(wildcard $(gendir)/$(hdr)), \
-                        $(error Missing generated UAPI file $(gendir)/$(hdr)) \
-                   ))
+all-files     := $(header-y) $(objhdr-y) $(wrapper-files)
+input-files   := $(addprefix $(srctree)/$(obj)/,$(header-y)) \
+                 $(addprefix $(objtree)/$(obj)/,$(objhdr-y))
+output-files  := $(addprefix $(install)/, $(all-files))
 
 # Work out what needs to be removed
-oldheaders    := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
+oldheaders    := $(patsubst $(install)/%,%,$(wildcard $(install)/*.h))
 unwanted      := $(filter-out $(all-files),$(oldheaders))
 
 # Prefix unwanted with full paths to $(INSTALL_HDR_PATH)
-unwanted-file := $(addprefix $(installdir)/, $(unwanted))
+unwanted-file := $(addprefix $(install)/, $(unwanted))
 
 printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@))
 
 quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
                             file$(if $(word 2, $(all-files)),s))
       cmd_install = \
-        $(PERL) $< $(installdir) $(SRCARCH) $(input-files); \
+        $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \
+        $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \
         for F in $(wrapper-files); do                                   \
-                echo "\#include <asm-generic/$$F>" > $(installdir)/$$F;    \
+                echo "\#include <asm-generic/$$F>" > $(install)/$$F;    \
         done;                                                           \
         touch $@
 
@@ -84,7 +64,7 @@ quiet_cmd_check = CHECK   $(printdir) ($(words $(all-files)) files)
 # Headers list can be pretty long, xargs helps to avoid
 # the "Argument list too long" error.
       cmd_check = for f in $(all-files); do                          \
-                  echo "$(installdir)/$${f}"; done                      \
+                  echo "$(install)/$${f}"; done                      \
                   | xargs                                            \
                   $(PERL) $< $(INSTALL_HDR_PATH)/include $(SRCARCH); \
                   touch $@
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index bdf42fdf64c..aeea84a2483 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -93,9 +93,9 @@ obj-dirs	:= $(addprefix $(obj)/,$(obj-dirs))
 # already
 # $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will 
 # end up in (or would, if it gets compiled in)
-# Note: Files that end up in two or more modules are compiled without the
-#       KBUILD_MODNAME definition. The reason is that any made-up name would
-#       differ in different configs.
+# Note: It's possible that one object gets potentially linked into more
+#       than one module. In that case KBUILD_MODNAME will be set to foo_bar,
+#       where foo and bar are the name of the modules.
 name-fix = $(subst $(comma),_,$(subst -,_,$1))
 basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"
 modname_flags  = $(if $(filter 1,$(words $(modname))),\
@@ -167,7 +167,6 @@ ifdef REGENERATE_PARSERS
 quiet_cmd_gperf = GPERF $@
       cmd_gperf = gperf -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $<
 
-.PRECIOUS: $(src)/%.hash.c_shipped
 $(src)/%.hash.c_shipped: $(src)/%.gperf
         $(call cmd,gperf)
 
@@ -178,7 +177,6 @@ LEX_PREFIX = $(if $(LEX_PREFIX_${baseprereq}),$(LEX_PREFIX_${baseprereq}),yy)
 quiet_cmd_flex = LEX     $@
       cmd_flex = flex -o$@ -L -P $(LEX_PREFIX) $<
 
-.PRECIOUS: $(src)/%.lex.c_shipped
 $(src)/%.lex.c_shipped: $(src)/%.l
         $(call cmd,flex)
 
@@ -189,14 +187,12 @@ YACC_PREFIX = $(if $(YACC_PREFIX_${baseprereq}),$(YACC_PREFIX_${baseprereq}),yy)
 quiet_cmd_bison = YACC    $@
       cmd_bison = bison -o$@ -t -l -p $(YACC_PREFIX) $<
 
-.PRECIOUS: $(src)/%.tab.c_shipped
 $(src)/%.tab.c_shipped: $(src)/%.y
         $(call cmd,bison)
 
 quiet_cmd_bison_h = YACC    $@
       cmd_bison_h = bison -o/dev/null --defines=$@ -t -l -p $(YACC_PREFIX) $<
 
-.PRECIOUS: $(src)/%.tab.h_shipped
 $(src)/%.tab.h_shipped: $(src)/%.y
         $(call cmd,bison_h)
 
@@ -264,10 +260,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb
         $(call cmd,dt_S_dtb)
 
 quiet_cmd_dtc = DTC     $@
-cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $<
-
-$(obj)/%.dtb: $(src)/%.dts FORCE
-        $(call if_changed_dep,dtc)
+cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $<
 
 # Bzip2
 # ---------------------------------------------------------------------------
@@ -307,30 +300,6 @@ cmd_lzo = (cat $(filter-out FORCE,$^) | \
         lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
         (rm -f $@ ; false)
 
-# U-Boot mkimage
-# ---------------------------------------------------------------------------
-
-MKIMAGE := $(srctree)/scripts/mkuboot.sh
-
-# SRCARCH just happens to match slightly more than ARCH (on sparc), so reduces
-# the number of overrides in arch makefiles
-UIMAGE_ARCH ?= $(SRCARCH)
-UIMAGE_COMPRESSION ?= $(if $(2),$(2),none)
-UIMAGE_OPTS-y ?=
-UIMAGE_TYPE ?= kernel
-UIMAGE_LOADADDR ?= arch_must_set_this
-UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR)
-UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
-UIMAGE_IN ?= $<
-UIMAGE_OUT ?= $@
-
-quiet_cmd_uimage = UIMAGE  $(UIMAGE_OUT)
-      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
-                        -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \
-                        -T $(UIMAGE_TYPE) \
-                        -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \
-                        -n $(UIMAGE_NAME) -d $(UIMAGE_IN) $(UIMAGE_OUT)
-
 # XZ
 # ---------------------------------------------------------------------------
 # Use xzkern to compress the kernel image and xzmisc to compress other things.
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index ecbb44797e2..efa5d940e63 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -9,16 +9,15 @@ include scripts/Kbuild.include
 
 #
 
-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
+__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
 modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
 
 PHONY += $(modules)
 __modinst: $(modules)
         @:
 
-# Don't stop modules_install if we can't sign external modules.
 quiet_cmd_modules_install = INSTALL $@
-      cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@) ; $(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD))
+      cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@)
 
 # Modules built outside the kernel source tree go into extra by default
 INSTALL_MOD_DIR ?= extra
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index a1cb0222ebe..08dce14f2dc 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -60,7 +60,7 @@ kernelsymfile := $(objtree)/Module.symvers
 modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
 
 # Step 1), find all modules listed in $(MODVERDIR)/
-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
+__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
 modules   := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
 
 # Stop after building .o files if NOFINAL is set. Makes compile tests quicker
diff --git a/scripts/Makefile.modsign b/scripts/Makefile.modsign
deleted file mode 100644
index abfda626dba..00000000000
--- a/scripts/Makefile.modsign
+++ /dev/null
@@ -1,32 +0,0 @@
-# ==========================================================================
-# Signing modules
-# ==========================================================================
-
-PHONY := __modsign
-__modsign:
-
-include scripts/Kbuild.include
-
-__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
-modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
-
-PHONY += $(modules)
-__modsign: $(modules)
-        @:
-
-quiet_cmd_sign_ko = SIGN [M] $(2)/$(notdir $@)
-        cmd_sign_ko = $(mod_sign_cmd) $(2)/$(notdir $@)
-
-# Modules built outside the kernel source tree go into extra by default
-INSTALL_MOD_DIR ?= extra
-ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(patsubst %/,%,$(KBUILD_EXTMOD)),,$(@D))
-
-modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))
-
-$(modules):
-        $(call cmd,sign_ko,$(MODLIB)/$(modinst_dir))
-
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
-
-.PHONY: $(PHONY)
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c
deleted file mode 100644
index db0e5cd34c7..00000000000
--- a/scripts/asn1_compiler.c
+++ /dev/null
@@ -1,1545 +0,0 @@
-/* Simplified ASN.1 notation parser
- *
- * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <linux/asn1_ber_bytecode.h>
-
-enum token_type {
-        DIRECTIVE_ABSENT,
-        DIRECTIVE_ALL,
-        DIRECTIVE_ANY,
-        DIRECTIVE_APPLICATION,
-        DIRECTIVE_AUTOMATIC,
-        DIRECTIVE_BEGIN,
-        DIRECTIVE_BIT,
-        DIRECTIVE_BMPString,
-        DIRECTIVE_BOOLEAN,
-        DIRECTIVE_BY,
-        DIRECTIVE_CHARACTER,
-        DIRECTIVE_CHOICE,
-        DIRECTIVE_CLASS,
-        DIRECTIVE_COMPONENT,
-        DIRECTIVE_COMPONENTS,
-        DIRECTIVE_CONSTRAINED,
-        DIRECTIVE_CONTAINING,
-        DIRECTIVE_DEFAULT,
-        DIRECTIVE_DEFINED,
-        DIRECTIVE_DEFINITIONS,
-        DIRECTIVE_EMBEDDED,
-        DIRECTIVE_ENCODED,
-        DIRECTIVE_ENCODING_CONTROL,
-        DIRECTIVE_END,
-        DIRECTIVE_ENUMERATED,
-        DIRECTIVE_EXCEPT,
-        DIRECTIVE_EXPLICIT,
-        DIRECTIVE_EXPORTS,
-        DIRECTIVE_EXTENSIBILITY,
-        DIRECTIVE_EXTERNAL,
-        DIRECTIVE_FALSE,
-        DIRECTIVE_FROM,
-        DIRECTIVE_GeneralString,
-        DIRECTIVE_GeneralizedTime,
-        DIRECTIVE_GraphicString,
-        DIRECTIVE_IA5String,
-        DIRECTIVE_IDENTIFIER,
-        DIRECTIVE_IMPLICIT,
-        DIRECTIVE_IMPLIED,
-        DIRECTIVE_IMPORTS,
-        DIRECTIVE_INCLUDES,
-        DIRECTIVE_INSTANCE,
-        DIRECTIVE_INSTRUCTIONS,
-        DIRECTIVE_INTEGER,
-        DIRECTIVE_INTERSECTION,
-        DIRECTIVE_ISO646String,
-        DIRECTIVE_MAX,
-        DIRECTIVE_MIN,
-        DIRECTIVE_MINUS_INFINITY,
-        DIRECTIVE_NULL,
-        DIRECTIVE_NumericString,
-        DIRECTIVE_OBJECT,
-        DIRECTIVE_OCTET,
-        DIRECTIVE_OF,
-        DIRECTIVE_OPTIONAL,
-        DIRECTIVE_ObjectDescriptor,
-        DIRECTIVE_PATTERN,
-        DIRECTIVE_PDV,
-        DIRECTIVE_PLUS_INFINITY,
-        DIRECTIVE_PRESENT,
-        DIRECTIVE_PRIVATE,
-        DIRECTIVE_PrintableString,
-        DIRECTIVE_REAL,
-        DIRECTIVE_RELATIVE_OID,
-        DIRECTIVE_SEQUENCE,
-        DIRECTIVE_SET,
-        DIRECTIVE_SIZE,
-        DIRECTIVE_STRING,
-        DIRECTIVE_SYNTAX,
-        DIRECTIVE_T61String,
-        DIRECTIVE_TAGS,
-        DIRECTIVE_TRUE,
-        DIRECTIVE_TeletexString,
-        DIRECTIVE_UNION,
-        DIRECTIVE_UNIQUE,
-        DIRECTIVE_UNIVERSAL,
-        DIRECTIVE_UTCTime,
-        DIRECTIVE_UTF8String,
-        DIRECTIVE_UniversalString,
-        DIRECTIVE_VideotexString,
-        DIRECTIVE_VisibleString,
-        DIRECTIVE_WITH,
-        NR__DIRECTIVES,
-        TOKEN_ASSIGNMENT = NR__DIRECTIVES,
-        TOKEN_OPEN_CURLY,
-        TOKEN_CLOSE_CURLY,
-        TOKEN_OPEN_SQUARE,
-        TOKEN_CLOSE_SQUARE,
-        TOKEN_OPEN_ACTION,
-        TOKEN_CLOSE_ACTION,
-        TOKEN_COMMA,
-        TOKEN_NUMBER,
-        TOKEN_TYPE_NAME,
-        TOKEN_ELEMENT_NAME,
-        NR__TOKENS
-};
-
-static const unsigned char token_to_tag[NR__TOKENS] = {
-        /* EOC goes first */
-        [DIRECTIVE_BOOLEAN]             = ASN1_BOOL,
-        [DIRECTIVE_INTEGER]             = ASN1_INT,
-        [DIRECTIVE_BIT]                 = ASN1_BTS,
-        [DIRECTIVE_OCTET]               = ASN1_OTS,
-        [DIRECTIVE_NULL]                = ASN1_NULL,
-        [DIRECTIVE_OBJECT]              = ASN1_OID,
-        [DIRECTIVE_ObjectDescriptor]    = ASN1_ODE,
-        [DIRECTIVE_EXTERNAL]            = ASN1_EXT,
-        [DIRECTIVE_REAL]                = ASN1_REAL,
-        [DIRECTIVE_ENUMERATED]          = ASN1_ENUM,
-        [DIRECTIVE_EMBEDDED]            = 0,
-        [DIRECTIVE_UTF8String]          = ASN1_UTF8STR,
-        [DIRECTIVE_RELATIVE_OID]        = ASN1_RELOID,
-        /* 14 */
-        /* 15 */
-        [DIRECTIVE_SEQUENCE]            = ASN1_SEQ,
-        [DIRECTIVE_SET]                 = ASN1_SET,
-        [DIRECTIVE_NumericString]       = ASN1_NUMSTR,
-        [DIRECTIVE_PrintableString]     = ASN1_PRNSTR,
-        [DIRECTIVE_T61String]           = ASN1_TEXSTR,
-        [DIRECTIVE_TeletexString]       = ASN1_TEXSTR,
-        [DIRECTIVE_VideotexString]      = ASN1_VIDSTR,
-        [DIRECTIVE_IA5String]           = ASN1_IA5STR,
-        [DIRECTIVE_UTCTime]             = ASN1_UNITIM,
-        [DIRECTIVE_GeneralizedTime]     = ASN1_GENTIM,
-        [DIRECTIVE_GraphicString]       = ASN1_GRASTR,
-        [DIRECTIVE_VisibleString]       = ASN1_VISSTR,
-        [DIRECTIVE_GeneralString]       = ASN1_GENSTR,
-        [DIRECTIVE_UniversalString]     = ASN1_UNITIM,
-        [DIRECTIVE_CHARACTER]           = ASN1_CHRSTR,
-        [DIRECTIVE_BMPString]           = ASN1_BMPSTR,
-};
-
-static const char asn1_classes[4][5] = {
-        [ASN1_UNIV]     = "UNIV",
-        [ASN1_APPL]     = "APPL",
-        [ASN1_CONT]     = "CONT",
-        [ASN1_PRIV]     = "PRIV"
-};
-
-static const char asn1_methods[2][5] = {
-        [ASN1_UNIV]     = "PRIM",
-        [ASN1_APPL]     = "CONS"
-};
-
-static const char *const asn1_universal_tags[32] = {
-        "EOC",
-        "BOOL",
-        "INT",
-        "BTS",
-        "OTS",
-        "NULL",
-        "OID",
-        "ODE",
-        "EXT",
-        "REAL",
-        "ENUM",
-        "EPDV",
-        "UTF8STR",
-        "RELOID",
-        NULL,           /* 14 */
-        NULL,           /* 15 */
-        "SEQ",
-        "SET",
-        "NUMSTR",
-        "PRNSTR",
-        "TEXSTR",
-        "VIDSTR",
-        "IA5STR",
-        "UNITIM",
-        "GENTIM",
-        "GRASTR",
-        "VISSTR",
-        "GENSTR",
-        "UNISTR",
-        "CHRSTR",
-        "BMPSTR",
-        NULL            /* 31 */
-};
-
-static const char *filename;
-static const char *grammar_name;
-static const char *outputname;
-static const char *headername;
-
-static const char *const directives[NR__DIRECTIVES] = {
-#define _(X) [DIRECTIVE_##X] = #X
-        _(ABSENT),
-        _(ALL),
-        _(ANY),
-        _(APPLICATION),
-        _(AUTOMATIC),
-        _(BEGIN),
-        _(BIT),
-        _(BMPString),
-        _(BOOLEAN),
-        _(BY),
-        _(CHARACTER),
-        _(CHOICE),
-        _(CLASS),
-        _(COMPONENT),
-        _(COMPONENTS),
-        _(CONSTRAINED),
-        _(CONTAINING),
-        _(DEFAULT),
-        _(DEFINED),
-        _(DEFINITIONS),
-        _(EMBEDDED),
-        _(ENCODED),
-        [DIRECTIVE_ENCODING_CONTROL] = "ENCODING-CONTROL",
-        _(END),
-        _(ENUMERATED),
-        _(EXCEPT),
-        _(EXPLICIT),
-        _(EXPORTS),
-        _(EXTENSIBILITY),
-        _(EXTERNAL),
-        _(FALSE),
-        _(FROM),
-        _(GeneralString),
-        _(GeneralizedTime),
-        _(GraphicString),
-        _(IA5String),
-        _(IDENTIFIER),
-        _(IMPLICIT),
-        _(IMPLIED),
-        _(IMPORTS),
-        _(INCLUDES),
-        _(INSTANCE),
-        _(INSTRUCTIONS),
-        _(INTEGER),
-        _(INTERSECTION),
-        _(ISO646String),
-        _(MAX),
-        _(MIN),
-        [DIRECTIVE_MINUS_INFINITY] = "MINUS-INFINITY",
-        [DIRECTIVE_NULL] = "NULL",
-        _(NumericString),
-        _(OBJECT),
-        _(OCTET),
-        _(OF),
-        _(OPTIONAL),
-        _(ObjectDescriptor),
-        _(PATTERN),
-        _(PDV),
-        [DIRECTIVE_PLUS_INFINITY] = "PLUS-INFINITY",
-        _(PRESENT),
-        _(PRIVATE),
-        _(PrintableString),
-        _(REAL),
-        [DIRECTIVE_RELATIVE_OID] = "RELATIVE-OID",
-        _(SEQUENCE),
-        _(SET),
-        _(SIZE),
-        _(STRING),
-        _(SYNTAX),
-        _(T61String),
-        _(TAGS),
-        _(TRUE),
-        _(TeletexString),
-        _(UNION),
-        _(UNIQUE),
-        _(UNIVERSAL),
-        _(UTCTime),
-        _(UTF8String),
-        _(UniversalString),
-        _(VideotexString),
-        _(VisibleString),
-        _(WITH)
-};
-
-struct action {
-        struct action   *next;
-        unsigned char   index;
-        char            name[];
-};
-
-static struct action *action_list;
-static unsigned nr_actions;
-
-struct token {
-        unsigned short  line;
-        enum token_type token_type : 8;
-        unsigned char   size;
-        struct action   *action;
-        const char      *value;
-        struct type     *type;
-};
-
-static struct token *token_list;
-static unsigned nr_tokens;
-
-static int directive_compare(const void *_key, const void *_pdir)
-{
-        const struct token *token = _key;
-        const char *const *pdir = _pdir, *dir = *pdir;
-        size_t dlen, clen;
-        int val;
-
-        dlen = strlen(dir);
-        clen = (dlen < token->size) ? dlen : token->size;
-
-        //printf("cmp(%*.*s,%s) = ",
-        //       (int)token->size, (int)token->size, token->value,
-        //       dir);
-
-        val = memcmp(token->value, dir, clen);
-        if (val != 0) {
-                //printf("%d [cmp]\n", val);
-                return val;
-        }
-
-        if (dlen == token->size) {
-                //printf("0\n");
-                return 0;
-        }
-        //printf("%d\n", (int)dlen - (int)token->size);
-        return dlen - token->size; /* shorter -> negative */
-}
-
-/*
- * Tokenise an ASN.1 grammar
- */
-static void tokenise(char *buffer, char *end)
-{
-        struct token *tokens;
-        char *line, *nl, *p, *q;
-        unsigned tix, lineno;
-
-        /* Assume we're going to have half as many tokens as we have
-         * characters
-         */
-        token_list = tokens = calloc((end - buffer) / 2, sizeof(struct token));
-        if (!tokens) {
-                perror(NULL);
-                exit(1);
-        }
-        tix = 0;
-
-        lineno = 0;
-        while (buffer < end) {
-                /* First of all, break out a line */
-                lineno++;
-                line = buffer;
-                nl = memchr(line, '\n', end - buffer);
-                if (!nl) {
-                        buffer = nl = end;
-                } else {
-                        buffer = nl + 1;
-                        *nl = '\0';
-                }
-
-                /* Remove "--" comments */
-                p = line;
-        next_comment:
-                while ((p = memchr(p, '-', nl - p))) {
-                        if (p[1] == '-') {
-                                /* Found a comment; see if there's a terminator */
-                                q = p + 2;
-                                while ((q = memchr(q, '-', nl - q))) {
-                                        if (q[1] == '-') {
-                                                /* There is - excise the comment */
-                                                q += 2;
-                                                memmove(p, q, nl - q);
-                                                goto next_comment;
-                                        }
-                                        q++;
-                                }
-                                *p = '\0';
-                                nl = p;
-                                break;
-                        } else {
-                                p++;
-                        }
-                }
-
-                p = line;
-                while (p < nl) {
-                        /* Skip white space */
-                        while (p < nl && isspace(*p))
-                                *(p++) = 0;
-                        if (p >= nl)
-                                break;
-
-                        tokens[tix].line = lineno;
-                        tokens[tix].value = p;
-
-                        /* Handle string tokens */
-                        if (isalpha(*p)) {
-                                const char **dir;
-
-                                /* Can be a directive, type name or element
-                                 * name.  Find the end of the name.
-                                 */
-                                q = p + 1;
-                                while (q < nl && (isalnum(*q) || *q == '-' || *q == '_'))
-                                        q++;
-                                tokens[tix].size = q - p;
-                                p = q;
-
-                                /* If it begins with a lowercase letter then
-                                 * it's an element name
-                                 */
-                                if (islower(tokens[tix].value[0])) {
-                                        tokens[tix++].token_type = TOKEN_ELEMENT_NAME;
-                                        continue;
-                                }
-
-                                /* Otherwise we need to search the directive
-                                 * table
-                                 */
-                                dir = bsearch(&tokens[tix], directives,
-                                              sizeof(directives) / sizeof(directives[1]),
-                                              sizeof(directives[1]),
-                                              directive_compare);
-                                if (dir) {
-                                        tokens[tix++].token_type = dir - directives;
-                                        continue;
-                                }
-
-                                tokens[tix++].token_type = TOKEN_TYPE_NAME;
-                                continue;
-                        }
-
-                        /* Handle numbers */
-                        if (isdigit(*p)) {
-                                /* Find the end of the number */
-                                q = p + 1;
-                                while (q < nl && (isdigit(*q)))
-                                        q++;
-                                tokens[tix].size = q - p;
-                                p = q;
-                                tokens[tix++].token_type = TOKEN_NUMBER;
-                                continue;
-                        }
-
-                        if (nl - p >= 3) {
-                                if (memcmp(p, "::=", 3) == 0) {
-                                        p += 3;
-                                        tokens[tix].size = 3;
-                                        tokens[tix++].token_type = TOKEN_ASSIGNMENT;
-                                        continue;
-                                }
-                        }
-
-                        if (nl - p >= 2) {
-                                if (memcmp(p, "({", 2) == 0) {
-                                        p += 2;
-                                        tokens[tix].size = 2;
-                                        tokens[tix++].token_type = TOKEN_OPEN_ACTION;
-                                        continue;
-                                }
-                                if (memcmp(p, "})", 2) == 0) {
-                                        p += 2;
-                                        tokens[tix].size = 2;
-                                        tokens[tix++].token_type = TOKEN_CLOSE_ACTION;
-                                        continue;
-                                }
-                        }
-
-                        if (nl - p >= 1) {
-                                tokens[tix].size = 1;
-                                switch (*p) {
-                                case '{':
-                                        p += 1;
-                                        tokens[tix++].token_type = TOKEN_OPEN_CURLY;
-                                        continue;
-                                case '}':
-                                        p += 1;
-                                        tokens[tix++].token_type = TOKEN_CLOSE_CURLY;
-                                        continue;
-                                case '[':
-                                        p += 1;
-                                        tokens[tix++].token_type = TOKEN_OPEN_SQUARE;
-                                        continue;
-                                case ']':
-                                        p += 1;
-                                        tokens[tix++].token_type = TOKEN_CLOSE_SQUARE;
-                                        continue;
-                                case ',':
-                                        p += 1;
-                                        tokens[tix++].token_type = TOKEN_COMMA;
-                                        continue;
-                                default:
-                                        break;
-                                }
-                        }
-
-                        fprintf(stderr, "%s:%u: Unknown character in grammar: '%c'\n",
-                                filename, lineno, *p);
-                        exit(1);
-                }
-        }
-
-        nr_tokens = tix;
-        printf("Extracted %u tokens\n", nr_tokens);
-
-#if 0
-        {
-                int n;
-                for (n = 0; n < nr_tokens; n++)
-                        printf("Token %3u: '%*.*s'\n",
-                               n,
-                               (int)token_list[n].size, (int)token_list[n].size,
-                               token_list[n].value);
-        }
-#endif
-}
-
-static void build_type_list(void);
-static void parse(void);
-static void render(FILE *out, FILE *hdr);
-
-/*
- *
- */
-int main(int argc, char **argv)
-{
-        struct stat st;
-        ssize_t readlen;
-        FILE *out, *hdr;
-        char *buffer, *p;
-        int fd;
-
-        if (argc != 4) {
-                fprintf(stderr, "Format: %s <grammar-file> <c-file> <hdr-file>\n",
-                        argv[0]);
-                exit(2);
-        }
-
-        filename = argv[1];
-        outputname = argv[2];
-        headername = argv[3];
-
-        fd = open(filename, O_RDONLY);
-        if (fd < 0) {
-                perror(filename);
-                exit(1);
-        }
-
-        if (fstat(fd, &st) < 0) {
-                perror(filename);
-                exit(1);
-        }
-
-        if (!(buffer = malloc(st.st_size + 1))) {
-                perror(NULL);
-                exit(1);
-        }
-
-        if ((readlen = read(fd, buffer, st.st_size)) < 0) {
-                perror(filename);
-                exit(1);
-        }
-
-        if (close(fd) < 0) {
-                perror(filename);
-                exit(1);
-        }
-
-        if (readlen != st.st_size) {
-                fprintf(stderr, "%s: Short read\n", filename);
-                exit(1);
-        }
-
-        p = strrchr(argv[1], '/');
-        p = p ? p + 1 : argv[1];
-        grammar_name = strdup(p);
-        if (!p) {
-                perror(NULL);
-                exit(1);
-        }
-        p = strchr(grammar_name, '.');
-        if (p)
-                *p = '\0';
-
-        buffer[readlen] = 0;
-        tokenise(buffer, buffer + readlen);
-        build_type_list();
-        parse();
-
-        out = fopen(outputname, "w");
-        if (!out) {
-                perror(outputname);
-                exit(1);
-        }
-
-        hdr = fopen(headername, "w");
-        if (!out) {
-                perror(headername);
-                exit(1);
-        }
-
-        render(out, hdr);
-
-        if (fclose(out) < 0) {
-                perror(outputname);
-                exit(1);
-        }
-
-        if (fclose(hdr) < 0) {
-                perror(headername);
-                exit(1);
-        }
-
-        return 0;
-}
-
-enum compound {
-        NOT_COMPOUND,
-        SET,
-        SET_OF,
-        SEQUENCE,
-        SEQUENCE_OF,
-        CHOICE,
-        ANY,
-        TYPE_REF,
-        TAG_OVERRIDE
-};
-
-struct element {
-        struct type     *type_def;
-        struct token    *name;
-        struct token    *type;
-        struct action   *action;
-        struct element  *children;
-        struct element  *next;
-        struct element  *render_next;
-        struct element  *list_next;
-        uint8_t         n_elements;
-        enum compound   compound : 8;
-        enum asn1_class class : 8;
-        enum asn1_method method : 8;
-        uint8_t         tag;
-        unsigned        entry_index;
-        unsigned        flags;
-#define ELEMENT_IMPLICIT        0x0001
-#define ELEMENT_EXPLICIT        0x0002
-#define ELEMENT_MARKED          0x0004
-#define ELEMENT_RENDERED        0x0008
-#define ELEMENT_SKIPPABLE       0x0010
-#define ELEMENT_CONDITIONAL     0x0020
-};
-
-struct type {
-        struct token    *name;
-        struct token    *def;
-        struct element  *element;
-        unsigned        ref_count;
-        unsigned        flags;
-#define TYPE_STOP_MARKER        0x0001
-#define TYPE_BEGIN              0x0002
-};
-
-static struct type *type_list;
-static struct type **type_index;
-static unsigned nr_types;
-
-static int type_index_compare(const void *_a, const void *_b)
-{
-        const struct type *const *a = _a, *const *b = _b;
-
-        if ((*a)->name->size != (*b)->name->size)
-                return (*a)->name->size - (*b)->name->size;
-        else
-                return memcmp((*a)->name->value, (*b)->name->value,
-                              (*a)->name->size);
-}
-
-static int type_finder(const void *_key, const void *_ti)
-{
-        const struct token *token = _key;
-        const struct type *const *ti = _ti;
-        const struct type *type = *ti;
-
-        if (token->size != type->name->size)
-                return token->size - type->name->size;
-        else
-                return memcmp(token->value, type->name->value,
-                              token->size);
-}
-
-/*
- * Build up a list of types and a sorted index to that list.
- */
-static void build_type_list(void)
-{
-        struct type *types;
-        unsigned nr, t, n;
-
-        nr = 0;
-        for (n = 0; n < nr_tokens - 1; n++)
-                if (token_list[n + 0].token_type == TOKEN_TYPE_NAME &&
-                    token_list[n + 1].token_type == TOKEN_ASSIGNMENT)
-                        nr++;
-
-        if (nr == 0) {
-                fprintf(stderr, "%s: No defined types\n", filename);
-                exit(1);
-        }
-
-        nr_types = nr;
-        types = type_list = calloc(nr + 1, sizeof(type_list[0]));
-        if (!type_list) {
-                perror(NULL);
-                exit(1);
-        }
-        type_index = calloc(nr, sizeof(type_index[0]));
-        if (!type_index) {
-                perror(NULL);
-                exit(1);
-        }
-
-        t = 0;
-        types[t].flags |= TYPE_BEGIN;
-        for (n = 0; n < nr_tokens - 1; n++) {
-                if (token_list[n + 0].token_type == TOKEN_TYPE_NAME &&
-                    token_list[n + 1].token_type == TOKEN_ASSIGNMENT) {
-                        types[t].name = &token_list[n];
-                        type_index[t] = &types[t];
-                        t++;
-                }
-        }
-        types[t].name = &token_list[n + 1];
-        types[t].flags |= TYPE_STOP_MARKER;
-
-        qsort(type_index, nr, sizeof(type_index[0]), type_index_compare);
-
-        printf("Extracted %u types\n", nr_types);
-#if 0
-        for (n = 0; n < nr_types; n++) {
-                struct type *type = type_index[n];
-                printf("- %*.*s\n",
-                       (int)type->name->size,
-                       (int)type->name->size,
-                       type->name->value);
-        }
-#endif
-}
-
-static struct element *parse_type(struct token **_cursor, struct token *stop,
-                                  struct token *name);
-
-/*
- * Parse the token stream
- */
-static void parse(void)
-{
-        struct token *cursor;
-        struct type *type;
-
-        /* Parse one type definition statement at a time */
-        type = type_list;
-        do {
-                cursor = type->name;
-
-                if (cursor[0].token_type != TOKEN_TYPE_NAME ||
-                    cursor[1].token_type != TOKEN_ASSIGNMENT)
-                        abort();
-                cursor += 2;
-
-                type->element = parse_type(&cursor, type[1].name, NULL);
-                type->element->type_def = type;
-
-                if (cursor != type[1].name) {
-                        fprintf(stderr, "%s:%d: Parse error at token '%*.*s'\n",
-                                filename, cursor->line,
-                                (int)cursor->size, (int)cursor->size, cursor->value);
-                        exit(1);
-                }
-
-        } while (type++, !(type->flags & TYPE_STOP_MARKER));
-
-        printf("Extracted %u actions\n", nr_actions);
-}
-
-static struct element *element_list;
-
-static struct element *alloc_elem(struct token *type)
-{
-        struct element *e = calloc(1, sizeof(*e));
-        if (!e) {
-                perror(NULL);
-                exit(1);
-        }
-        e->list_next = element_list;
-        element_list = e;
-        return e;
-}
-
-static struct element *parse_compound(struct token **_cursor, struct token *end,
-                                      int alternates);
-
-/*
- * Parse one type definition statement
- */
-static struct element *parse_type(struct token **_cursor, struct token *end,
-                                  struct token *name)
-{
-        struct element *top, *element;
-        struct action *action, **ppaction;
-        struct token *cursor = *_cursor;
-        struct type **ref;
-        char *p;
-        int labelled = 0, implicit = 0;
-
-        top = element = alloc_elem(cursor);
-        element->class = ASN1_UNIV;
-        element->method = ASN1_PRIM;
-        element->tag = token_to_tag[cursor->token_type];
-        element->name = name;
-
-        /* Extract the tag value if one given */
-        if (cursor->token_type == TOKEN_OPEN_SQUARE) {
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-                switch (cursor->token_type) {
-                case DIRECTIVE_UNIVERSAL:
-                        element->class = ASN1_UNIV;
-                        cursor++;
-                        break;
-                case DIRECTIVE_APPLICATION:
-                        element->class = ASN1_APPL;
-                        cursor++;
-                        break;
-                case TOKEN_NUMBER:
-                        element->class = ASN1_CONT;
-                        break;
-                case DIRECTIVE_PRIVATE:
-                        element->class = ASN1_PRIV;
-                        cursor++;
-                        break;
-                default:
-                        fprintf(stderr, "%s:%d: Unrecognised tag class token '%*.*s'\n",
-                                filename, cursor->line,
-                                (int)cursor->size, (int)cursor->size, cursor->value);
-                        exit(1);
-                }
-
-                if (cursor >= end)
-                        goto overrun_error;
-                if (cursor->token_type != TOKEN_NUMBER) {
-                        fprintf(stderr, "%s:%d: Missing tag number '%*.*s'\n",
-                                filename, cursor->line,
-                                (int)cursor->size, (int)cursor->size, cursor->value);
-                        exit(1);
-                }
-
-                element->tag &= ~0x1f;
-                element->tag |= strtoul(cursor->value, &p, 10);
-                if (p - cursor->value != cursor->size)
-                        abort();
-                cursor++;
-
-                if (cursor >= end)
-                        goto overrun_error;
-                if (cursor->token_type != TOKEN_CLOSE_SQUARE) {
-                        fprintf(stderr, "%s:%d: Missing closing square bracket '%*.*s'\n",
-                                filename, cursor->line,
-                                (int)cursor->size, (int)cursor->size, cursor->value);
-                        exit(1);
-                }
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-                labelled = 1;
-        }
-
-        /* Handle implicit and explicit markers */
-        if (cursor->token_type == DIRECTIVE_IMPLICIT) {
-                element->flags |= ELEMENT_IMPLICIT;
-                implicit = 1;
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-        } else if (cursor->token_type == DIRECTIVE_EXPLICIT) {
-                element->flags |= ELEMENT_EXPLICIT;
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-        }
-
-        if (labelled) {
-                if (!implicit)
-                        element->method |= ASN1_CONS;
-                element->compound = implicit ? TAG_OVERRIDE : SEQUENCE;
-                element->children = alloc_elem(cursor);
-                element = element->children;
-                element->class = ASN1_UNIV;
-                element->method = ASN1_PRIM;
-                element->tag = token_to_tag[cursor->token_type];
-                element->name = name;
-        }
-
-        /* Extract the type we're expecting here */
-        element->type = cursor;
-        switch (cursor->token_type) {
-        case DIRECTIVE_ANY:
-                element->compound = ANY;
-                cursor++;
-                break;
-
-        case DIRECTIVE_NULL:
-        case DIRECTIVE_BOOLEAN:
-        case DIRECTIVE_ENUMERATED:
-        case DIRECTIVE_INTEGER:
-                element->compound = NOT_COMPOUND;
-                cursor++;
-                break;
-
-        case DIRECTIVE_EXTERNAL:
-                element->method = ASN1_CONS;
-
-        case DIRECTIVE_BMPString:
-        case DIRECTIVE_GeneralString:
-        case DIRECTIVE_GraphicString:
-        case DIRECTIVE_IA5String:
-        case DIRECTIVE_ISO646String:
-        case DIRECTIVE_NumericString:
-        case DIRECTIVE_PrintableString:
-        case DIRECTIVE_T61String:
-        case DIRECTIVE_TeletexString:
-        case DIRECTIVE_UniversalString:
-        case DIRECTIVE_UTF8String:
-        case DIRECTIVE_VideotexString:
-        case DIRECTIVE_VisibleString:
-        case DIRECTIVE_ObjectDescriptor:
-        case DIRECTIVE_GeneralizedTime:
-        case DIRECTIVE_UTCTime:
-                element->compound = NOT_COMPOUND;
-                cursor++;
-                break;
-
-        case DIRECTIVE_BIT:
-        case DIRECTIVE_OCTET:
-                element->compound = NOT_COMPOUND;
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-                if (cursor->token_type != DIRECTIVE_STRING)
-                        goto parse_error;
-                cursor++;
-                break;
-
-        case DIRECTIVE_OBJECT:
-                element->compound = NOT_COMPOUND;
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-                if (cursor->token_type != DIRECTIVE_IDENTIFIER)
-                        goto parse_error;
-                cursor++;
-                break;
-
-        case TOKEN_TYPE_NAME:
-                element->compound = TYPE_REF;
-                ref = bsearch(cursor, type_index, nr_types, sizeof(type_index[0]),
-                              type_finder);
-                if (!ref) {
-                        fprintf(stderr, "%s:%d: Type '%*.*s' undefined\n",
-                                filename, cursor->line,
-                                (int)cursor->size, (int)cursor->size, cursor->value);
-                        exit(1);
-                }
-                cursor->type = *ref;
-                (*ref)->ref_count++;
-                cursor++;
-                break;
-
-        case DIRECTIVE_CHOICE:
-                element->compound = CHOICE;
-                cursor++;
-                element->children = parse_compound(&cursor, end, 1);
-                break;
-
-        case DIRECTIVE_SEQUENCE:
-                element->compound = SEQUENCE;
-                element->method = ASN1_CONS;
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-                if (cursor->token_type == DIRECTIVE_OF) {
-                        element->compound = SEQUENCE_OF;
-                        cursor++;
-                        if (cursor >= end)
-                                goto overrun_error;
-                        element->children = parse_type(&cursor, end, NULL);
-                } else {
-                        element->children = parse_compound(&cursor, end, 0);
-                }
-                break;
-
-        case DIRECTIVE_SET:
-                element->compound = SET;
-                element->method = ASN1_CONS;
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-                if (cursor->token_type == DIRECTIVE_OF) {
-                        element->compound = SET_OF;
-                        cursor++;
-                        if (cursor >= end)
-                                goto parse_error;
-                        element->children = parse_type(&cursor, end, NULL);
-                } else {
-                        element->children = parse_compound(&cursor, end, 1);
-                }
-                break;
-
-        default:
-                fprintf(stderr, "%s:%d: Token '%*.*s' does not introduce a type\n",
-                        filename, cursor->line,
-                        (int)cursor->size, (int)cursor->size, cursor->value);
-                exit(1);
-        }
-
-        /* Handle elements that are optional */
-        if (cursor < end && (cursor->token_type == DIRECTIVE_OPTIONAL ||
-                             cursor->token_type == DIRECTIVE_DEFAULT)
-            ) {
-                cursor++;
-                top->flags |= ELEMENT_SKIPPABLE;
-        }
-
-        if (cursor < end && cursor->token_type == TOKEN_OPEN_ACTION) {
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-                if (cursor->token_type != TOKEN_ELEMENT_NAME) {
-                        fprintf(stderr, "%s:%d: Token '%*.*s' is not an action function name\n",
-                                filename, cursor->line,
-                                (int)cursor->size, (int)cursor->size, cursor->value);
-                        exit(1);
-                }
-
-                action = malloc(sizeof(struct action) + cursor->size + 1);
-                if (!action) {
-                        perror(NULL);
-                        exit(1);
-                }
-                action->index = 0;
-                memcpy(action->name, cursor->value, cursor->size);
-                action->name[cursor->size] = 0;
-
-                for (ppaction = &action_list;
-                     *ppaction;
-                     ppaction = &(*ppaction)->next
-                     ) {
-                        int cmp = strcmp(action->name, (*ppaction)->name);
-                        if (cmp == 0) {
-                                free(action);
-                                action = *ppaction;
-                                goto found;
-                        }
-                        if (cmp < 0) {
-                                action->next = *ppaction;
-                                *ppaction = action;
-                                nr_actions++;
-                                goto found;
-                        }
-                }
-                action->next = NULL;
-                *ppaction = action;
-                nr_actions++;
-        found:
-
-                element->action = action;
-                cursor->action = action;
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-                if (cursor->token_type != TOKEN_CLOSE_ACTION) {
-                        fprintf(stderr, "%s:%d: Missing close action, got '%*.*s'\n",
-                                filename, cursor->line,
-                                (int)cursor->size, (int)cursor->size, cursor->value);
-                        exit(1);
-                }
-                cursor++;
-        }
-
-        *_cursor = cursor;
-        return top;
-
-parse_error:
-        fprintf(stderr, "%s:%d: Unexpected token '%*.*s'\n",
-                filename, cursor->line,
-                (int)cursor->size, (int)cursor->size, cursor->value);
-        exit(1);
-
-overrun_error:
-        fprintf(stderr, "%s: Unexpectedly hit EOF\n", filename);
-        exit(1);
-}
-
-/*
- * Parse a compound type list
- */
-static struct element *parse_compound(struct token **_cursor, struct token *end,
-                                      int alternates)
-{
-        struct element *children, **child_p = &children, *element;
-        struct token *cursor = *_cursor, *name;
-
-        if (cursor->token_type != TOKEN_OPEN_CURLY) {
-                fprintf(stderr, "%s:%d: Expected compound to start with brace not '%*.*s'\n",
-                        filename, cursor->line,
-                        (int)cursor->size, (int)cursor->size, cursor->value);
-                exit(1);
-        }
-        cursor++;
-        if (cursor >= end)
-                goto overrun_error;
-
-        if (cursor->token_type == TOKEN_OPEN_CURLY) {
-                fprintf(stderr, "%s:%d: Empty compound\n",
-                        filename, cursor->line);
-                exit(1);
-        }
-
-        for (;;) {
-                name = NULL;
-                if (cursor->token_type == TOKEN_ELEMENT_NAME) {
-                        name = cursor;
-                        cursor++;
-                        if (cursor >= end)
-                                goto overrun_error;
-                }
-
-                element = parse_type(&cursor, end, name);
-                if (alternates)
-                        element->flags |= ELEMENT_SKIPPABLE | ELEMENT_CONDITIONAL;
-
-                *child_p = element;
-                child_p = &element->next;
-
-                if (cursor >= end)
-                        goto overrun_error;
-                if (cursor->token_type != TOKEN_COMMA)
-                        break;
-                cursor++;
-                if (cursor >= end)
-                        goto overrun_error;
-        }
-
-        children->flags &= ~ELEMENT_CONDITIONAL;
-
-        if (cursor->token_type != TOKEN_CLOSE_CURLY) {
-                fprintf(stderr, "%s:%d: Expected compound closure, got '%*.*s'\n",
-                        filename, cursor->line,
-                        (int)cursor->size, (int)cursor->size, cursor->value);
-                exit(1);
-        }
-        cursor++;
-
-        *_cursor = cursor;
-        return children;
-
-overrun_error:
-        fprintf(stderr, "%s: Unexpectedly hit EOF\n", filename);
-        exit(1);
-}
-
-static void render_element(FILE *out, struct element *e, struct element *tag);
-static void render_out_of_line_list(FILE *out);
-
-static int nr_entries;
-static int render_depth = 1;
-static struct element *render_list, **render_list_p = &render_list;
-
-__attribute__((format(printf, 2, 3)))
-static void render_opcode(FILE *out, const char *fmt, ...)
-{
-        va_list va;
-
-        if (out) {
-                fprintf(out, "\t[%4d] =%*s", nr_entries, render_depth, "");
-                va_start(va, fmt);
-                vfprintf(out, fmt, va);
-                va_end(va);
-        }
-        nr_entries++;
-}
-
-__attribute__((format(printf, 2, 3)))
-static void render_more(FILE *out, const char *fmt, ...)
-{
-        va_list va;
-
-        if (out) {
-                va_start(va, fmt);
-                vfprintf(out, fmt, va);
-                va_end(va);
-        }
-}
-
-/*
- * Render the grammar into a state machine definition.
- */
-static void render(FILE *out, FILE *hdr)
-{
-        struct element *e;
-        struct action *action;
-        struct type *root;
-        int index;
-
-        fprintf(hdr, "/*\n");
-        fprintf(hdr, " * Automatically generated by asn1_compiler.  Do not edit\n");
-        fprintf(hdr, " *\n");
-        fprintf(hdr, " * ASN.1 parser for %s\n", grammar_name);
-        fprintf(hdr, " */\n");
-        fprintf(hdr, "#include <linux/asn1_decoder.h>\n");
-        fprintf(hdr, "\n");
-        fprintf(hdr, "extern const struct asn1_decoder %s_decoder;\n", grammar_name);
-        if (ferror(hdr)) {
-                perror(headername);
-                exit(1);
-        }
-
-        fprintf(out, "/*\n");
-        fprintf(out, " * Automatically generated by asn1_compiler.  Do not edit\n");
-        fprintf(out, " *\n");
-        fprintf(out, " * ASN.1 parser for %s\n", grammar_name);
-        fprintf(out, " */\n");
-        fprintf(out, "#include <linux/asn1_ber_bytecode.h>\n");
-        fprintf(out, "#include \"%s-asn1.h\"\n", grammar_name);
-        fprintf(out, "\n");
-        if (ferror(out)) {
-                perror(outputname);
-                exit(1);
-        }
-
-        /* Tabulate the action functions we might have to call */
-        fprintf(hdr, "\n");
-        index = 0;
-        for (action = action_list; action; action = action->next) {
-                action->index = index++;
-                fprintf(hdr,
-                        "extern int %s(void *, size_t, unsigned char,"
-                        " const void *, size_t);\n",
-                        action->name);
-        }
-        fprintf(hdr, "\n");
-
-        fprintf(out, "enum %s_actions {\n", grammar_name);
-        for (action = action_list; action; action = action->next)
-                fprintf(out, "\tACT_%s = %u,\n",
-                        action->name, action->index);
-        fprintf(out, "\tNR__%s_actions = %u\n", grammar_name, nr_actions);
-        fprintf(out, "};\n");
-
-        fprintf(out, "\n");
-        fprintf(out, "static const asn1_action_t %s_action_table[NR__%s_actions] = {\n",
-                grammar_name, grammar_name);
-        for (action = action_list; action; action = action->next)
-                fprintf(out, "\t[%4u] = %s,\n", action->index, action->name);
-        fprintf(out, "};\n");
-
-        if (ferror(out)) {
-                perror(outputname);
-                exit(1);
-        }
-
-        /* We do two passes - the first one calculates all the offsets */
-        printf("Pass 1\n");
-        nr_entries = 0;
-        root = &type_list[0];
-        render_element(NULL, root->element, NULL);
-        render_opcode(NULL, "ASN1_OP_COMPLETE,\n");
-        render_out_of_line_list(NULL);
-
-        for (e = element_list; e; e = e->list_next)
-                e->flags &= ~ELEMENT_RENDERED;
-
-        /* And then we actually render */
-        printf("Pass 2\n");
-        fprintf(out, "\n");
-        fprintf(out, "static const unsigned char %s_machine[] = {\n",
-                grammar_name);
-
-        nr_entries = 0;
-        root = &type_list[0];
-        render_element(out, root->element, NULL);
-        render_opcode(out, "ASN1_OP_COMPLETE,\n");
-        render_out_of_line_list(out);
-
-        fprintf(out, "};\n");
-
-        fprintf(out, "\n");
-        fprintf(out, "const struct asn1_decoder %s_decoder = {\n", grammar_name);
-        fprintf(out, "\t.machine = %s_machine,\n", grammar_name);
-        fprintf(out, "\t.machlen = sizeof(%s_machine),\n", grammar_name);
-        fprintf(out, "\t.actions = %s_action_table,\n", grammar_name);
-        fprintf(out, "};\n");
-}
-
-/*
- * Render the out-of-line elements
- */
-static void render_out_of_line_list(FILE *out)
-{
-        struct element *e, *ce;
-        const char *act;
-        int entry;
-
-        while ((e = render_list)) {
-                render_list = e->render_next;
-                if (!render_list)
-                        render_list_p = &render_list;
-
-                render_more(out, "\n");
-                e->entry_index = entry = nr_entries;
-                render_depth++;
-                for (ce = e->children; ce; ce = ce->next)
-                        render_element(out, ce, NULL);
-                render_depth--;
-
-                act = e->action ? "_ACT" : "";
-                switch (e->compound) {
-                case SEQUENCE:
-                        render_opcode(out, "ASN1_OP_END_SEQ%s,\n", act);
-                        break;
-                case SEQUENCE_OF:
-                        render_opcode(out, "ASN1_OP_END_SEQ_OF%s,\n", act);
-                        render_opcode(out, "_jump_target(%u),\n", entry);
-                        break;
-                case SET:
-                        render_opcode(out, "ASN1_OP_END_SET%s,\n", act);
-                        break;
-                case SET_OF:
-                        render_opcode(out, "ASN1_OP_END_SET_OF%s,\n", act);
-                        render_opcode(out, "_jump_target(%u),\n", entry);
-                        break;
-                }
-                if (e->action)
-                        render_opcode(out, "_action(ACT_%s),\n",
-                                      e->action->name);
-                render_opcode(out, "ASN1_OP_RETURN,\n");
-        }
-}
-
-/*
- * Render an element.
- */
-static void render_element(FILE *out, struct element *e, struct element *tag)
-{
-        struct element *ec;
-        const char *cond, *act;
-        int entry, skippable = 0, outofline = 0;
-
-        if (e->flags & ELEMENT_SKIPPABLE ||
-            (tag && tag->flags & ELEMENT_SKIPPABLE))
-                skippable = 1;
-
-        if ((e->type_def && e->type_def->ref_count > 1) ||
-            skippable)
-                outofline = 1;
-
-        if (e->type_def && out) {
-                render_more(out, "\t// %*.*s\n",
-                            (int)e->type_def->name->size, (int)e->type_def->name->size,
-                            e->type_def->name->value);
-        }
-
-        /* Render the operation */
-        cond = (e->flags & ELEMENT_CONDITIONAL ||
-                (tag && tag->flags & ELEMENT_CONDITIONAL)) ? "COND_" : "";
-        act = e->action ? "_ACT" : "";
-        switch (e->compound) {
-        case ANY:
-                render_opcode(out, "ASN1_OP_%sMATCH_ANY%s,", cond, act);
-                if (e->name)
-                        render_more(out, "\t\t// %*.*s",
-                                    (int)e->name->size, (int)e->name->size,
-                                    e->name->value);
-                render_more(out, "\n");
-                goto dont_render_tag;
-
-        case TAG_OVERRIDE:
-                render_element(out, e->children, e);
-                return;
-
-        case SEQUENCE:
-        case SEQUENCE_OF:
-        case SET:
-        case SET_OF:
-                render_opcode(out, "ASN1_OP_%sMATCH%s%s,",
-                              cond,
-                              outofline ? "_JUMP" : "",
-                              skippable ? "_OR_SKIP" : "");
-                break;
-
-        case CHOICE:
-                goto dont_render_tag;
-
-        case TYPE_REF:
-                if (e->class == ASN1_UNIV && e->method == ASN1_PRIM && e->tag == 0)
-                        goto dont_render_tag;
-        default:
-                render_opcode(out, "ASN1_OP_%sMATCH%s%s,",
-                              cond, act,
-                              skippable ? "_OR_SKIP" : "");
-                break;
-        }
-
-        if (e->name)
-                render_more(out, "\t\t// %*.*s",
-                            (int)e->name->size, (int)e->name->size,
-                            e->name->value);
-        render_more(out, "\n");
-
-        /* Render the tag */
-        if (!tag)
-                tag = e;
-        if (tag->class == ASN1_UNIV &&
-            tag->tag != 14 &&
-            tag->tag != 15 &&
-            tag->tag != 31)
-                render_opcode(out, "_tag(%s, %s, %s),\n",
-                              asn1_classes[tag->class],
-                              asn1_methods[tag->method | e->method],
-                              asn1_universal_tags[tag->tag]);
-        else
-                render_opcode(out, "_tagn(%s, %s, %2u),\n",
-                              asn1_classes[tag->class],
-                              asn1_methods[tag->method | e->method],
-                              tag->tag);
-        tag = NULL;
-dont_render_tag:
-
-        /* Deal with compound types */
-        switch (e->compound) {
-        case TYPE_REF:
-                render_element(out, e->type->type->element, tag);
-                if (e->action)
-                        render_opcode(out, "ASN1_OP_ACT,\n");
-                break;
-
-        case SEQUENCE:
-                if (outofline) {
-                        /* Render out-of-line for multiple use or
-                         * skipability */
-                        render_opcode(out, "_jump_target(%u),", e->entry_index);
-                        if (e->type_def && e->type_def->name)
-                                render_more(out, "\t\t// --> %*.*s",
-                                            (int)e->type_def->name->size,
-                                            (int)e->type_def->name->size,
-                                            e->type_def->name->value);
-                        render_more(out, "\n");
-                        if (!(e->flags & ELEMENT_RENDERED)) {
-                                e->flags |= ELEMENT_RENDERED;
-                                *render_list_p = e;
-                                render_list_p = &e->render_next;
-                        }
-                        return;
-                } else {
-                        /* Render inline for single use */
-                        render_depth++;
-                        for (ec = e->children; ec; ec = ec->next)
-                                render_element(out, ec, NULL);
-                        render_depth--;
-                        render_opcode(out, "ASN1_OP_END_SEQ%s,\n", act);
-                }
-                break;
-
-        case SEQUENCE_OF:
-        case SET_OF:
-                if (outofline) {
-                        /* Render out-of-line for multiple use or
-                         * skipability */
-                        render_opcode(out, "_jump_target(%u),", e->entry_index);
-                        if (e->type_def && e->type_def->name)
-                                render_more(out, "\t\t// --> %*.*s",
-                                            (int)e->type_def->name->size,
-                                            (int)e->type_def->name->size,
-                                            e->type_def->name->value);
-                        render_more(out, "\n");
-                        if (!(e->flags & ELEMENT_RENDERED)) {
-                                e->flags |= ELEMENT_RENDERED;
-                                *render_list_p = e;
-                                render_list_p = &e->render_next;
-                        }
-                        return;
-                } else {
-                        /* Render inline for single use */
-                        entry = nr_entries;
-                        render_depth++;
-                        render_element(out, e->children, NULL);
-                        render_depth--;
-                        if (e->compound == SEQUENCE_OF)
-                                render_opcode(out, "ASN1_OP_END_SEQ_OF%s,\n", act);
-                        else
-                                render_opcode(out, "ASN1_OP_END_SET_OF%s,\n", act);
-                        render_opcode(out, "_jump_target(%u),\n", entry);
-                }
-                break;
-
-        case SET:
-                /* I can't think of a nice way to do SET support without having
-                 * a stack of bitmasks to make sure no element is repeated.
-                 * The bitmask has also to be checked that no non-optional
-                 * elements are left out whilst not preventing optional
-                 * elements from being left out.
-                 */
-                fprintf(stderr, "The ASN.1 SET type is not currently supported.\n");
-                exit(1);
-
-        case CHOICE:
-                for (ec = e->children; ec; ec = ec->next)
-                        render_element(out, ec, NULL);
-                if (!skippable)
-                        render_opcode(out, "ASN1_OP_COND_FAIL,\n");
-                if (e->action)
-                        render_opcode(out, "ASN1_OP_ACT,\n");
-                break;
-
-        default:
-                break;
-        }
-
-        if (e->action)
-                render_opcode(out, "_action(ACT_%s),\n", e->action->name);
-}
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index cb1f50cf12e..291228e2598 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -345,7 +345,6 @@ static void parse_dep_file(void *map, size_t len)
                 memcpy(s, m, p-m); s[p-m] = 0;
                 if (strrcmp(s, "include/generated/autoconf.h") &&
                     strrcmp(s, "arch/um/include/uml-config.h") &&
-                    strrcmp(s, "include/linux/kconfig.h") &&
                     strrcmp(s, ".ver")) {
                         /*
                          * Do not list the source file as dependency, so that
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4d2c7dfdaab..3dfc47134e5 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -33,7 +33,6 @@ my %ignore_type = ();
 my @ignore = ();
 my $help = 0;
 my $configuration_file = ".checkpatch.conf";
-my $max_line_length = 80;
 
 sub help {
         my ($exitcode) = @_;
@@ -52,7 +51,6 @@ Options:
   -f, --file                 treat FILE as regular source file
   --subjective, --strict     enable more subjective tests
   --ignore TYPE(,TYPE2...)   ignore various comma separated message types
-  --max-line-length=n        set the maximum line length, if exceeded, warn
   --show-types               show the message "types" in the output
   --root=PATH                PATH to the kernel tree root
   --no-summary               suppress the per-file summary
@@ -109,7 +107,6 @@ GetOptions(
         'strict!'       => \$check,
         'ignore=s'      => \@ignore,
         'show-types!'   => \$show_types,
-        'max-line-length=i' => \$max_line_length,
         'root=s'        => \$root,
         'summary!'      => \$summary,
         'mailback!'     => \$mailback,
@@ -230,11 +227,7 @@ our $Inline	= qr{inline|__always_inline|noinline};
 our $Member     = qr{->$Ident|\.$Ident|\[[^]]*\]};
 our $Lval       = qr{$Ident(?:$Member)*};
 
-our $Float_hex  = qr{(?i:0x[0-9a-f]+p-?[0-9]+[fl]?)};
-our $Float_dec  = qr{(?i:((?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?))};
-our $Float_int  = qr{(?i:[0-9]+e-?[0-9]+[fl]?)};
-our $Float      = qr{$Float_hex|$Float_dec|$Float_int};
-our $Constant   = qr{(?:$Float|(?i:(?:0x[0-9a-f]+|[0-9]+)[ul]*))};
+our $Constant   = qr{(?:[0-9]+|0x[0-9a-fA-F]+)[UL]*};
 our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
 our $Compare    = qr{<=|>=|==|!=|<|>};
 our $Operators  = qr{
@@ -247,8 +240,9 @@ our $NonptrType;
 our $Type;
 our $Declare;
 
-our $NON_ASCII_UTF8     = qr{
-        [\xC2-\xDF][\x80-\xBF]               # non-overlong 2-byte
+our $UTF8       = qr {
+        [\x09\x0A\x0D\x20-\x7E]              # ASCII
+        | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
         |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
         | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
         |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
@@ -257,11 +251,6 @@ our $NON_ASCII_UTF8	= qr{
         |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
 }x;
 
-our $UTF8       = qr{
-        [\x09\x0A\x0D\x20-\x7E]              # ASCII
-        | $NON_ASCII_UTF8
-}x;
-
 our $typeTypedefs = qr{(?x:
         (?:__)?(?:u|s|be|le)(?:8|16|32|64)|
         atomic_t
@@ -322,7 +311,7 @@ sub build_types {
         $NonptrType     = qr{
                         (?:$Modifier\s+|const\s+)*
                         (?:
-                                (?:typeof|__typeof__)\s*\([^\)]*\)|
+                                (?:typeof|__typeof__)\s*\(\s*\**\s*$Ident\s*\)|
                                 (?:$typeTypedefs\b)|
                                 (?:${all}\b)
                         )
@@ -330,23 +319,17 @@ sub build_types {
                   }x;
         $Type   = qr{
                         $NonptrType
-                        (?:(?:\s|\*|\[\])+\s*const|(?:\s|\*|\[\])+|(?:\s*\[\s*\])+)?
+                        (?:[\s\*]+\s*const|[\s\*]+|(?:\s*\[\s*\])+)?
                         (?:\s+$Inline|\s+$Modifier)*
                   }x;
         $Declare        = qr{(?:$Storage\s+)?$Type};
 }
 build_types();
 
+our $match_balanced_parentheses = qr/(\((?:[^\(\)]+|(-1))*\))/;
 
 our $Typecast   = qr{\s*(\(\s*$NonptrType\s*\)){0,1}\s*};
-
-# Using $balanced_parens, $LvalOrFunc, or $FuncArg
-# requires at least perl version v5.10.0
-# Any use must be runtime checked with $^V
-
-our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;
-our $LvalOrFunc = qr{($Lval)\s*($balanced_parens{0,1})\s*};
-our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)};
+our $LvalOrFunc = qr{($Lval)\s*($match_balanced_parentheses{0,1})\s*};
 
 sub deparenthesize {
         my ($string) = @_;
@@ -359,6 +342,27 @@ sub deparenthesize {
 
 $chk_signoff = 0 if ($file);
 
+my @dep_includes = ();
+my @dep_functions = ();
+my $removal = "Documentation/feature-removal-schedule.txt";
+if ($tree && -f "$root/$removal") {
+        open(my $REMOVE, '<', "$root/$removal") ||
+                                die "$P: $removal: open failed - $!\n";
+        while (<$REMOVE>) {
+                if (/^Check:\s+(.*\S)/) {
+                        for my $entry (split(/[, ]+/, $1)) {
+                                if ($entry =~ m@include/(.*)@) {
+                                        push(@dep_includes, $1);
+
+                                } elsif ($entry !~ m@/@) {
+                                        push(@dep_functions, $entry);
+                                }
+                        }
+                }
+        }
+        close($REMOVE);
+}
+
 my @rawlines = ();
 my @lines = ();
 my $vname;
@@ -407,7 +411,7 @@ sub top_of_kernel_tree {
                 }
         }
         return 1;
-}
+    }
 
 sub parse_email {
         my ($formatted_email) = @_;
@@ -668,10 +672,6 @@ sub ctx_statement_block {
                         if ($off >= $len) {
                                 last;
                         }
-                        if ($level == 0 && substr($blk, $off) =~ /^.\s*#\s*define/) {
-                                $level++;
-                                $type = '#';
-                        }
                 }
                 $p = $c;
                 $c = substr($blk, $off, 1);
@@ -734,13 +734,6 @@ sub ctx_statement_block {
                                 last;
                         }
                 }
-                # Preprocessor commands end at the newline unless escaped.
-                if ($type eq '#' && $c eq "\n" && $p ne "\\") {
-                        $level--;
-                        $type = '';
-                        $off++;
-                        last;
-                }
                 $off++;
         }
         # We are truly at the end, so shuffle to the next line.
@@ -1023,7 +1016,7 @@ sub annotate_values {
                 } elsif ($cur =~ /^(\(\s*$Type\s*)\)/ && $av_pending eq '_') {
                         print "CAST($1)\n" if ($dbg_values > 1);
                         push(@av_paren_type, $type);
-                        $type = 'c';
+                        $type = 'C';
 
                 } elsif ($cur =~ /^($Type)\s*(?:$Ident|,|\)|\(|\s*$)/) {
                         print "DECLARE($1)\n" if ($dbg_values > 1);
@@ -1215,9 +1208,7 @@ sub possible {
                         case|
                         else|
                         asm|__asm__|
-                        do|
-                        \#|
-                        \#\#|
+                        do
                 )(?:\s|$)|
                 ^(?:typedef|struct|enum)\b
             )}x;
@@ -1321,36 +1312,6 @@ sub check_absolute_file {
         }
 }
 
-sub pos_last_openparen {
-        my ($line) = @_;
-
-        my $pos = 0;
-
-        my $opens = $line =~ tr/\(/\(/;
-        my $closes = $line =~ tr/\)/\)/;
-
-        my $last_openparen = 0;
-
-        if (($opens == 0) || ($closes >= $opens)) {
-                return -1;
-        }
-
-        my $len = length($line);
-
-        for ($pos = 0; $pos < $len; $pos++) {
-                my $string = substr($line, $pos);
-                if ($string =~ /^($FuncArg|$balanced_parens)/) {
-                        $pos += length($1) - 1;
-                } elsif (substr($line, $pos, 1) eq '(') {
-                        $last_openparen = $pos;
-                } elsif (index($string, '(') == -1) {
-                        last;
-                }
-        }
-
-        return $last_openparen + 1;
-}
-
 sub process {
         my $filename = shift;
 
@@ -1369,11 +1330,6 @@ sub process {
         my $signoff = 0;
         my $is_patch = 0;
 
-        my $in_header_lines = 1;
-        my $in_commit_log = 0;          #Scanning lines before patch
-
-        my $non_utf8_charset = 0;
-
         our @report = ();
         our $cnt_lines = 0;
         our $cnt_error = 0;
@@ -1396,9 +1352,6 @@ sub process {
         my %suppress_ifbraces;
         my %suppress_whiletrailers;
         my %suppress_export;
-        my $suppress_statement = 0;
-
-        my %camelcase = ();
 
         # Pre-scan the patch sanitizing the lines.
         # Pre-scan the patch looking for any __setup documentation.
@@ -1508,7 +1461,6 @@ sub process {
                         %suppress_ifbraces = ();
                         %suppress_whiletrailers = ();
                         %suppress_export = ();
-                        $suppress_statement = 0;
                         next;
 
 # track the line number as we move through the hunk, note that
@@ -1545,11 +1497,10 @@ sub process {
                 if ($line =~ /^diff --git.*?(\S+)$/) {
                         $realfile = $1;
                         $realfile =~ s@^([^/]*)/@@;
-                        $in_commit_log = 0;
+
                 } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
                         $realfile = $1;
                         $realfile =~ s@^([^/]*)/@@;
-                        $in_commit_log = 0;
 
                         $p1_prefix = $1;
                         if (!$file && $tree && $p1_prefix ne '' &&
@@ -1585,22 +1536,16 @@ sub process {
 # Check the patch for a signoff:
                 if ($line =~ /^\s*signed-off-by:/i) {
                         $signoff++;
-                        $in_commit_log = 0;
                 }
 
 # Check signature styles
-                if (!$in_header_lines &&
-                    $line =~ /^(\s*)([a-z0-9_-]+by:|$signature_tags)(\s*)(.*)/i) {
+                if ($line =~ /^(\s*)($signature_tags)(\s*)(.*)/) {
                         my $space_before = $1;
                         my $sign_off = $2;
                         my $space_after = $3;
                         my $email = $4;
                         my $ucfirst_sign_off = ucfirst(lc($sign_off));
 
-                        if ($sign_off !~ /$signature_tags/) {
-                                WARN("BAD_SIGN_OFF",
-                                     "Non-standard signature: $sign_off\n" . $herecurr);
-                        }
                         if (defined $space_before && $space_before ne "") {
                                 WARN("BAD_SIGN_OFF",
                                      "Do not use whitespace before $ucfirst_sign_off\n" . $herecurr);
@@ -1668,28 +1613,6 @@ sub process {
                             "Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
                 }
 
-# Check if it's the start of a commit log
-# (not a header line and we haven't seen the patch filename)
-                if ($in_header_lines && $realfile =~ /^$/ &&
-                    $rawline !~ /^(commit\b|from\b|[\w-]+:).+$/i) {
-                        $in_header_lines = 0;
-                        $in_commit_log = 1;
-                }
-
-# Check if there is UTF-8 in a commit log when a mail header has explicitly
-# declined it, i.e defined some charset where it is missing.
-                if ($in_header_lines &&
-                    $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
-                    $1 !~ /utf-8/i) {
-                        $non_utf8_charset = 1;
-                }
-
-                if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
-                    $rawline =~ /$NON_ASCII_UTF8/) {
-                        WARN("UTF8_BEFORE_PATCH",
-                            "8-bit UTF-8 used in possible commit log\n" . $herecurr);
-                }
-
 # ignore non-hunk lines and lines being removed
                 next if (!$hunk_line || $line =~ /^-/);
 
@@ -1710,26 +1633,19 @@ sub process {
 # Only applies when adding the entry originally, after that we do not have
 # sufficient context to determine whether it is indeed long enough.
                 if ($realfile =~ /Kconfig/ &&
-                    $line =~ /.\s*config\s+/) {
+                    $line =~ /\+\s*(?:---)?help(?:---)?$/) {
                         my $length = 0;
                         my $cnt = $realcnt;
                         my $ln = $linenr + 1;
                         my $f;
-                        my $is_start = 0;
                         my $is_end = 0;
-                        for (; $cnt > 0 && defined $lines[$ln - 1]; $ln++) {
+                        while ($cnt > 0 && defined $lines[$ln - 1]) {
                                 $f = $lines[$ln - 1];
                                 $cnt-- if ($lines[$ln - 1] !~ /^-/);
                                 $is_end = $lines[$ln - 1] =~ /^\+/;
+                                $ln++;
 
                                 next if ($f =~ /^-/);
-
-                                if ($lines[$ln - 1] =~ /.\s*(?:bool|tristate)\s*\"/) {
-                                        $is_start = 1;
-                                } elsif ($lines[$ln - 1] =~ /.\s*(?:---)?help(?:---)?$/) {
-                                        $length = -1;
-                                }
-
                                 $f =~ s/^.//;
                                 $f =~ s/#.*//;
                                 $f =~ s/^\s+//;
@@ -1741,58 +1657,22 @@ sub process {
                                 $length++;
                         }
                         WARN("CONFIG_DESCRIPTION",
-                             "please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($is_start && $is_end && $length < 4);
-                        #print "is_start<$is_start> is_end<$is_end> length<$length>\n";
-                }
-
-# discourage the addition of CONFIG_EXPERIMENTAL in Kconfig.
-                if ($realfile =~ /Kconfig/ &&
-                    $line =~ /.\s*depends on\s+.*\bEXPERIMENTAL\b/) {
-                        WARN("CONFIG_EXPERIMENTAL",
-                             "Use of CONFIG_EXPERIMENTAL is deprecated. For alternatives, see https://lkml.org/lkml/2012/10/23/580\n");
-                }
-
-                if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
-                    ($line =~ /\+(EXTRA_[A-Z]+FLAGS).*/)) {
-                        my $flag = $1;
-                        my $replacement = {
-                                'EXTRA_AFLAGS' =>   'asflags-y',
-                                'EXTRA_CFLAGS' =>   'ccflags-y',
-                                'EXTRA_CPPFLAGS' => 'cppflags-y',
-                                'EXTRA_LDFLAGS' =>  'ldflags-y',
-                        };
-
-                        WARN("DEPRECATED_VARIABLE",
-                             "Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
+                             "please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($is_end && $length < 4);
+                        #print "is_end<$is_end> length<$length>\n";
                 }
 
 # check we are in a valid source file if not then ignore this hunk
                 next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
 
-#line length limit
+#80 column limit
                 if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
                     $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
                     !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:|,|\)\s*;)\s*$/ ||
                     $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
-                    $length > $max_line_length)
+                    $length > 80)
                 {
                         WARN("LONG_LINE",
-                             "line over $max_line_length characters\n" . $herecurr);
-                }
-
-# Check for user-visible strings broken across lines, which breaks the ability
-# to grep for the string.  Limited to strings used as parameters (those
-# following an open parenthesis), which almost completely eliminates false
-# positives, as well as warning only once per parameter rather than once per
-# line of the string.  Make an exception when the previous string ends in a
-# newline (multiple lines in one string constant) or \n\t (common in inline
-# assembly to indent the instruction on the following line).
-                if ($line =~ /^\+\s*"/ &&
-                    $prevline =~ /"\s*$/ &&
-                    $prevline =~ /\(/ &&
-                    $prevrawline !~ /\\n(?:\\t)*"\s*$/) {
-                        WARN("SPLIT_STRING",
-                             "quoted string split across lines\n" . $hereprev);
+                             "line over 80 characters\n" . $herecurr);
                 }
 
 # check for spaces before a quoted newline
@@ -1841,58 +1721,6 @@ sub process {
                              "please, no space before tabs\n" . $herevet);
                 }
 
-# check for && or || at the start of a line
-                if ($rawline =~ /^\+\s*(&&|\|\|)/) {
-                        CHK("LOGICAL_CONTINUATIONS",
-                            "Logical continuations should be on the previous line\n" . $hereprev);
-                }
-
-# check multi-line statement indentation matches previous line
-                if ($^V && $^V ge 5.10.0 &&
-                    $prevline =~ /^\+(\t*)(if \(|$Ident\().*(\&\&|\|\||,)\s*$/) {
-                        $prevline =~ /^\+(\t*)(.*)$/;
-                        my $oldindent = $1;
-                        my $rest = $2;
-
-                        my $pos = pos_last_openparen($rest);
-                        if ($pos >= 0) {
-                                $line =~ /^(\+| )([ \t]*)/;
-                                my $newindent = $2;
-
-                                my $goodtabindent = $oldindent .
-                                        "\t" x ($pos / 8) .
-                                        " "  x ($pos % 8);
-                                my $goodspaceindent = $oldindent . " "  x $pos;
-
-                                if ($newindent ne $goodtabindent &&
-                                    $newindent ne $goodspaceindent) {
-                                        CHK("PARENTHESIS_ALIGNMENT",
-                                            "Alignment should match open parenthesis\n" . $hereprev);
-                                }
-                        }
-                }
-
-                if ($line =~ /^\+.*\*[ \t]*\)[ \t]+/) {
-                        CHK("SPACING",
-                            "No space is necessary after a cast\n" . $hereprev);
-                }
-
-                if ($realfile =~ m@^(drivers/net/|net/)@ &&
-                    $rawline =~ /^\+[ \t]*\/\*[ \t]*$/ &&
-                    $prevrawline =~ /^\+[ \t]*$/) {
-                        WARN("NETWORKING_BLOCK_COMMENT_STYLE",
-                             "networking block comments don't use an empty /* line, use /* Comment...\n" . $hereprev);
-                }
-
-                if ($realfile =~ m@^(drivers/net/|net/)@ &&
-                    $rawline !~ m@^\+[ \t]*\*/[ \t]*$@ &&       #trailing */
-                    $rawline !~ m@^\+.*/\*.*\*/[ \t]*$@ &&      #inline /*...*/
-                    $rawline !~ m@^\+.*\*{2,}/[ \t]*$@ &&       #trailing **/
-                    $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) {    #non blank */
-                        WARN("NETWORKING_BLOCK_COMMENT_STYLE",
-                             "networking block comments put the trailing */ on a separate line\n" . $herecurr);
-                }
-
 # check for spaces at the beginning of a line.
 # Exceptions:
 #  1) within comments
@@ -1907,12 +1735,6 @@ sub process {
 # check we are in a valid C source file if not then ignore this hunk
                 next if ($realfile !~ /\.(h|c)$/);
 
-# discourage the addition of CONFIG_EXPERIMENTAL in #if(def).
-                if ($line =~ /^\+\s*\#\s*if.*\bCONFIG_EXPERIMENTAL\b/) {
-                        WARN("CONFIG_EXPERIMENTAL",
-                             "Use of CONFIG_EXPERIMENTAL is deprecated. For alternatives, see https://lkml.org/lkml/2012/10/23/580\n");
-                }
-
 # check for RCS/CVS revision markers
                 if ($rawline =~ /^\+.*\$(Revision|Log|Id)(?:\$|)/) {
                         WARN("CVS_KEYWORD",
@@ -1934,24 +1756,12 @@ sub process {
 # Check for potential 'bare' types
                 my ($stat, $cond, $line_nr_next, $remain_next, $off_next,
                     $realline_next);
-#print "LINE<$line>\n";
-                if ($linenr >= $suppress_statement &&
-                    $realcnt && $line =~ /.\s*\S/) {
+                if ($realcnt && $line =~ /.\s*\S/) {
                         ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
                                 ctx_statement_block($linenr, $realcnt, 0);
                         $stat =~ s/\n./\n /g;
                         $cond =~ s/\n./\n /g;
 
-#print "linenr<$linenr> <$stat>\n";
-                        # If this statement has no statement boundaries within
-                        # it there is no point in retrying a statement scan
-                        # until we hit end of it.
-                        my $frag = $stat; $frag =~ s/;+\s*$//;
-                        if ($frag !~ /(?:{|;)/) {
-#print "skip<$line_nr_next>\n";
-                                $suppress_statement = $line_nr_next;
-                        }
-
                         # Find the real next line.
                         $realline_next = $line_nr_next;
                         if (defined $realline_next &&
@@ -2040,12 +1850,6 @@ sub process {
                         my $pre_ctx = "$1$2";
 
                         my ($level, @ctx) = ctx_statement_level($linenr, $realcnt, 0);
-
-                        if ($line =~ /^\+\t{6,}/) {
-                                WARN("DEEP_INDENTATION",
-                                     "Too many leading tabs - consider code refactoring\n" . $herecurr);
-                        }
-
                         my $ctx_cnt = $realcnt - $#ctx - 1;
                         my $ctx = join("\n", @ctx);
 
@@ -2083,9 +1887,6 @@ sub process {
 
 # Check relative indent for conditionals and blocks.
                 if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
-                        ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
-                                ctx_statement_block($linenr, $realcnt, 0)
-                                        if (!defined $stat);
                         my ($s, $c) = ($stat, $cond);
 
                         substr($s, 0, length($c), '');
@@ -2226,11 +2027,8 @@ sub process {
                         my $path = $1;
                         if ($path =~ m{//}) {
                                 ERROR("MALFORMED_INCLUDE",
-                                      "malformed #include filename\n" . $herecurr);
-                        }
-                        if ($path =~ "^uapi/" && $realfile =~ m@\binclude/uapi/@) {
-                                ERROR("UAPI_INCLUDE",
-                                      "No #include in ...include/uapi/... should use a uapi/ path prefix\n" . $herecurr);
+                                      "malformed #include filename\n" .
+                                        $herecurr);
                         }
                 }
 
@@ -2256,7 +2054,7 @@ sub process {
                         #   XXX(foo);
                         #   EXPORT_SYMBOL(something_foo);
                         my $name = $1;
-                        if ($stat =~ /^(?:.\s*}\s*\n)?.([A-Z_]+)\s*\(\s*($Ident)/ &&
+                        if ($stat =~ /^.([A-Z_]+)\s*\(\s*($Ident)/ &&
                             $name =~ /^${Ident}_$2/) {
 #print "FOO C name<$name>\n";
                                 $suppress_export{$realline_next} = 1;
@@ -2334,9 +2132,8 @@ sub process {
 
 # * goes on variable not on type
                 # (char*[ const])
-                while ($line =~ m{(\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\))}g) {
-                        #print "AA<$1>\n";
-                        my ($from, $to) = ($2, $2);
+                if ($line =~ m{\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\)}) {
+                        my ($from, $to) = ($1, $1);
 
                         # Should start with a space.
                         $to =~ s/^(\S)/ $1/;
@@ -2351,10 +2148,8 @@ sub process {
                                 ERROR("POINTER_LOCATION",
                                       "\"(foo$from)\" should be \"(foo$to)\"\n" .  $herecurr);
                         }
-                }
-                while ($line =~ m{(\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident))}g) {
-                        #print "BB<$1>\n";
-                        my ($from, $to, $ident) = ($2, $2, $3);
+                } elsif ($line =~ m{\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident)}) {
+                        my ($from, $to, $ident) = ($1, $1, $2);
 
                         # Should start with a space.
                         $to =~ s/^(\S)/ $1/;
@@ -2415,21 +2210,6 @@ sub process {
                         }
                 }
 
-                if ($line =~ /\bprintk\s*\(\s*KERN_([A-Z]+)/) {
-                        my $orig = $1;
-                        my $level = lc($orig);
-                        $level = "warn" if ($level eq "warning");
-                        my $level2 = $level;
-                        $level2 = "dbg" if ($level eq "debug");
-                        WARN("PREFER_PR_LEVEL",
-                             "Prefer netdev_$level2(netdev, ... then dev_$level2(dev, ... then pr_$level(...  to printk(KERN_$orig ...\n" . $herecurr);
-                }
-
-                if ($line =~ /\bpr_warning\s*\(/) {
-                        WARN("PREFER_PR_LEVEL",
-                             "Prefer pr_warn(... to pr_warning(...\n" . $herecurr);
-                }
-
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
                 if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
@@ -2459,7 +2239,7 @@ sub process {
                         my ($where, $prefix) = ($-[1], $1);
                         if ($prefix !~ /$Type\s+$/ &&
                             ($where != 0 || $prefix !~ /^.\s+$/) &&
-                            $prefix !~ /[{,]\s+$/) {
+                            $prefix !~ /{\s+$/) {
                                 ERROR("BRACKET_SPACE",
                                       "space prohibited before open square bracket '['\n" . $herecurr);
                         }
@@ -2496,13 +2276,6 @@ sub process {
                                      "space prohibited between function name and open parenthesis '('\n" . $herecurr);
                         }
                 }
-
-# check for whitespace before a non-naked semicolon
-                if ($line =~ /^\+.*\S\s+;/) {
-                        CHK("SPACING",
-                            "space prohibited before semicolon\n" . $herecurr);
-                }
-
 # Check operator spacing.
                 if (!($line=~/\#\s*include/)) {
                         my $ops = qr{
@@ -2759,7 +2532,7 @@ sub process {
                         # Flatten any parentheses
                         $value =~ s/\(/ \(/g;
                         $value =~ s/\)/\) /g;
-                        while ($value =~ s/\[[^\[\]]*\]/1/ ||
+                        while ($value =~ s/\[[^\{\}]*\]/1/ ||
                                $value !~ /(?:$Ident|-?$Constant)\s*
                                              $Compare\s*
                                              (?:$Ident|-?$Constant)/x &&
@@ -2784,6 +2557,28 @@ sub process {
                         }
                 }
 
+# typecasts on min/max could be min_t/max_t
+                if ($line =~ /^\+(?:.*?)\b(min|max)\s*\($Typecast{0,1}($LvalOrFunc)\s*,\s*$Typecast{0,1}($LvalOrFunc)\s*\)/) {
+                        if (defined $2 || defined $8) {
+                                my $call = $1;
+                                my $cast1 = deparenthesize($2);
+                                my $arg1 = $3;
+                                my $cast2 = deparenthesize($8);
+                                my $arg2 = $9;
+                                my $cast;
+
+                                if ($cast1 ne "" && $cast2 ne "") {
+                                        $cast = "$cast1 or $cast2";
+                                } elsif ($cast1 ne "") {
+                                        $cast = $cast1;
+                                } else {
+                                        $cast = $cast2;
+                                }
+                                WARN("MINMAX",
+                                     "$call() should probably be ${call}_t($cast, $arg1, $arg2)\n" . $herecurr);
+                        }
+                }
+
 # Need a space before open parenthesis after if, while etc
                 if ($line=~/\b(if|while|for|switch)\(/) {
                         ERROR("SPACING", "space required before the open parenthesis '('\n" . $herecurr);
@@ -2792,9 +2587,6 @@ sub process {
 # Check for illegal assignment in if conditional -- and check for trailing
 # statements after the conditional.
                 if ($line =~ /do\s*(?!{)/) {
-                        ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
-                                ctx_statement_block($linenr, $realcnt, 0)
-                                        if (!defined $stat);
                         my ($stat_next) = ctx_statement_block($line_nr_next,
                                                 $remain_next, $off_next);
                         $stat_next =~ s/\n./\n /g;
@@ -2910,17 +2702,12 @@ sub process {
                         }
                 }
 
-#CamelCase
-                while ($line =~ m{($Constant|$Lval)}g) {
-                        my $var = $1;
-                        if ($var !~ /$Constant/ &&
-                            $var =~ /[A-Z]\w*[a-z]|[a-z]\w*[A-Z]/ &&
-                            !defined $camelcase{$var}) {
-                                $camelcase{$var} = 1;
-                                WARN("CAMELCASE",
-                                     "Avoid CamelCase: <$var>\n" . $herecurr);
-                        }
-                }
+#studly caps, commented out until figure out how to distinguish between use of existing and adding new
+#               if (($line=~/[\w_][a-z\d]+[A-Z]/) and !($line=~/print/)) {
+#                   print "No studly caps, use _\n";
+#                   print "$herecurr";
+#                   $clean = 0;
+#               }
 
 #no spaces allowed after \ in define
                 if ($line=~/\#\s*define.*\\\s$/) {
@@ -2955,13 +2742,47 @@ sub process {
                         my $cnt = $realcnt;
                         my ($off, $dstat, $dcond, $rest);
                         my $ctx = '';
+
+                        my $args = defined($1);
+
+                        # Find the end of the macro and limit our statement
+                        # search to that.
+                        while ($cnt > 0 && defined $lines[$ln - 1] &&
+                                $lines[$ln - 1] =~ /^(?:-|..*\\$)/)
+                        {
+                                $ctx .= $rawlines[$ln - 1] . "\n";
+                                $cnt-- if ($lines[$ln - 1] !~ /^-/);
+                                $ln++;
+                        }
+                        $ctx .= $rawlines[$ln - 1];
+
                         ($dstat, $dcond, $ln, $cnt, $off) =
-                                ctx_statement_block($linenr, $realcnt, 0);
-                        $ctx = $dstat;
+                                ctx_statement_block($linenr, $ln - $linenr + 1, 0);
                         #print "dstat<$dstat> dcond<$dcond> cnt<$cnt> off<$off>\n";
                         #print "LINE<$lines[$ln-1]> len<" . length($lines[$ln-1]) . "\n";
 
-                        $dstat =~ s/^.\s*\#\s*define\s+$Ident(?:\([^\)]*\))?\s*//;
+                        # Extract the remainder of the define (if any) and
+                        # rip off surrounding spaces, and trailing \'s.
+                        $rest = '';
+                        while ($off != 0 || ($cnt > 0 && $rest =~ /\\\s*$/)) {
+                                #print "ADDING cnt<$cnt> $off <" . substr($lines[$ln - 1], $off) . "> rest<$rest>\n";
+                                if ($off != 0 || $lines[$ln - 1] !~ /^-/) {
+                                        $rest .= substr($lines[$ln - 1], $off) . "\n";
+                                        $cnt--;
+                                }
+                                $ln++;
+                                $off = 0;
+                        }
+                        $rest =~ s/\\\n.//g;
+                        $rest =~ s/^\s*//s;
+                        $rest =~ s/\s*$//s;
+
+                        # Clean up the original statement.
+                        if ($args) {
+                                substr($dstat, 0, length($dcond), '');
+                        } else {
+                                $dstat =~ s/^.\s*\#\s*define\s+$Ident\s*//;
+                        }
                         $dstat =~ s/$;//g;
                         $dstat =~ s/\\\n.//g;
                         $dstat =~ s/^\s*//s;
@@ -2970,20 +2791,14 @@ sub process {
                         # Flatten any parentheses and braces
                         while ($dstat =~ s/\([^\(\)]*\)/1/ ||
                                $dstat =~ s/\{[^\{\}]*\}/1/ ||
-                               $dstat =~ s/\[[^\[\]]*\]/1/)
-                        {
-                        }
-
-                        # Flatten any obvious string concatentation.
-                        while ($dstat =~ s/("X*")\s*$Ident/$1/ ||
-                               $dstat =~ s/$Ident\s*("X*")/$1/)
+                               $dstat =~ s/\[[^\{\}]*\]/1/)
                         {
                         }
 
                         my $exceptions = qr{
                                 $Declare|
                                 module_param_named|
-                                MODULE_PARM_DESC|
+                                MODULE_PARAM_DESC|
                                 DECLARE_PER_CPU|
                                 DEFINE_PER_CPU|
                                 __typeof__\(|
@@ -2993,84 +2808,23 @@ sub process {
                                 ^\"|\"$
                         }x;
                         #print "REST<$rest> dstat<$dstat> ctx<$ctx>\n";
-                        if ($dstat ne '' &&
-                            $dstat !~ /^(?:$Ident|-?$Constant),$/ &&                    # 10, // foo(),
-                            $dstat !~ /^(?:$Ident|-?$Constant);$/ &&                    # foo();
-                            $dstat !~ /^[!~-]?(?:$Ident|$Constant)$/ &&         # 10 // foo() // !foo // ~foo // -foo
-                            $dstat !~ /^'X'$/ &&                                        # character constants
-                            $dstat !~ /$exceptions/ &&
-                            $dstat !~ /^\.$Ident\s*=/ &&                                # .foo =
-                            $dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ &&       # do {...} while (...); // do {...} while (...)
-                            $dstat !~ /^for\s*$Constant$/ &&                            # for (...)
-                            $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&   # for (...) bar()
-                            $dstat !~ /^do\s*{/ &&                                      # do {...
-                            $dstat !~ /^\({/)                                           # ({...
-                        {
-                                $ctx =~ s/\n*$//;
-                                my $herectx = $here . "\n";
-                                my $cnt = statement_rawlines($ctx);
-
-                                for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= raw_line($linenr, $n) . "\n";
-                                }
-
-                                if ($dstat =~ /;/) {
+                        if ($rest ne '' && $rest ne ',') {
+                                if ($rest !~ /while\s*\(/ &&
+                                    $dstat !~ /$exceptions/)
+                                {
                                         ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE",
-                                              "Macros with multiple statements should be enclosed in a do - while loop\n" . "$herectx");
-                                } else {
-                                        ERROR("COMPLEX_MACRO",
-                                              "Macros with complex values should be enclosed in parenthesis\n" . "$herectx");
+                                              "Macros with multiple statements should be enclosed in a do - while loop\n" . "$here\n$ctx\n");
                                 }
-                        }
-
-# check for line continuations outside of #defines, preprocessor #, and asm
-
-                } else {
-                        if ($prevline !~ /^..*\\$/ &&
-                            $line !~ /^\+\s*\#.*\\$/ &&         # preprocessor
-                            $line !~ /^\+.*\b(__asm__|asm)\b.*\\$/ &&   # asm
-                            $line =~ /^\+.*\\$/) {
-                                WARN("LINE_CONTINUATIONS",
-                                     "Avoid unnecessary line continuations\n" . $herecurr);
-                        }
-                }
-
-# do {} while (0) macro tests:
-# single-statement macros do not need to be enclosed in do while (0) loop,
-# macro should not end with a semicolon
-                if ($^V && $^V ge 5.10.0 &&
-                    $realfile !~ m@/vmlinux.lds.h$@ &&
-                    $line =~ /^.\s*\#\s*define\s+$Ident(\()?/) {
-                        my $ln = $linenr;
-                        my $cnt = $realcnt;
-                        my ($off, $dstat, $dcond, $rest);
-                        my $ctx = '';
-                        ($dstat, $dcond, $ln, $cnt, $off) =
-                                ctx_statement_block($linenr, $realcnt, 0);
-                        $ctx = $dstat;
 
-                        $dstat =~ s/\\\n.//g;
-
-                        if ($dstat =~ /^\+\s*#\s*define\s+$Ident\s*${balanced_parens}\s*do\s*{(.*)\s*}\s*while\s*\(\s*0\s*\)\s*([;\s]*)\s*$/) {
-                                my $stmts = $2;
-                                my $semis = $3;
-
-                                $ctx =~ s/\n*$//;
-                                my $cnt = statement_rawlines($ctx);
-                                my $herectx = $here . "\n";
-
-                                for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= raw_line($linenr, $n) . "\n";
-                                }
-
-                                if (($stmts =~ tr/;/;/) == 1 &&
-                                    $stmts !~ /^\s*(if|while|for|switch)\b/) {
-                                        WARN("SINGLE_STATEMENT_DO_WHILE_MACRO",
-                                             "Single statement macros should not use a do {} while (0) loop\n" . "$herectx");
-                                }
-                                if (defined $semis && $semis ne "") {
-                                        WARN("DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON",
-                                             "do {} while (0) macros should not be semicolon terminated\n" . "$herectx");
+                        } elsif ($ctx !~ /;/) {
+                                if ($dstat ne '' &&
+                                    $dstat !~ /^(?:$Ident|-?$Constant)$/ &&
+                                    $dstat !~ /$exceptions/ &&
+                                    $dstat !~ /^\.$Ident\s*=/ &&
+                                    $dstat =~ /$Operators/)
+                                {
+                                        ERROR("COMPLEX_MACRO",
+                                              "Macros with complex values should be enclosed in parenthesis\n" . "$here\n$ctx\n");
                                 }
                         }
                 }
@@ -3092,8 +2846,7 @@ sub process {
                         #print "chunks<$#chunks> linenr<$linenr> endln<$endln> level<$level>\n";
                         #print "APW: <<$chunks[1][0]>><<$chunks[1][1]>>\n";
                         if ($#chunks > 0 && $level == 0) {
-                                my @allowed = ();
-                                my $allow = 0;
+                                my $allowed = 0;
                                 my $seen = 0;
                                 my $herectx = $here . "\n";
                                 my $ln = $linenr - 1;
@@ -3104,7 +2857,6 @@ sub process {
                                         my ($whitespace) = ($cond =~ /^((?:\s*\n[+-])*\s*)/s);
                                         my $offset = statement_rawlines($whitespace) - 1;
 
-                                        $allowed[$allow] = 0;
                                         #print "COND<$cond> whitespace<$whitespace> offset<$offset>\n";
 
                                         # We have looked at and allowed this specific line.
@@ -3117,34 +2869,23 @@ sub process {
 
                                         $seen++ if ($block =~ /^\s*{/);
 
-                                        #print "cond<$cond> block<$block> allowed<$allowed[$allow]>\n";
+                                        #print "cond<$cond> block<$block> allowed<$allowed>\n";
                                         if (statement_lines($cond) > 1) {
                                                 #print "APW: ALLOWED: cond<$cond>\n";
-                                                $allowed[$allow] = 1;
+                                                $allowed = 1;
                                         }
                                         if ($block =~/\b(?:if|for|while)\b/) {
                                                 #print "APW: ALLOWED: block<$block>\n";
-                                                $allowed[$allow] = 1;
+                                                $allowed = 1;
                                         }
                                         if (statement_block_size($block) > 1) {
                                                 #print "APW: ALLOWED: lines block<$block>\n";
-                                                $allowed[$allow] = 1;
+                                                $allowed = 1;
                                         }
-                                        $allow++;
                                 }
-                                if ($seen) {
-                                        my $sum_allowed = 0;
-                                        foreach (@allowed) {
-                                                $sum_allowed += $_;
-                                        }
-                                        if ($sum_allowed == 0) {
-                                                WARN("BRACES",
-                                                     "braces {} are not necessary for any arm of this statement\n" . $herectx);
-                                        } elsif ($sum_allowed != $allow &&
-                                                 $seen != $allow) {
-                                                CHK("BRACES",
-                                                    "braces {} should be used on all arms of this statement\n" . $herectx);
-                                        }
+                                if ($seen && !$allowed) {
+                                        WARN("BRACES",
+                                             "braces {} are not necessary for any arm of this statement\n" . $herectx);
                                 }
                         }
                 }
@@ -3191,11 +2932,11 @@ sub process {
                                 }
                         }
                         if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
-                                my $herectx = $here . "\n";
+                                my $herectx = $here . "\n";;
                                 my $cnt = statement_rawlines($block);
 
                                 for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= raw_line($linenr, $n) . "\n";
+                                        $herectx .= raw_line($linenr, $n) . "\n";;
                                 }
 
                                 WARN("BRACES",
@@ -3203,14 +2944,20 @@ sub process {
                         }
                 }
 
-# check for unnecessary blank lines around braces
-                if (($line =~ /^..*}\s*$/ && $prevline =~ /^.\s*$/)) {
-                        CHK("BRACES",
-                            "Blank lines aren't necessary before a close brace '}'\n" . $hereprev);
+# don't include deprecated include files (uses RAW line)
+                for my $inc (@dep_includes) {
+                        if ($rawline =~ m@^.\s*\#\s*include\s*\<$inc>@) {
+                                ERROR("DEPRECATED_INCLUDE",
+                                      "Don't use <$inc>: see Documentation/feature-removal-schedule.txt\n" . $herecurr);
+                        }
                 }
-                if (($line =~ /^.\s*$/ && $prevline =~ /^..*{\s*$/)) {
-                        CHK("BRACES",
-                            "Blank lines aren't necessary after an open brace '{'\n" . $hereprev);
+
+# don't use deprecated functions
+                for my $func (@dep_functions) {
+                        if ($line =~ /\b$func\b/) {
+                                ERROR("DEPRECATED_FUNCTION",
+                                      "Don't use $func(): see Documentation/feature-removal-schedule.txt\n" . $herecurr);
+                        }
                 }
 
 # no volatiles please
@@ -3227,12 +2974,20 @@ sub process {
                                 $herecurr);
                 }
 
-# check for needless "if (<foo>) fn(<foo>)" uses
-                if ($prevline =~ /\bif\s*\(\s*($Lval)\s*\)/) {
-                        my $expr = '\s*\(\s*' . quotemeta($1) . '\s*\)\s*;';
-                        if ($line =~ /\b(kfree|usb_free_urb|debugfs_remove(?:_recursive)?)$expr/) {
-                                WARN('NEEDLESS_IF',
-                                     "$1(NULL) is safe this check is probably not required\n" . $hereprev);
+# check for needless kfree() checks
+                if ($prevline =~ /\bif\s*\(([^\)]*)\)/) {
+                        my $expr = $1;
+                        if ($line =~ /\bkfree\(\Q$expr\E\);/) {
+                                WARN("NEEDLESS_KFREE",
+                                     "kfree(NULL) is safe this check is probably not required\n" . $hereprev);
+                        }
+                }
+# check for needless usb_free_urb() checks
+                if ($prevline =~ /\bif\s*\(([^\)]*)\)/) {
+                        my $expr = $1;
+                        if ($line =~ /\busb_free_urb\(\Q$expr\E\);/) {
+                                WARN("NEEDLESS_USB_FREE_URB",
+                                     "usb_free_urb(NULL) is safe this check is probably not required\n" . $hereprev);
                         }
                 }
 
@@ -3320,100 +3075,18 @@ sub process {
                              "__aligned(size) is preferred over __attribute__((aligned(size)))\n" . $herecurr);
                 }
 
-# Check for __attribute__ format(printf, prefer __printf
-                if ($line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf/) {
-                        WARN("PREFER_PRINTF",
-                             "__printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))\n" . $herecurr);
-                }
-
-# Check for __attribute__ format(scanf, prefer __scanf
-                if ($line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\b/) {
-                        WARN("PREFER_SCANF",
-                             "__scanf(string-index, first-to-check) is preferred over __attribute__((format(scanf, string-index, first-to-check)))\n" . $herecurr);
-                }
-
 # check for sizeof(&)
                 if ($line =~ /\bsizeof\s*\(\s*\&/) {
                         WARN("SIZEOF_ADDRESS",
                              "sizeof(& should be avoided\n" . $herecurr);
                 }
 
-# check for sizeof without parenthesis
-                if ($line =~ /\bsizeof\s+((?:\*\s*|)$Lval|$Type(?:\s+$Lval|))/) {
-                        WARN("SIZEOF_PARENTHESIS",
-                             "sizeof $1 should be sizeof($1)\n" . $herecurr);
-                }
-
 # check for line continuations in quoted strings with odd counts of "
                 if ($rawline =~ /\\$/ && $rawline =~ tr/"/"/ % 2) {
                         WARN("LINE_CONTINUATIONS",
                              "Avoid line continuations in quoted strings\n" . $herecurr);
                 }
 
-# check for struct spinlock declarations
-                if ($line =~ /^.\s*\bstruct\s+spinlock\s+\w+\s*;/) {
-                        WARN("USE_SPINLOCK_T",
-                             "struct spinlock should be spinlock_t\n" . $herecurr);
-                }
-
-# Check for misused memsets
-                if ($^V && $^V ge 5.10.0 &&
-                    defined $stat &&
-                    $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/s) {
-
-                        my $ms_addr = $2;
-                        my $ms_val = $7;
-                        my $ms_size = $12;
-
-                        if ($ms_size =~ /^(0x|)0$/i) {
-                                ERROR("MEMSET",
-                                      "memset to 0's uses 0 as the 2nd argument, not the 3rd\n" . "$here\n$stat\n");
-                        } elsif ($ms_size =~ /^(0x|)1$/i) {
-                                WARN("MEMSET",
-                                     "single byte memset is suspicious. Swapped 2nd/3rd argument?\n" . "$here\n$stat\n");
-                        }
-                }
-
-# typecasts on min/max could be min_t/max_t
-                if ($^V && $^V ge 5.10.0 &&
-                    defined $stat &&
-                    $stat =~ /^\+(?:.*?)\b(min|max)\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\)/) {
-                        if (defined $2 || defined $7) {
-                                my $call = $1;
-                                my $cast1 = deparenthesize($2);
-                                my $arg1 = $3;
-                                my $cast2 = deparenthesize($7);
-                                my $arg2 = $8;
-                                my $cast;
-
-                                if ($cast1 ne "" && $cast2 ne "" && $cast1 ne $cast2) {
-                                        $cast = "$cast1 or $cast2";
-                                } elsif ($cast1 ne "") {
-                                        $cast = $cast1;
-                                } else {
-                                        $cast = $cast2;
-                                }
-                                WARN("MINMAX",
-                                     "$call() should probably be ${call}_t($cast, $arg1, $arg2)\n" . "$here\n$stat\n");
-                        }
-                }
-
-# check usleep_range arguments
-                if ($^V && $^V ge 5.10.0 &&
-                    defined $stat &&
-                    $stat =~ /^\+(?:.*?)\busleep_range\s*\(\s*($FuncArg)\s*,\s*($FuncArg)\s*\)/) {
-                        my $min = $1;
-                        my $max = $7;
-                        if ($min eq $max) {
-                                WARN("USLEEP_RANGE",
-                                     "usleep_range should not use min == max args; see Documentation/timers/timers-howto.txt\n" . "$here\n$stat\n");
-                        } elsif ($min =~ /^\d+$/ && $max =~ /^\d+$/ &&
-                                 $min > $max) {
-                                WARN("USLEEP_RANGE",
-                                     "usleep_range args reversed, use min then max; see Documentation/timers/timers-howto.txt\n" . "$here\n$stat\n");
-                        }
-                }
-
 # check for new externs in .c files.
                 if ($realfile =~ /\.c$/ && defined $stat &&
                     $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)
@@ -3462,22 +3135,8 @@ sub process {
 
 # check for multiple semicolons
                 if ($line =~ /;\s*;\s*$/) {
-                        WARN("ONE_SEMICOLON",
-                             "Statements terminations use 1 semicolon\n" . $herecurr);
-                }
-
-# check for switch/default statements without a break;
-                if ($^V && $^V ge 5.10.0 &&
-                    defined $stat &&
-                    $stat =~ /^\+[$;\s]*(?:case[$;\s]+\w+[$;\s]*:[$;\s]*|)*[$;\s]*\bdefault[$;\s]*:[$;\s]*;/g) {
-                        my $ctx = '';
-                        my $herectx = $here . "\n";
-                        my $cnt = statement_rawlines($stat);
-                        for (my $n = 0; $n < $cnt; $n++) {
-                                $herectx .= raw_line($linenr, $n) . "\n";
-                        }
-                        WARN("DEFAULT_NO_BREAK",
-                             "switch default: should use break\n" . $herectx);
+                    WARN("ONE_SEMICOLON",
+                         "Statements terminations use 1 semicolon\n" . $herecurr);
                 }
 
 # check for gcc specific __FUNCTION__
@@ -3486,30 +3145,22 @@ sub process {
                              "__func__ should be used instead of gcc specific __FUNCTION__\n"  . $herecurr);
                 }
 
-# check for use of yield()
-                if ($line =~ /\byield\s*\(\s*\)/) {
-                        WARN("YIELD",
-                             "Using yield() is generally wrong. See yield() kernel-doc (sched/core.c)\n"  . $herecurr);
-                }
-
 # check for semaphores initialized locked
                 if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) {
                         WARN("CONSIDER_COMPLETION",
                              "consider using a completion\n" . $herecurr);
-                }
 
-# recommend kstrto* over simple_strto* and strict_strto*
-                if ($line =~ /\b((simple|strict)_(strto(l|ll|ul|ull)))\s*\(/) {
+                }
+# recommend kstrto* over simple_strto*
+                if ($line =~ /\bsimple_(strto.*?)\s*\(/) {
                         WARN("CONSIDER_KSTRTO",
-                             "$1 is obsolete, use k$3 instead\n" . $herecurr);
+                             "consider using kstrto* in preference to simple_$1\n" . $herecurr);
                 }
-
 # check for __initcall(), use device_initcall() explicitly please
                 if ($line =~ /^.\s*__initcall\s*\(/) {
                         WARN("USE_DEVICE_INITCALL",
                              "please use device_initcall() instead of __initcall()\n" . $herecurr);
                 }
-
 # check for various ops structs, ensure they are const.
                 my $struct_ops = qr{acpi_dock_ops|
                                 address_space_operations|
@@ -3607,6 +3258,12 @@ sub process {
                         WARN("EXPORTED_WORLD_WRITABLE",
                              "Exporting world writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
                 }
+
+                # Check for memset with swapped arguments
+                if ($line =~ /memset.*\,(\ |)(0x|)0(\ |0|)\);/) {
+                        ERROR("MEMSET",
+                              "memset size is 3rd argument, not the second.\n" . $herecurr);
+                }
         }
 
         # If we have no input at all, then there is nothing to report on
@@ -3646,12 +3303,6 @@ sub process {
         }
 
         if ($quiet == 0) {
-
-                if ($^V lt 5.10.0) {
-                        print("NOTE: perl $^V is not modern enough to detect all possible issues.\n");
-                        print("An upgrade to at least perl v5.10.0 is suggested.\n\n");
-                }
-
                 # If there were whitespace errors which cleanpatch can fix
                 # then suggest that.
                 if ($rpt_cleaners) {
@@ -3661,12 +3312,13 @@ sub process {
                 }
         }
 
-        if ($quiet == 0 && keys %ignore_type) {
+        if (keys %ignore_type) {
             print "NOTE: Ignored message types:";
             foreach my $ignore (sort keys %ignore_type) {
                 print " $ignore";
             }
-            print "\n\n";
+            print "\n";
+            print "\n" if ($quiet == 0);
         }
 
         if ($clean == 1 && $quiet == 0) {
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index fd8fa9aa7c4..3ab316e5231 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -198,16 +198,11 @@ EOF
 }
 
 syscall_list() {
-    grep '^[0-9]' "$1" | sort -n | (
-        while read nr abi name entry ; do
-            cat <<EOF
-#if !defined(__NR_${name}) && !defined(__IGNORE_${name})
-#warning syscall ${name} not implemented
-#endif
-EOF
-        done
-    )
+sed -n -e '/^\#define/ s/[^_]*__NR_\([^[:space:]]*\).*/\
+\#if !defined \(__NR_\1\) \&\& !defined \(__IGNORE_\1\)\
+\#warning syscall \1 not implemented\
+\#endif/p' $1
 }
 
-(ignore_list && syscall_list $(dirname $0)/../arch/x86/syscalls/syscall_32.tbl) | \
+(ignore_list && syscall_list $(dirname $0)/../arch/x86/include/asm/unistd_32.h) | \
 $* -E -x c - > /dev/null
diff --git a/scripts/coccicheck b/scripts/coccicheck
index 1a49d1c7ecf..1bb1a1bd2da 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -10,17 +10,13 @@ if [ "$C" = "1" -o "$C" = "2" ]; then
 #    OPTIONS=$*
 
 # Workaround for Coccinelle < 0.2.3
-        FLAGS="-I $srctree/include -very_quiet"
-        shift $(( $# - 1 ))
-        OPTIONS=$1
+    FLAGS="-I $srctree/include -very_quiet"
+    shift $(( $# - 1 ))
+    OPTIONS=$1
 else
     ONLINE=0
     FLAGS="-very_quiet"
-    if [ "$KBUILD_EXTMOD" = "" ] ; then
-        OPTIONS="-dir $srctree"
-    else
-        OPTIONS="-dir $KBUILD_EXTMOD -patch $srctree -I $srctree/include -I $KBUILD_EXTMOD/include"
-    fi
+    OPTIONS="-dir $srctree"
 fi
 
 if [ ! -x "$SPATCH" ]; then
@@ -95,9 +91,6 @@ coccinelle () {
         $SPATCH -D report  $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || \
         $SPATCH -D context $FLAGS -sp_file $COCCI $OPT $OPTIONS               || \
         $SPATCH -D org     $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || exit 1
-    elif [ "$MODE" = "rep+ctxt" ] ; then
-        $SPATCH -D report  $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff && \
-        $SPATCH -D context $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
     else
         $SPATCH -D $MODE   $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
     fi
diff --git a/scripts/coccinelle/api/d_find_alias.cocci b/scripts/coccinelle/api/d_find_alias.cocci
deleted file mode 100644
index a9694a8d3e5..00000000000
--- a/scripts/coccinelle/api/d_find_alias.cocci
+++ /dev/null
@@ -1,80 +0,0 @@
-/// Make sure calls to d_find_alias() have a corresponding call to dput().
-//
-// Keywords: d_find_alias, dput
-//
-// Confidence: Moderate
-// URL: http://coccinelle.lip6.fr/
-// Options: -include_headers
-
-virtual context
-virtual org
-virtual patch
-virtual report
-
-@r exists@
-local idexpression struct dentry *dent;
-expression E, E1;
-statement S1, S2;
-position p1, p2;
-@@
-(
-        if (!(dent@p1 = d_find_alias(...))) S1
-|
-        dent@p1 = d_find_alias(...)
-)
-
-<...when != dput(dent)
-    when != if (...) { <+... dput(dent) ...+> }
-    when != true !dent || ...
-    when != dent = E
-    when != E = dent
-if (!dent || ...) S2
-...>
-(
-        return <+...dent...+>;
-|
-        return @p2 ...;
-|
-        dent@p2 = E1;
-|
-        E1 = dent;
-)
-
-@depends on context@
-local idexpression struct dentry *r.dent;
-position r.p1,r.p2;
-@@
-* dent@p1 = ...
-  ...
-(
-* return@p2 ...;
-|
-* dent@p2
-)
-
-
-@script:python depends on org@
-p1 << r.p1;
-p2 << r.p2;
-@@
-cocci.print_main("Missing call to dput()",p1)
-cocci.print_secs("",p2)
-
-@depends on patch@
-local idexpression struct dentry *r.dent;
-position r.p2;
-@@
-(
-+ dput(dent);
-  return @p2 ...;
-|
-+ dput(dent);
-  dent@p2 = ...;
-)
-
-@script:python depends on report@
-p1 << r.p1;
-p2 << r.p2;
-@@
-msg = "Missing call to dput() at line %s."
-coccilib.report.print_report(p1[0], msg % (p2[0].line))
diff --git a/scripts/coccinelle/api/devm_request_and_ioremap.cocci b/scripts/coccinelle/api/devm_request_and_ioremap.cocci
deleted file mode 100644
index 46beb81406a..00000000000
--- a/scripts/coccinelle/api/devm_request_and_ioremap.cocci
+++ /dev/null
@@ -1,105 +0,0 @@
-/// Reimplement a call to devm_request_mem_region followed by a call to ioremap
-/// or ioremap_nocache by a call to devm_request_and_ioremap.
-/// Devm_request_and_ioremap was introduced in
-/// 72f8c0bfa0de64c68ee59f40eb9b2683bffffbb0.  It makes the code much more
-/// concise.
-///
-///
-// Confidence: High
-// Copyright: (C) 2011 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2011 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: -no_includes -include_headers
-
-virtual patch
-virtual org
-virtual report
-virtual context
-
-@nm@
-expression myname;
-identifier i;
-@@
-
-struct platform_driver i = { .driver = { .name = myname } };
-
-@depends on patch@
-expression dev,res,size;
-@@
-
--if (!devm_request_mem_region(dev, res->start, size,
--                              \(res->name\|dev_name(dev)\))) {
--   ...
--   return ...;
--}
-... when != res->start
-(
--devm_ioremap(dev,res->start,size)
-+devm_request_and_ioremap(dev,res)
-|
--devm_ioremap_nocache(dev,res->start,size)
-+devm_request_and_ioremap(dev,res)
-)
-... when any
-    when != res->start
-
-// this rule is separate from the previous one, because a single file can
-// have multiple values of myname
-@depends on patch@
-expression dev,res,size;
-expression nm.myname;
-@@
-
--if (!devm_request_mem_region(dev, res->start, size,myname)) {
--   ...
--   return ...;
--}
-... when != res->start
-(
--devm_ioremap(dev,res->start,size)
-+devm_request_and_ioremap(dev,res)
-|
--devm_ioremap_nocache(dev,res->start,size)
-+devm_request_and_ioremap(dev,res)
-)
-... when any
-    when != res->start
-
-
-@pb depends on org || report || context@
-expression dev,res,size;
-expression nm.myname;
-position p1,p2;
-@@
-
-*if
-  (!devm_request_mem_region@p1(dev, res->start, size,
-                              \(res->name\|dev_name(dev)\|myname\))) {
-   ...
-   return ...;
-}
-... when != res->start
-(
-*devm_ioremap@p2(dev,res->start,size)
-|
-*devm_ioremap_nocache@p2(dev,res->start,size)
-)
-... when any
-    when != res->start
-
-@script:python depends on org@
-p1 << pb.p1;
-p2 << pb.p2;
-@@
-
-cocci.print_main("INFO: replace by devm_request_and_ioremap",p1)
-cocci.print_secs("",p2)
-
-@script:python depends on report@
-p1 << pb.p1;
-p2 << pb.p2;
-@@
-
-msg = "INFO: devm_request_mem_region followed by ioremap on line %s can be replaced by devm_request_and_ioremap" % (p2[0].line)
-coccilib.report.print_report(p1[0],msg)
diff --git a/scripts/coccinelle/api/kstrdup.cocci b/scripts/coccinelle/api/kstrdup.cocci
index 07a74b2c619..e0805ad08d3 100644
--- a/scripts/coccinelle/api/kstrdup.cocci
+++ b/scripts/coccinelle/api/kstrdup.cocci
@@ -1,19 +1,16 @@
 /// Use kstrdup rather than duplicating its implementation
 ///
 // Confidence: High
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
 
 virtual patch
-virtual context
-virtual org
-virtual report
 
-@depends on patch@
+@@
 expression from,to;
 expression flag,E1,E2;
 statement S;
@@ -26,7 +23,7 @@ statement S;
    ... when != \(from = E2 \| to = E2 \)
 -  strcpy(to, from);
 
-@depends on patch@
+@@
 expression x,from,to;
 expression flag,E1,E2,E3;
 statement S;
@@ -40,65 +37,3 @@ statement S;
     if (to==NULL || ...) S
     ... when != \(x = E3 \| from = E3 \| to = E3 \)
 -   memcpy(to, from, x);
-
-// ---------------------------------------------------------------------
-
-@r1 depends on !patch exists@
-expression from,to;
-expression flag,E1,E2;
-statement S;
-position p1,p2;
-@@
-
-*  to = kmalloc@p1(strlen(from) + 1,flag);
-   ... when != \(from = E1 \| to = E1 \)
-   if (to==NULL || ...) S
-   ... when != \(from = E2 \| to = E2 \)
-*  strcpy@p2(to, from);
-
-@r2 depends on !patch exists@
-expression x,from,to;
-expression flag,E1,E2,E3;
-statement S;
-position p1,p2;
-@@
-
-*   x = strlen(from) + 1;
-    ... when != \( x = E1 \| from = E1 \)
-*   to = \(kmalloc@p1\|kzalloc@p2\)(x,flag);
-    ... when != \(x = E2 \| from = E2 \| to = E2 \)
-    if (to==NULL || ...) S
-    ... when != \(x = E3 \| from = E3 \| to = E3 \)
-*   memcpy@p2(to, from, x);
-
-@script:python depends on org@
-p1 << r1.p1;
-p2 << r1.p2;
-@@
-
-cocci.print_main("WARNING opportunity for kstrdep",p1)
-cocci.print_secs("strcpy",p2)
-
-@script:python depends on org@
-p1 << r2.p1;
-p2 << r2.p2;
-@@
-
-cocci.print_main("WARNING opportunity for kstrdep",p1)
-cocci.print_secs("memcpy",p2)
-
-@script:python depends on report@
-p1 << r1.p1;
-p2 << r1.p2;
-@@
-
-msg = "WARNING opportunity for kstrdep (strcpy on line %s)" % (p2[0].line)
-coccilib.report.print_report(p1[0], msg)
-
-@script:python depends on report@
-p1 << r2.p1;
-p2 << r2.p2;
-@@
-
-msg = "WARNING opportunity for kstrdep (memcpy on line %s)" % (p2[0].line)
-coccilib.report.print_report(p1[0], msg)
diff --git a/scripts/coccinelle/api/memdup.cocci b/scripts/coccinelle/api/memdup.cocci
index 4dceab6d54d..b5d722077dc 100644
--- a/scripts/coccinelle/api/memdup.cocci
+++ b/scripts/coccinelle/api/memdup.cocci
@@ -1,17 +1,14 @@
 /// Use kmemdup rather than duplicating its implementation
 ///
 // Confidence: High
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
 
 virtual patch
-virtual context
-virtual org
-virtual report
 
 @r1@
 expression from,to;
@@ -31,7 +28,7 @@ position p;
     ... when != \( x = E1 \| from = E1 \)
     to = \(kmalloc@p\|kzalloc@p\)(x,flag);
 
-@depends on patch@
+@@
 expression from,to,size,flag;
 position p != {r1.p,r2.p};
 statement S;
@@ -41,26 +38,3 @@ statement S;
 +  to = kmemdup(from,size,flag);
    if (to==NULL || ...) S
 -  memcpy(to, from, size);
-
-@r depends on !patch@
-expression from,to,size,flag;
-position p != {r1.p,r2.p};
-statement S;
-@@
-
-*  to = \(kmalloc@p\|kzalloc@p\)(size,flag);
-   to = kmemdup(from,size,flag);
-   if (to==NULL || ...) S
-*  memcpy(to, from, size);
-
-@script:python depends on org@
-p << r.p;
-@@
-
-coccilib.org.print_todo(p[0], "WARNING opportunity for kmemdep")
-
-@script:python depends on report@
-p << r.p;
-@@
-
-coccilib.report.print_report(p[0], "WARNING opportunity for kmemdep")
diff --git a/scripts/coccinelle/api/memdup_user.cocci b/scripts/coccinelle/api/memdup_user.cocci
index 2b131a8a130..72ce012e878 100644
--- a/scripts/coccinelle/api/memdup_user.cocci
+++ b/scripts/coccinelle/api/memdup_user.cocci
@@ -1,25 +1,23 @@
-/// Use memdup_user rather than duplicating its implementation
+/// Use kmemdup_user rather than duplicating its implementation
 /// This is a little bit restricted to reduce false positives
 ///
 // Confidence: High
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
 
 virtual patch
-virtual context
-virtual org
-virtual report
 
-@depends on patch@
+@@
 expression from,to,size,flag;
+position p;
 identifier l1,l2;
 @@
 
--  to = \(kmalloc\|kzalloc\)(size,flag);
+-  to = \(kmalloc@p\|kzalloc@p\)(size,flag);
 +  to = memdup_user(from,size);
    if (
 -      to==NULL
@@ -35,26 +33,3 @@ identifier l1,l2;
 -    -EFAULT
 -    ...+>
 -  }
-
-@r depends on !patch@
-expression from,to,size,flag;
-position p;
-statement S1,S2;
-@@
-
-*  to = \(kmalloc@p\|kzalloc@p\)(size,flag);
-   if (to==NULL || ...) S1
-   if (copy_from_user(to, from, size) != 0)
-   S2
-
-@script:python depends on org@
-p << r.p;
-@@
-
-coccilib.org.print_todo(p[0], "WARNING opportunity for memdup_user")
-
-@script:python depends on report@
-p << r.p;
-@@
-
-coccilib.report.print_report(p[0], "WARNING opportunity for memdup_user")
diff --git a/scripts/coccinelle/api/ptr_ret.cocci b/scripts/coccinelle/api/ptr_ret.cocci
deleted file mode 100644
index 15f076fdecb..00000000000
--- a/scripts/coccinelle/api/ptr_ret.cocci
+++ /dev/null
@@ -1,96 +0,0 @@
-///
-/// Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
-///
-// Confidence: High
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Options: -no_includes -include_headers
-//
-// Keywords: ERR_PTR, PTR_ERR, PTR_RET
-// Version min: 2.6.39
-//
-
-virtual context
-virtual patch
-virtual org
-virtual report
-
-@depends on patch@
-expression ptr;
-@@
-
-- if (IS_ERR(ptr)) return PTR_ERR(ptr); else return 0;
-+ return PTR_RET(ptr);
-
-@depends on patch@
-expression ptr;
-@@
-
-- if (IS_ERR(ptr)) return PTR_ERR(ptr); return 0;
-+ return PTR_RET(ptr);
-
-@depends on patch@
-expression ptr;
-@@
-
-- (IS_ERR(ptr) ? PTR_ERR(ptr) : 0)
-+ PTR_RET(ptr)
-
-@r1 depends on !patch@
-expression ptr;
-position p1;
-@@
-
-* if@p1 (IS_ERR(ptr)) return PTR_ERR(ptr); else return 0;
-
-@r2 depends on !patch@
-expression ptr;
-position p2;
-@@
-
-* if@p2 (IS_ERR(ptr)) return PTR_ERR(ptr); return 0;
-
-@r3 depends on !patch@
-expression ptr;
-position p3;
-@@
-
-* IS_ERR@p3(ptr) ? PTR_ERR(ptr) : 0
-
-@script:python depends on org@
-p << r1.p1;
-@@
-
-coccilib.org.print_todo(p[0], "WARNING: PTR_RET can be used")
-
-
-@script:python depends on org@
-p << r2.p2;
-@@
-
-coccilib.org.print_todo(p[0], "WARNING: PTR_RET can be used")
-
-@script:python depends on org@
-p << r3.p3;
-@@
-
-coccilib.org.print_todo(p[0], "WARNING: PTR_RET can be used")
-
-@script:python depends on report@
-p << r1.p1;
-@@
-
-coccilib.report.print_report(p[0], "WARNING: PTR_RET can be used")
-
-@script:python depends on report@
-p << r2.p2;
-@@
-
-coccilib.report.print_report(p[0], "WARNING: PTR_RET can be used")
-
-@script:python depends on report@
-p << r3.p3;
-@@
-
-coccilib.report.print_report(p[0], "WARNING: PTR_RET can be used")
diff --git a/scripts/coccinelle/api/simple_open.cocci b/scripts/coccinelle/api/simple_open.cocci
deleted file mode 100644
index 05962f7be15..00000000000
--- a/scripts/coccinelle/api/simple_open.cocci
+++ /dev/null
@@ -1,70 +0,0 @@
-/// This removes an open coded simple_open() function
-/// and replaces file operations references to the function
-/// with simple_open() instead.
-///
-// Confidence: High
-// Comments:
-// Options: -no_includes -include_headers
-
-virtual patch
-virtual report
-
-@ open depends on patch @
-identifier open_f != simple_open;
-identifier i, f;
-@@
--int open_f(struct inode *i, struct file *f)
--{
-(
--if (i->i_private)
--f->private_data = i->i_private;
-|
--f->private_data = i->i_private;
-)
--return 0;
--}
-
-@ has_open depends on open @
-identifier fops;
-identifier open.open_f;
-@@
-struct file_operations fops = {
-...,
--.open = open_f,
-+.open = simple_open,
-...
-};
-
-@ openr depends on report @
-identifier open_f != simple_open;
-identifier i, f;
-position p;
-@@
-int open_f@p(struct inode *i, struct file *f)
-{
-(
-if (i->i_private)
-f->private_data = i->i_private;
-|
-f->private_data = i->i_private;
-)
-return 0;
-}
-
-@ has_openr depends on openr @
-identifier fops;
-identifier openr.open_f;
-position p;
-@@
-struct file_operations fops = {
-...,
-.open = open_f@p,
-...
-};
-
-@script:python@
-pf << openr.p;
-ps << has_openr.p;
-@@
-
-coccilib.report.print_report(pf[0],"WARNING opportunity for simple_open, see also structure on line %s"%(ps[0].line))
diff --git a/scripts/coccinelle/free/clk_put.cocci b/scripts/coccinelle/free/clk_put.cocci
deleted file mode 100644
index 46747adfd20..00000000000
--- a/scripts/coccinelle/free/clk_put.cocci
+++ /dev/null
@@ -1,67 +0,0 @@
-/// Find missing clk_puts.
-///
-//# This only signals a missing clk_put when there is a clk_put later
-//# in the same function.
-//# False positives can be due to loops.
-//
-// Confidence: Moderate
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options:
-
-virtual context
-virtual org
-virtual report
-
-@clk@
-expression e;
-statement S,S1;
-int ret;
-position p1,p2,p3;
-@@
-
-e = clk_get@p1(...)
-... when != clk_put(e)
-if (<+...e...+>) S
-... when any
-    when != clk_put(e)
-    when != if (...) { ... clk_put(e); ... }
-(
- if (ret == 0) S1
-|
-if (...)
-   { ...
-     return 0; }
-|
-if (...)
-   { ...
-     return <+...e...+>; }
-|
-*if@p2 (...)
-   { ... when != clk_put(e)
-         when forall
-     return@p3 ...; }
-)
-... when any
-clk_put(e);
-
-@script:python depends on org@
-p1 << clk.p1;
-p2 << clk.p2;
-p3 << clk.p3;
-@@
-
-cocci.print_main("clk_get",p1)
-cocci.print_secs("if",p2)
-cocci.print_secs("needed clk_put",p3)
-
-@script:python depends on report@
-p1 << clk.p1;
-p2 << clk.p2;
-p3 << clk.p3;
-@@
-
-msg = "ERROR: missing clk_put; clk_get on line %s and execution via conditional on line %s" % (p1[0].line,p2[0].line)
-coccilib.report.print_report(p3[0],msg)
diff --git a/scripts/coccinelle/free/devm_free.cocci b/scripts/coccinelle/free/devm_free.cocci
deleted file mode 100644
index 0a1e36146d7..00000000000
--- a/scripts/coccinelle/free/devm_free.cocci
+++ /dev/null
@@ -1,71 +0,0 @@
-/// Find uses of standard freeing functons on values allocated using devm_
-/// functions.  Values allocated using the devm_functions are freed when
-/// the device is detached, and thus the use of the standard freeing
-/// function would cause a double free.
-/// See Documentation/driver-model/devres.txt for more information.
-///
-/// A difficulty of detecting this problem is that the standard freeing
-/// function might be called from a different function than the one
-/// containing the allocation function.  It is thus necessary to make the
-/// connection between the allocation function and the freeing function.
-/// Here this is done using the specific argument text, which is prone to
-/// false positives.  There is no rule for the request_region and
-/// request_mem_region variants because this heuristic seems to be a bit
-/// less reliable in these cases.
-///
-// Confidence: Moderate
-// Copyright: (C) 2011 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2011 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: -no_includes -include_headers
-
-virtual org
-virtual report
-virtual context
-
-@r depends on context || org || report@
-expression x;
-@@
-
-(
- x = devm_kzalloc(...)
-|
- x = devm_request_irq(...)
-|
- x = devm_ioremap(...)
-|
- x = devm_ioremap_nocache(...)
-|
- x = devm_ioport_map(...)
-)
-
-@pb@
-expression r.x;
-position p;
-@@
-
-(
-* kfree@p(x)
-|
-* free_irq@p(x)
-|
-* iounmap@p(x)
-|
-* ioport_unmap@p(x)
-)
-
-@script:python depends on org@
-p << pb.p;
-@@
-
-msg="WARNING: invalid free of devm_ allocated data"
-coccilib.org.print_todo(p[0], msg)
-
-@script:python depends on report@
-p << pb.p;
-@@
-
-msg="WARNING: invalid free of devm_ allocated data"
-coccilib.report.print_report(p[0], msg)
-
diff --git a/scripts/coccinelle/free/iounmap.cocci b/scripts/coccinelle/free/iounmap.cocci
deleted file mode 100644
index 5384f4ba119..00000000000
--- a/scripts/coccinelle/free/iounmap.cocci
+++ /dev/null
@@ -1,67 +0,0 @@
-/// Find missing iounmaps.
-///
-//# This only signals a missing iounmap when there is an iounmap later
-//# in the same function.
-//# False positives can be due to loops.
-//
-// Confidence: Moderate
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options:
-
-virtual context
-virtual org
-virtual report
-
-@iom@
-expression e;
-statement S,S1;
-int ret;
-position p1,p2,p3;
-@@
-
-e = \(ioremap@p1\|ioremap_nocache@p1\)(...)
-... when != iounmap(e)
-if (<+...e...+>) S
-... when any
-    when != iounmap(e)
-    when != if (...) { ... iounmap(e); ... }
-(
- if (ret == 0) S1
-|
-if (...)
-   { ...
-     return 0; }
-|
-if (...)
-   { ...
-     return <+...e...+>; }
-|
-*if@p2 (...)
-   { ... when != iounmap(e)
-         when forall
-     return@p3 ...; }
-)
-... when any
-iounmap(e);
-
-@script:python depends on org@
-p1 << iom.p1;
-p2 << iom.p2;
-p3 << iom.p3;
-@@
-
-cocci.print_main("ioremap",p1)
-cocci.print_secs("if",p2)
-cocci.print_secs("needed iounmap",p3)
-
-@script:python depends on report@
-p1 << iom.p1;
-p2 << iom.p2;
-p3 << iom.p3;
-@@
-
-msg = "ERROR: missing iounmap; ioremap on line %s and execution via conditional on line %s" % (p1[0].line,p2[0].line)
-coccilib.report.print_report(p3[0],msg)
diff --git a/scripts/coccinelle/free/kfree.cocci b/scripts/coccinelle/free/kfree.cocci
index d9ae6d89c2f..f9f79d9245e 100644
--- a/scripts/coccinelle/free/kfree.cocci
+++ b/scripts/coccinelle/free/kfree.cocci
@@ -5,9 +5,9 @@
 //# SCTP_DBG_OBJCNT_DEC that do not actually evaluate their argument
 ///
 // Confidence: Moderate
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
@@ -23,7 +23,7 @@ position p1;
 kfree@p1(E)
 
 @print expression@
-constant char [] c;
+constant char *c;
 expression free.E,E2;
 type T;
 position p;
@@ -37,10 +37,6 @@ identifier f;
 |
  E@p != E2
 |
- E2 == E@p
-|
- E2 != E@p
-|
  !E@p
 |
  E@p || ...
@@ -117,5 +113,5 @@ p1 << free.p1;
 p2 << r.p2;
 @@
 
-msg = "ERROR: reference preceded by free on line %s" % (p1[0].line)
+msg = "reference preceded by free on line %s" % (p1[0].line)
 coccilib.report.print_report(p2[0],msg)
diff --git a/scripts/coccinelle/iterators/fen.cocci b/scripts/coccinelle/iterators/fen.cocci
index 0a40af828c4..77bc108c3f5 100644
--- a/scripts/coccinelle/iterators/fen.cocci
+++ b/scripts/coccinelle/iterators/fen.cocci
@@ -2,19 +2,16 @@
 /// is no point to call of_node_put on the final value.
 ///
 // Confidence: High
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
 
 virtual patch
-virtual context
-virtual org
-virtual report
 
-@depends on patch@
+@@
 iterator name for_each_node_by_name;
 expression np,E;
 identifier l;
@@ -27,7 +24,7 @@ for_each_node_by_name(np,...) {
 ... when != np = E
 - of_node_put(np);
 
-@depends on patch@
+@@
 iterator name for_each_node_by_type;
 expression np,E;
 identifier l;
@@ -40,7 +37,7 @@ for_each_node_by_type(np,...) {
 ... when != np = E
 - of_node_put(np);
 
-@depends on patch@
+@@
 iterator name for_each_compatible_node;
 expression np,E;
 identifier l;
@@ -53,7 +50,7 @@ for_each_compatible_node(np,...) {
 ... when != np = E
 - of_node_put(np);
 
-@depends on patch@
+@@
 iterator name for_each_matching_node;
 expression np,E;
 identifier l;
@@ -65,59 +62,3 @@ for_each_matching_node(np,...) {
 }
 ... when != np = E
 - of_node_put(np);
-
-// ----------------------------------------------------------------------
-
-@r depends on !patch forall@
-//iterator name for_each_node_by_name;
-//iterator name for_each_node_by_type;
-//iterator name for_each_compatible_node;
-//iterator name for_each_matching_node;
-expression np,E;
-identifier l;
-position p1,p2;
-@@
-
-(
-*for_each_node_by_name@p1(np,...)
-{
-  ... when != break;
-      when != goto l;
-}
-|
-*for_each_node_by_type@p1(np,...)
-{
-  ... when != break;
-      when != goto l;
-}
-|
-*for_each_compatible_node@p1(np,...)
-{
-  ... when != break;
-      when != goto l;
-}
-|
-*for_each_matching_node@p1(np,...)
-{
-  ... when != break;
-      when != goto l;
-}
-)
-... when != np = E
-* of_node_put@p2(np);
-
-@script:python depends on org@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-cocci.print_main("unneeded of_node_put",p2)
-cocci.print_secs("iterator",p1)
-
-@script:python depends on report@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-msg = "ERROR: of_node_put not needed after iterator on line %s" % (p1[0].line)
-coccilib.report.print_report(p2[0], msg)
diff --git a/scripts/coccinelle/iterators/itnull.cocci b/scripts/coccinelle/iterators/itnull.cocci
index 259899f6838..baa4297a4ed 100644
--- a/scripts/coccinelle/iterators/itnull.cocci
+++ b/scripts/coccinelle/iterators/itnull.cocci
@@ -1,24 +1,20 @@
 /// Many iterators have the property that the first argument is always bound
-/// to a real list element, never NULL.
-//# False positives arise for some iterators that do not have this property,
-//# or in cases when the loop cursor is reassigned.  The latter should only
-//# happen when the matched code is on the way to a loop exit (break, goto,
-//# or return).
+/// to a real list element, never NULL.  False positives arise for some
+/// iterators that do not have this property, or in cases when the loop
+/// cursor is reassigned.  The latter should only happen when the matched
+/// code is on the way to a loop exit (break, goto, or return).
 ///
 // Confidence: Moderate
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
 
 virtual patch
-virtual context
-virtual org
-virtual report
 
-@depends on patch@
+@@
 iterator I;
 expression x,E,E1,E2;
 statement S,S1,S2;
@@ -59,36 +55,4 @@ I(x,...) { <...
   x != NULL
 + )
 )
-  ...> }
-
-@r depends on !patch exists@
-iterator I;
-expression x,E;
-position p1,p2;
-@@
-
-*I@p1(x,...)
-{ ... when != x = E
-(
-*  x@p2 == NULL
-|
-*  x@p2 != NULL
-)
-  ... when any
-}
-
-@script:python depends on org@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-cocci.print_main("iterator-bound variable",p1)
-cocci.print_secs("useless NULL test",p2)
-
-@script:python depends on report@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-msg = "ERROR: iterator variable bound on line %s cannot be NULL" % (p1[0].line)
-coccilib.report.print_report(p2[0], msg)
+  ...> }
\ No newline at end of file
diff --git a/scripts/coccinelle/iterators/use_after_iter.cocci b/scripts/coccinelle/iterators/use_after_iter.cocci
deleted file mode 100644
index 06284c57a95..00000000000
--- a/scripts/coccinelle/iterators/use_after_iter.cocci
+++ /dev/null
@@ -1,147 +0,0 @@
-/// If list_for_each_entry, etc complete a traversal of the list, the iterator
-/// variable ends up pointing to an address at an offset from the list head,
-/// and not a meaningful structure.  Thus this value should not be used after
-/// the end of the iterator.
-//#False positives arise when there is a goto in the iterator and the
-//#reported reference is at the label of this goto.  Some flag tests
-//#may also cause a report to be a false positive.
-///
-// Confidence: Moderate
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LIP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: -no_includes -include_headers
-
-virtual context
-virtual org
-virtual report
-
-@r exists@
-identifier c,member;
-expression E,x;
-iterator name list_for_each_entry;
-iterator name list_for_each_entry_reverse;
-iterator name list_for_each_entry_continue;
-iterator name list_for_each_entry_continue_reverse;
-iterator name list_for_each_entry_from;
-iterator name list_for_each_entry_safe;
-iterator name list_for_each_entry_safe_continue;
-iterator name list_for_each_entry_safe_from;
-iterator name list_for_each_entry_safe_reverse;
-iterator name hlist_for_each_entry;
-iterator name hlist_for_each_entry_continue;
-iterator name hlist_for_each_entry_from;
-iterator name hlist_for_each_entry_safe;
-statement S;
-position p1,p2;
-@@
-
-(
-list_for_each_entry@p1(c,...,member) { ... when != break;
-                                 when forall
-                                 when strict
-}
-|
-list_for_each_entry_reverse@p1(c,...,member) { ... when != break;
-                                 when forall
-                                 when strict
-}
-|
-list_for_each_entry_continue@p1(c,...,member) { ... when != break;
-                                 when forall
-                                 when strict
-}
-|
-list_for_each_entry_continue_reverse@p1(c,...,member) { ... when != break;
-                                 when forall
-                                 when strict
-}
-|
-list_for_each_entry_from@p1(c,...,member) { ... when != break;
-                                 when forall
-                                 when strict
-}
-|
-list_for_each_entry_safe@p1(c,...,member) { ... when != break;
-                                 when forall
-                                 when strict
-}
-|
-list_for_each_entry_safe_continue@p1(c,...,member) { ... when != break;
-                                 when forall
-                                 when strict
-}
-|
-list_for_each_entry_safe_from@p1(c,...,member) { ... when != break;
-                                 when forall
-                                 when strict
-}
-|
-list_for_each_entry_safe_reverse@p1(c,...,member) { ... when != break;
-                                 when forall
-                                 when strict
-}
-)
-...
-(
-list_for_each_entry(c,...) S
-|
-list_for_each_entry_reverse(c,...) S
-|
-list_for_each_entry_continue(c,...) S
-|
-list_for_each_entry_continue_reverse(c,...) S
-|
-list_for_each_entry_from(c,...) S
-|
-list_for_each_entry_safe(c,...) S
-|
-list_for_each_entry_safe(x,c,...) S
-|
-list_for_each_entry_safe_continue(c,...) S
-|
-list_for_each_entry_safe_continue(x,c,...) S
-|
-list_for_each_entry_safe_from(c,...) S
-|
-list_for_each_entry_safe_from(x,c,...) S
-|
-list_for_each_entry_safe_reverse(c,...) S
-|
-list_for_each_entry_safe_reverse(x,c,...) S
-|
-hlist_for_each_entry(c,...) S
-|
-hlist_for_each_entry_continue(c,...) S
-|
-hlist_for_each_entry_from(c,...) S
-|
-hlist_for_each_entry_safe(c,...) S
-|
-list_remove_head(x,c,...)
-|
-sizeof(<+...c...+>)
-|
-&c->member
-|
-c = E
-|
-*c@p2
-)
-
-@script:python depends on org@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-cocci.print_main("invalid iterator index reference",p2)
-cocci.print_secs("iterator",p1)
-
-@script:python depends on report@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-msg = "ERROR: invalid reference to the index variable of the iterator on line %s" % (p1[0].line)
-coccilib.report.print_report(p2[0], msg)
diff --git a/scripts/coccinelle/locks/call_kern.cocci b/scripts/coccinelle/locks/call_kern.cocci
index 8f10b49603c..00af5344a68 100644
--- a/scripts/coccinelle/locks/call_kern.cocci
+++ b/scripts/coccinelle/locks/call_kern.cocci
@@ -1,20 +1,17 @@
 /// Find functions that refer to GFP_KERNEL but are called with locks held.
-//# The proposed change of converting the GFP_KERNEL is not necessarily the
-//# correct one.  It may be desired to unlock the lock, or to not call the
-//# function under the lock in the first place.
+/// The proposed change of converting the GFP_KERNEL is not necessarily the
+/// correct one.  It may be desired to unlock the lock, or to not call the
+/// function under the lock in the first place.
 ///
 // Confidence: Moderate
-// Copyright: (C) 2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
 
 virtual patch
-virtual context
-virtual org
-virtual report
 
 @gfp exists@
 identifier fn;
@@ -35,29 +32,28 @@ fn(...) {
  ... when any
 }
 
-@locked exists@
+@locked@
 identifier gfp.fn;
-position p1,p2;
 @@
 
 (
-read_lock_irq@p1
+read_lock_irq
 |
-write_lock_irq@p1
+write_lock_irq
 |
-read_lock_irqsave@p1
+read_lock_irqsave
 |
-write_lock_irqsave@p1
+write_lock_irqsave
 |
-spin_lock@p1
+spin_lock
 |
-spin_trylock@p1
+spin_trylock
 |
-spin_lock_irq@p1
+spin_lock_irq
 |
-spin_lock_irqsave@p1
+spin_lock_irqsave
 |
-local_irq_disable@p1
+local_irq_disable
 )
  (...)
 ...  when != read_unlock_irq(...)
@@ -68,38 +64,11 @@ local_irq_disable@p1
      when != spin_unlock_irq(...)
      when != spin_unlock_irqrestore(...)
      when != local_irq_enable(...)
-fn@p2(...)
+fn(...)
 
-@depends on locked && patch@
+@depends on locked@
 position gfp.p;
 @@
 
 - GFP_KERNEL@p
 + GFP_ATOMIC
-
-@depends on locked && !patch@
-position gfp.p;
-@@
-
-* GFP_KERNEL@p
-
-@script:python depends on !patch && org@
-p << gfp.p;
-fn << gfp.fn;
-p1 << locked.p1;
-p2 << locked.p2;
-@@
-
-cocci.print_main("lock",p1)
-cocci.print_secs("call",p2)
-cocci.print_secs("GFP_KERNEL",p)
-
-@script:python depends on !patch && report@
-p << gfp.p;
-fn << gfp.fn;
-p1 << locked.p1;
-p2 << locked.p2;
-@@
-
-msg = "ERROR: function %s called on line %s inside lock on line %s but uses GFP_KERNEL" % (fn,p2[0].line,p1[0].line)
-coccilib.report.print_report(p[0], msg)
diff --git a/scripts/coccinelle/locks/flags.cocci b/scripts/coccinelle/locks/flags.cocci
index 1c4ffe6fd84..b4344d83809 100644
--- a/scripts/coccinelle/locks/flags.cocci
+++ b/scripts/coccinelle/locks/flags.cocci
@@ -1,9 +1,9 @@
 /// Find nested lock+irqsave functions that use the same flags variables
 ///
 // Confidence: High
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
@@ -12,7 +12,7 @@ virtual context
 virtual org
 virtual report
 
-@r exists@
+@r@
 expression lock1,lock2,flags;
 position p1,p2;
 @@
@@ -39,7 +39,7 @@ read_lock_irqsave@p2(lock2,flags)
 write_lock_irqsave@p2(lock2,flags)
 )
 
-@d exists@
+@d@
 expression f <= r.flags;
 expression lock1,lock2,flags;
 position r.p1, r.p2;
@@ -76,5 +76,5 @@ p1 << r.p1;
 p2 << r.p2;
 @@
 
-msg="ERROR: nested lock+irqsave that reuses flags from line %s." % (p1[0].line)
+msg="ERROR: nested lock+irqsave that reuses flags from %s." % (p1[0].line)
 coccilib.report.print_report(p2[0], msg)
diff --git a/scripts/coccinelle/locks/mini_lock.cocci b/scripts/coccinelle/locks/mini_lock.cocci
index 3267d7410bd..7641a292543 100644
--- a/scripts/coccinelle/locks/mini_lock.cocci
+++ b/scripts/coccinelle/locks/mini_lock.cocci
@@ -6,14 +6,13 @@
 /// function call that releases the lock.
 ///
 // Confidence: Moderate
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
 
-virtual context
 virtual org
 virtual report
 
@@ -58,7 +57,7 @@ position r;
 
 for(...;...;...) { <+... return@r ...; ...+> }
 
-@err exists@
+@err@
 expression E1;
 position prelocked.p;
 position up != prelocked.p1;
@@ -66,14 +65,14 @@ position r!=looped.r;
 identifier lock,unlock;
 @@
 
-*lock(E1@p,...);
+lock(E1@p,...);
 <+... when != E1
 if (...) {
   ... when != E1
-*  return@r ...;
+  return@r ...;
 }
 ...+>
-*unlock@up(E1,...);
+unlock@up(E1,...);
 
 @script:python depends on org@
 p << prelocked.p1;
diff --git a/scripts/coccinelle/misc/boolinit.cocci b/scripts/coccinelle/misc/boolinit.cocci
deleted file mode 100644
index 97ce41ce813..00000000000
--- a/scripts/coccinelle/misc/boolinit.cocci
+++ /dev/null
@@ -1,178 +0,0 @@
-/// Bool initializations should use true and false.  Bool tests don't need
-/// comparisons.  Based on contributions from Joe Perches, Rusty Russell
-/// and Bruce W Allan.
-///
-// Confidence: High
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Options: -include_headers
-
-virtual patch
-virtual context
-virtual org
-virtual report
-
-@depends on patch@
-bool t;
-symbol true;
-symbol false;
-@@
-
-(
-- t == true
-+ t
-|
-- true == t
-+ t
-|
-- t != true
-+ !t
-|
-- true != t
-+ !t
-|
-- t == false
-+ !t
-|
-- false == t
-+ !t
-|
-- t != false
-+ t
-|
-- false != t
-+ t
-)
-
-@depends on patch disable is_zero, isnt_zero@
-bool t;
-@@
-
-(
-- t == 1
-+ t
-|
-- t != 1
-+ !t
-|
-- t == 0
-+ !t
-|
-- t != 0
-+ t
-)
-
-@depends on patch@
-bool b;
-@@
-(
- b =
-- 0
-+ false
-|
- b =
-- 1
-+ true
-)
-
-// ---------------------------------------------------------------------
-
-@r1 depends on !patch@
-bool t;
-position p;
-@@
-
-(
-* t@p == true
-|
-* true == t@p
-|
-* t@p != true
-|
-* true != t@p
-|
-* t@p == false
-|
-* false == t@p
-|
-* t@p != false
-|
-* false != t@p
-)
-
-@r2 depends on !patch disable is_zero, isnt_zero@
-bool t;
-position p;
-@@
-
-(
-* t@p == 1
-|
-* t@p != 1
-|
-* t@p == 0
-|
-* t@p != 0
-)
-
-@r3 depends on !patch@
-bool b;
-position p1,p2;
-constant c;
-@@
-(
-*b@p1 = 0
-|
-*b@p1 = 1
-|
-*b@p2 = c
-)
-
-@script:python depends on org@
-p << r1.p;
-@@
-
-cocci.print_main("WARNING: Comparison to bool",p)
-
-@script:python depends on org@
-p << r2.p;
-@@
-
-cocci.print_main("WARNING: Comparison of bool to 0/1",p)
-
-@script:python depends on org@
-p1 << r3.p1;
-@@
-
-cocci.print_main("WARNING: Assignment of bool to 0/1",p1)
-
-@script:python depends on org@
-p2 << r3.p2;
-@@
-
-cocci.print_main("ERROR: Assignment of bool to non-0/1 constant",p2)
-
-@script:python depends on report@
-p << r1.p;
-@@
-
-coccilib.report.print_report(p[0],"WARNING: Comparison to bool")
-
-@script:python depends on report@
-p << r2.p;
-@@
-
-coccilib.report.print_report(p[0],"WARNING: Comparison of bool to 0/1")
-
-@script:python depends on report@
-p1 << r3.p1;
-@@
-
-coccilib.report.print_report(p1[0],"WARNING: Assignment of bool to 0/1")
-
-@script:python depends on report@
-p2 << r3.p2;
-@@
-
-coccilib.report.print_report(p2[0],"ERROR: Assignment of bool to non-0/1 constant")
diff --git a/scripts/coccinelle/misc/cstptr.cocci b/scripts/coccinelle/misc/cstptr.cocci
deleted file mode 100644
index d4256448452..00000000000
--- a/scripts/coccinelle/misc/cstptr.cocci
+++ /dev/null
@@ -1,41 +0,0 @@
-/// PTR_ERR should be applied before its argument is reassigned, typically
-/// to NULL
-///
-// Confidence: High
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: -no_includes -include_headers
-
-virtual org
-virtual report
-virtual context
-
-@r exists@
-expression e,e1;
-constant c;
-position p1,p2;
-@@
-
-*e@p1 = c
-... when != e = e1
-    when != &e
-    when != true IS_ERR(e)
-*PTR_ERR@p2(e)
-
-@script:python depends on org@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-cocci.print_main("PTR_ERR",p2)
-cocci.print_secs("assignment",p1)
-
-@script:python depends on report@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-msg = "ERROR: PTR_ERR applied after initialization to constant on line %s" % (p1[0].line)
-coccilib.report.print_report(p2[0],msg)
diff --git a/scripts/coccinelle/misc/doubleinit.cocci b/scripts/coccinelle/misc/doubleinit.cocci
index cf74a00cf59..156b20adb35 100644
--- a/scripts/coccinelle/misc/doubleinit.cocci
+++ b/scripts/coccinelle/misc/doubleinit.cocci
@@ -3,9 +3,9 @@
 /// initialization.
 ///
 // Confidence: Low
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments: requires at least Coccinelle 0.2.4, lex or parse error otherwise
 // Options: -no_includes -include_headers
@@ -49,5 +49,5 @@ pr << r.p;
 @@
 
 if int(ps[0].line) < int(pr[0].line) or (int(ps[0].line) == int(pr[0].line) and int(ps[0].column) < int(pr[0].column)):
-  msg = "%s: first occurrence line %s, second occurrence line %s" % (fld,ps[0].line,pr[0].line)
+  msg = "%s: first occurrence %s, second occurrence %s" % (fld,ps[0].line,pr[0].line)
   coccilib.report.print_report(p0[0],msg)
diff --git a/scripts/coccinelle/misc/ifaddr.cocci b/scripts/coccinelle/misc/ifaddr.cocci
deleted file mode 100644
index 3e4089a7700..00000000000
--- a/scripts/coccinelle/misc/ifaddr.cocci
+++ /dev/null
@@ -1,35 +0,0 @@
-/// the address of a variable or field is non-zero is likely always to bo
-/// non-zero
-///
-// Confidence: High
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: -no_includes -include_headers
-
-virtual org
-virtual report
-virtual context
-
-@r@
-expression x;
-statement S1,S2;
-position p;
-@@
-
-*if@p (&x)
- S1 else S2
-
-@script:python depends on org@
-p << r.p;
-@@
-
-cocci.print_main("test of a variable/field address",p)
-
-@script:python depends on report@
-p << r.p;
-@@
-
-msg = "ERROR: test of a variable/field address"
-coccilib.report.print_report(p[0],msg)
diff --git a/scripts/coccinelle/misc/irqf_oneshot.cocci b/scripts/coccinelle/misc/irqf_oneshot.cocci
deleted file mode 100644
index 6cfde94be0e..00000000000
--- a/scripts/coccinelle/misc/irqf_oneshot.cocci
+++ /dev/null
@@ -1,65 +0,0 @@
-/// Make sure threaded IRQs without a primary handler are always request with
-/// IRQF_ONESHOT
-///
-//
-// Confidence: Good
-// Comments:
-// Options: --no-includes
-
-virtual patch
-virtual context
-virtual org
-virtual report
-
-@r1@
-expression irq;
-expression thread_fn;
-expression flags;
-position p;
-@@
-request_threaded_irq@p(irq, NULL, thread_fn,
-(
-flags | IRQF_ONESHOT
-|
-IRQF_ONESHOT
-)
-, ...)
-
-@depends on patch@
-expression irq;
-expression thread_fn;
-expression flags;
-position p != r1.p;
-@@
-request_threaded_irq@p(irq, NULL, thread_fn,
-(
--0
-+IRQF_ONESHOT
-|
--flags
-+flags | IRQF_ONESHOT
-)
-, ...)
-
-@depends on context@
-position p != r1.p;
-@@
-*request_threaded_irq@p(...)
-
-@match depends on report || org@
-expression irq;
-position p != r1.p;
-@@
-request_threaded_irq@p(irq, NULL, ...)
-
-@script:python depends on org@
-p << match.p;
-@@
-msg = "ERROR: Threaded IRQ with no primary handler requested without IRQF_ONESHOT"
-coccilib.org.print_todo(p[0],msg)
-
-@script:python depends on report@
-p << match.p;
-@@
-msg = "ERROR: Threaded IRQ with no primary handler requested without IRQF_ONESHOT"
-coccilib.report.print_report(p[0],msg)
diff --git a/scripts/coccinelle/misc/noderef.cocci b/scripts/coccinelle/misc/noderef.cocci
deleted file mode 100644
index c1707214e60..00000000000
--- a/scripts/coccinelle/misc/noderef.cocci
+++ /dev/null
@@ -1,65 +0,0 @@
-/// sizeof when applied to a pointer typed expression gives the size of
-/// the pointer
-///
-// Confidence: High
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: -no_includes -include_headers
-
-virtual org
-virtual report
-virtual context
-virtual patch
-
-@depends on patch@
-expression *x;
-expression f;
-type T;
-@@
-
-(
-x = <+... sizeof(
-- x
-+ *x
-   ) ...+>
-|
-f(...,(T)(x),...,sizeof(
-- x
-+ *x
-   ),...)
-|
-f(...,sizeof(x),...,(T)(
-- x
-+ *x
-   ),...)
-)
-
-@r depends on !patch@
-expression *x;
-expression f;
-position p;
-type T;
-@@
-
-(
-*x = <+... sizeof@p(x) ...+>
-|
-*f(...,(T)(x),...,sizeof@p(x),...)
-|
-*f(...,sizeof@p(x),...,(T)(x),...)
-)
-
-@script:python depends on org@
-p << r.p;
-@@
-
-cocci.print_main("application of sizeof to pointer",p)
-
-@script:python depends on report@
-p << r.p;
-@@
-
-msg = "ERROR: application of sizeof to pointer"
-coccilib.report.print_report(p[0],msg)
diff --git a/scripts/coccinelle/misc/warn.cocci b/scripts/coccinelle/misc/warn.cocci
deleted file mode 100644
index fda8c3558e4..00000000000
--- a/scripts/coccinelle/misc/warn.cocci
+++ /dev/null
@@ -1,109 +0,0 @@
-/// Use WARN(1,...) rather than printk followed by WARN_ON(1)
-///
-// Confidence: High
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: -no_includes -include_headers
-
-virtual patch
-virtual context
-virtual org
-virtual report
-
-@bad1@
-position p;
-@@
-
-printk(...);
-printk@p(...);
-WARN_ON(1);
-
-@r1 depends on context || report || org@
-position p != bad1.p;
-@@
-
- printk@p(...);
-*WARN_ON(1);
-
-@script:python depends on org@
-p << r1.p;
-@@
-
-cocci.print_main("printk + WARN_ON can be just WARN",p)
-
-@script:python depends on report@
-p << r1.p;
-@@
-
-msg = "SUGGESTION: printk + WARN_ON can be just WARN"
-coccilib.report.print_report(p[0],msg)
-
-@ok1 depends on patch@
-expression list es;
-position p != bad1.p;
-@@
-
--printk@p(
-+WARN(1,
-  es);
--WARN_ON(1);
-
-@depends on patch@
-expression list ok1.es;
-@@
-
-if (...)
-- {
-  WARN(1,es);
-- }
-
-// --------------------------------------------------------------------
-
-@bad2@
-position p;
-@@
-
-printk(...);
-printk@p(...);
-WARN_ON_ONCE(1);
-
-@r2 depends on context || report || org@
-position p != bad1.p;
-@@
-
- printk@p(...);
-*WARN_ON_ONCE(1);
-
-@script:python depends on org@
-p << r2.p;
-@@
-
-cocci.print_main("printk + WARN_ON_ONCE can be just WARN_ONCE",p)
-
-@script:python depends on report@
-p << r2.p;
-@@
-
-msg = "SUGGESTION: printk + WARN_ON_ONCE can be just WARN_ONCE"
-coccilib.report.print_report(p[0],msg)
-
-@ok2 depends on patch@
-expression list es;
-position p != bad2.p;
-@@
-
--printk@p(
-+WARN_ONCE(1,
-  es);
--WARN_ON_ONCE(1);
-
-@depends on patch@
-expression list ok2.es;
-@@
-
-if (...)
-- {
-  WARN_ONCE(1,es);
-- }
diff --git a/scripts/coccinelle/null/badzero.cocci b/scripts/coccinelle/null/badzero.cocci
deleted file mode 100644
index d79baf7220e..00000000000
--- a/scripts/coccinelle/null/badzero.cocci
+++ /dev/null
@@ -1,237 +0,0 @@
-/// Compare pointer-typed values to NULL rather than 0
-///
-//# This makes an effort to choose between !x and x == NULL.  !x is used
-//# if it has previously been used with the function used to initialize x.
-//# This relies on type information.  More type information can be obtained
-//# using the option -all_includes and the option -I to specify an
-//# include path.
-//
-// Confidence: High
-// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options:
-
-virtual patch
-virtual context
-virtual org
-virtual report
-
-@initialize:ocaml@
-let negtable = Hashtbl.create 101
-
-@depends on patch@
-expression *E;
-identifier f;
-@@
-
-(
-  (E = f(...)) ==
-- 0
-+ NULL
-|
-  (E = f(...)) !=
-- 0
-+ NULL
-|
-- 0
-+ NULL
-  == (E = f(...))
-|
-- 0
-+ NULL
-  != (E = f(...))
-)
-
-
-@t1 depends on !patch@
-expression *E;
-identifier f;
-position p;
-@@
-
-(
-  (E = f(...)) ==
-* 0@p
-|
-  (E = f(...)) !=
-* 0@p
-|
-* 0@p
-  == (E = f(...))
-|
-* 0@p
-  != (E = f(...))
-)
-
-@script:python depends on org@
-p << t1.p;
-@@
-
-coccilib.org.print_todo(p[0], "WARNING comparing pointer to 0")
-
-@script:python depends on report@
-p << t1.p;
-@@
-
-coccilib.report.print_report(p[0], "WARNING comparing pointer to 0")
-
-// Tests of returned values
-
-@s@
-identifier f;
-expression E,E1;
-@@
-
- E = f(...)
- ... when != E = E1
- !E
-
-@script:ocaml depends on s@
-f << s.f;
-@@
-
-try let _ = Hashtbl.find negtable f in ()
-with Not_found -> Hashtbl.add negtable f ()
-
-@ r disable is_zero,isnt_zero exists @
-expression *E;
-identifier f;
-@@
-
-E = f(...)
-...
-(E == 0
-|E != 0
-|0 == E
-|0 != E
-)
-
-@script:ocaml@
-f << r.f;
-@@
-
-try let _ = Hashtbl.find negtable f in ()
-with Not_found -> include_match false
-
-// This rule may lead to inconsistent path problems, if E is defined in two
-// places
-@ depends on patch disable is_zero,isnt_zero @
-expression *E;
-expression E1;
-identifier r.f;
-@@
-
-E = f(...)
-<...
-(
-- E == 0
-+ !E
-|
-- E != 0
-+ E
-|
-- 0 == E
-+ !E
-|
-- 0 != E
-+ E
-)
-...>
-?E = E1
-
-@t2 depends on !patch disable is_zero,isnt_zero @
-expression *E;
-expression E1;
-identifier r.f;
-position p1;
-position p2;
-@@
-
-E = f(...)
-<...
-(
-* E == 0@p1
-|
-* E != 0@p2
-|
-* 0@p1 == E
-|
-* 0@p1 != E
-)
-...>
-?E = E1
-
-@script:python depends on org@
-p << t2.p1;
-@@
-
-coccilib.org.print_todo(p[0], "WARNING comparing pointer to 0, suggest !E")
-
-@script:python depends on org@
-p << t2.p2;
-@@
-
-coccilib.org.print_todo(p[0], "WARNING comparing pointer to 0")
-
-@script:python depends on report@
-p << t2.p1;
-@@
-
-coccilib.report.print_report(p[0], "WARNING comparing pointer to 0, suggest !E")
-
-@script:python depends on report@
-p << t2.p2;
-@@
-
-coccilib.report.print_report(p[0], "WARNING comparing pointer to 0")
-
-@ depends on patch disable is_zero,isnt_zero @
-expression *E;
-@@
-
-(
-  E ==
-- 0
-+ NULL
-|
-  E !=
-- 0
-+ NULL
-|
-- 0
-+ NULL
-  == E
-|
-- 0
-+ NULL
-  != E
-)
-
-@ t3 depends on !patch disable is_zero,isnt_zero @
-expression *E;
-position p;
-@@
-
-(
-* E == 0@p
-|
-* E != 0@p
-|
-* 0@p == E
-|
-* 0@p != E
-)
-
-@script:python depends on org@
-p << t3.p;
-@@
-
-coccilib.org.print_todo(p[0], "WARNING comparing pointer to 0")
-
-@script:python depends on report@
-p << t3.p;
-@@
-
-coccilib.report.print_report(p[0], "WARNING comparing pointer to 0")
diff --git a/scripts/coccinelle/null/eno.cocci b/scripts/coccinelle/null/eno.cocci
index ed961a1f7d1..4c9c52b9c41 100644
--- a/scripts/coccinelle/null/eno.cocci
+++ b/scripts/coccinelle/null/eno.cocci
@@ -1,19 +1,16 @@
 /// The various basic memory allocation functions don't return ERR_PTR
 ///
 // Confidence: High
-// Copyright: (C) 2010-2012 Nicolas Palix.  GPLv2.
-// Copyright: (C) 2010-2012 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2010-2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
 // URL: http://coccinelle.lip6.fr/
 // Comments:
 // Options: -no_includes -include_headers
 
 virtual patch
-virtual context
-virtual org
-virtual report
 
-@depends on patch@
+@@
 expression x,E;
 @@
 
@@ -21,28 +18,3 @@ x = \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|kmem_cache
 ... when != x = E
 - IS_ERR(x)
 + !x
-
-@r depends on !patch exists@
-expression x,E;
-position p1,p2;
-@@
-
-*x = \(kmalloc@p1\|kzalloc@p1\|kcalloc@p1\|kmem_cache_alloc@p1\|kmem_cache_zalloc@p1\|kmem_cache_alloc_node@p1\|kmalloc_node@p1\|kzalloc_node@p1\)(...)
-... when != x = E
-* IS_ERR@p2(x)
-
-@script:python depends on org@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-cocci.print_main("alloc call",p1)
-cocci.print_secs("IS_ERR that should be NULL tests",p2)
-
-@script:python depends on report@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-msg = "ERROR: allocation function on line %s returns NULL not ERR_PTR on failure" % (p1[0].line)
-coccilib.report.print_report(p2[0], msg)
diff --git a/scripts/coccinelle/tests/odd_ptr_err.cocci b/scripts/coccinelle/tests/odd_ptr_err.cocci
deleted file mode 100644
index e8dd8a6b28a..00000000000
--- a/scripts/coccinelle/tests/odd_ptr_err.cocci
+++ /dev/null
@@ -1,65 +0,0 @@
-/// PTR_ERR should access the value just tested by IS_ERR
-//# There can be false positives in the patch case, where it is the call
-//# IS_ERR that is wrong.
-///
-// Confidence: High
-// Copyright: (C) 2012 Julia Lawall, INRIA.  GPLv2.
-// Copyright: (C) 2012 Gilles Muller, INRIA.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: -no_includes -include_headers
-
-virtual patch
-virtual context
-virtual org
-virtual report
-
-@depends on patch@
-expression e,e1;
-@@
-
-(
-if (IS_ERR(e)) { ... PTR_ERR(e) ... }
-|
-if (IS_ERR(e=e1)) { ... PTR_ERR(e) ... }
-|
-if (IS_ERR(e))
- { ...
-  PTR_ERR(
--   e1
-+   e
-  )
-   ... }
-)
-
-@r depends on !patch@
-expression e,e1;
-position p1,p2;
-@@
-
-(
-if (IS_ERR(e)) { ... PTR_ERR(e) ... }
-|
-if (IS_ERR(e=e1)) { ... PTR_ERR(e) ... }
-|
-*if (IS_ERR@p1(e))
- { ...
-*  PTR_ERR@p2(e1)
-   ... }
-)
-
-@script:python depends on org@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-cocci.print_main("inconsistent IS_ERR and PTR_ERR",p1)
-cocci.print_secs("PTR_ERR",p2)
-
-@script:python depends on report@
-p1 << r.p1;
-p2 << r.p2;
-@@
-
-msg = "inconsistent IS_ERR and PTR_ERR, PTR_ERR on line %s" % (p2[0].line)
-coccilib.report.print_report(p1[0],msg)
diff --git a/scripts/config b/scripts/config
index bb4d3deb6d1..a7c7c4b8e95 100755
--- a/scripts/config
+++ b/scripts/config
@@ -1,9 +1,6 @@
 #!/bin/bash
 # Manipulate options in a .config file from the command line
 
-# If no prefix forced, use the default CONFIG_
-CONFIG_="${CONFIG_-CONFIG_}"
-
 usage() {
         cat >&2 <<EOL
 Manipulate options in a .config file from the command line.
@@ -17,7 +14,6 @@ commands:
                              Set option to "string"
         --set-val option value
                              Set option to value
-        --undefine|-u option Undefine option
         --state|-s option    Print state of option (n,y,m,undef)
 
         --enable-after|-E beforeopt option
@@ -30,17 +26,10 @@ commands:
         commands can be repeated multiple times
 
 options:
-        --file config-file   .config file to change (default .config)
-        --keep-case|-k       Keep next symbols' case (dont' upper-case it)
+        --file .config file to change (default .config)
 
 config doesn't check the validity of the .config file. This is done at next
-make time.
-
-By default, config will upper-case the given symbol. Use --keep-case to keep
-the case of all following symbols unchanged.
-
-config uses 'CONFIG_' as the default symbol prefix. Set the environment
-variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" config ...
+ make time.
 EOL
         exit 1
 }
@@ -51,13 +40,11 @@ checkarg() {
                 usage
         fi
         case "$ARG" in
-        ${CONFIG_}*)
-                ARG="${ARG/${CONFIG_}/}"
+        CONFIG_*)
+                ARG="${ARG/CONFIG_/}"
                 ;;
         esac
-        if [ "$MUNGE_CASE" = "yes" ] ; then
-                ARG="`echo $ARG | tr a-z A-Z`"
-        fi
+        ARG="`echo $ARG | tr a-z A-Z`"
 }
 
 set_var() {
@@ -74,12 +61,6 @@ set_var() {
         fi
 }
 
-undef_var() {
-        local name=$1
-
-        sed -ri "/^($name=|# $name is not set)/d" "$FN"
-}
-
 if [ "$1" = "--file" ]; then
         FN="$2"
         if [ "$FN" = "" ] ; then
@@ -94,15 +75,10 @@ if [ "$1" = "" ] ; then
         usage
 fi
 
-MUNGE_CASE=yes
 while [ "$1" != "" ] ; do
         CMD="$1"
         shift
         case "$CMD" in
-        --keep-case|-k)
-                MUNGE_CASE=no
-                continue
-                ;;
         --refresh)
                 ;;
         --*-after)
@@ -119,58 +95,52 @@ while [ "$1" != "" ] ; do
         esac
         case "$CMD" in
         --enable|-e)
-                set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=y"
+                set_var "CONFIG_$ARG" "CONFIG_$ARG=y"
                 ;;
 
         --disable|-d)
-                set_var "${CONFIG_}$ARG" "# ${CONFIG_}$ARG is not set"
+                set_var "CONFIG_$ARG" "# CONFIG_$ARG is not set"
                 ;;
 
         --module|-m)
-                set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=m"
+                set_var "CONFIG_$ARG" "CONFIG_$ARG=m"
                 ;;
 
         --set-str)
-                # sed swallows one level of escaping, so we need double-escaping
-                set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=\"${1//\"/\\\\\"}\""
+                set_var "CONFIG_$ARG" "CONFIG_$ARG=\"$1\""
                 shift
                 ;;
 
         --set-val)
-                set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=$1"
+                set_var "CONFIG_$ARG" "CONFIG_$ARG=$1"
                 shift
                 ;;
-        --undefine|-u)
-                undef_var "${CONFIG_}$ARG"
-                ;;
 
         --state|-s)
-                if grep -q "# ${CONFIG_}$ARG is not set" $FN ; then
+                if grep -q "# CONFIG_$ARG is not set" $FN ; then
                         echo n
                 else
-                        V="$(grep "^${CONFIG_}$ARG=" $FN)"
+                        V="$(grep "^CONFIG_$ARG=" $FN)"
                         if [ $? != 0 ] ; then
                                 echo undef
                         else
-                                V="${V/#${CONFIG_}$ARG=/}"
-                                V="${V/#\"/}"
-                                V="${V/%\"/}"
-                                V="${V//\\\"/\"}"
-                                echo "${V}"
+                                V="${V/CONFIG_$ARG=/}"
+                                V="${V/\"/}"
+                                echo "$V"
                         fi
                 fi
                 ;;
 
         --enable-after|-E)
-                set_var "${CONFIG_}$B" "${CONFIG_}$B=y" "${CONFIG_}$A"
+                set_var "CONFIG_$B" "CONFIG_$B=y" "CONFIG_$A"
                 ;;
 
         --disable-after|-D)
-                set_var "${CONFIG_}$B" "# ${CONFIG_}$B is not set" "${CONFIG_}$A"
+                set_var "CONFIG_$B" "# CONFIG_$B is not set" "CONFIG_$A"
                 ;;
 
         --module-after|-M)
-                set_var "${CONFIG_}$B" "${CONFIG_}$B=m" "${CONFIG_}$A"
+                set_var "CONFIG_$B" "CONFIG_$B=m" "CONFIG_$A"
                 ;;
 
         # undocumented because it ignores --file (fixme)
diff --git a/scripts/decodecode b/scripts/decodecode
index 4f8248d5a11..18ba881c341 100755
--- a/scripts/decodecode
+++ b/scripts/decodecode
@@ -89,7 +89,7 @@ echo $code >> $T.s
 disas $T
 cat $T.dis >> $T.aa
 
-faultline=`cat $T.dis | head -1 | cut -d":" -f2-`
+faultline=`cat $T.dis | head -1 | cut -d":" -f2`
 faultline=`echo "$faultline" | sed -e 's/\[/\\\[/g; s/\]/\\\]/g'`
 
 cat $T.oo | sed -e "s/\($faultline\)/\*\1     <-- trapping instruction/g"
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index 2ae48170314..a2723568594 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -9,6 +9,12 @@ fi
 DEPMOD=$1
 KERNELRELEASE=$2
 
+if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then
+        echo "Warning: you may need to install module-init-tools" >&2
+        echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2
+        sleep 1
+fi
+
 if ! test -r System.map -a -x "$DEPMOD"; then
         exit 0
 fi
diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile
index 2a48022c41e..6d1c6bb9f22 100644
--- a/scripts/dtc/Makefile
+++ b/scripts/dtc/Makefile
@@ -27,5 +27,3 @@ HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC)
 # dependencies on generated files need to be listed explicitly
 $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h
 
-# generated files need to be cleaned explicitly
-clean-files     := dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h
diff --git a/scripts/dtc/Makefile.dtc b/scripts/dtc/Makefile.dtc
index bece49b3553..6ddf9ecac66 100644
--- a/scripts/dtc/Makefile.dtc
+++ b/scripts/dtc/Makefile.dtc
@@ -3,16 +3,7 @@
 # This is not a complete Makefile of itself.  Instead, it is designed to
 # be easily embeddable into other systems of Makefiles.
 #
-DTC_SRCS = \
-        checks.c \
-        data.c \
-        dtc.c \
-        flattree.c \
-        fstree.c \
-        livetree.c \
-        srcpos.c \
-        treesource.c \
-        util.c
-
+DTC_SRCS = dtc.c flattree.c fstree.c data.c livetree.c treesource.c srcpos.c \
+        checks.c
 DTC_GEN_SRCS = dtc-lexer.lex.c dtc-parser.tab.c
 DTC_OBJS = $(DTC_SRCS:%.c=%.o) $(DTC_GEN_SRCS:%.c=%.o)
diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
index ee96a2519ef..a662a004479 100644
--- a/scripts/dtc/checks.c
+++ b/scripts/dtc/checks.c
@@ -31,6 +31,12 @@
 #define TRACE(c, fmt, ...)      do { } while (0)
 #endif
 
+enum checklevel {
+        IGNORE = 0,
+        WARN = 1,
+        ERROR = 2,
+};
+
 enum checkstatus {
         UNCHECKED = 0,
         PREREQ,
@@ -51,14 +57,14 @@ struct check {
         node_check_fn node_fn;
         prop_check_fn prop_fn;
         void *data;
-        bool warn, error;
+        enum checklevel level;
         enum checkstatus status;
         int inprogress;
         int num_prereqs;
         struct check **prereq;
 };
 
-#define CHECK_ENTRY(nm, tfn, nfn, pfn, d, w, e, ...)           \
+#define CHECK(nm, tfn, nfn, pfn, d, lvl, ...) \
         static struct check *nm##_prereqs[] = { __VA_ARGS__ }; \
         static struct check nm = { \
                 .name = #nm, \
@@ -66,37 +72,20 @@ struct check {
                 .node_fn = (nfn), \
                 .prop_fn = (pfn), \
                 .data = (d), \
-                .warn = (w), \
-                .error = (e), \
+                .level = (lvl), \
                 .status = UNCHECKED, \
                 .num_prereqs = ARRAY_SIZE(nm##_prereqs), \
                 .prereq = nm##_prereqs, \
         };
-#define WARNING(nm, tfn, nfn, pfn, d, ...) \
-        CHECK_ENTRY(nm, tfn, nfn, pfn, d, true, false, __VA_ARGS__)
-#define ERROR(nm, tfn, nfn, pfn, d, ...) \
-        CHECK_ENTRY(nm, tfn, nfn, pfn, d, false, true, __VA_ARGS__)
-#define CHECK(nm, tfn, nfn, pfn, d, ...) \
-        CHECK_ENTRY(nm, tfn, nfn, pfn, d, false, false, __VA_ARGS__)
-
-#define TREE_WARNING(nm, d, ...) \
-        WARNING(nm, check_##nm, NULL, NULL, d, __VA_ARGS__)
-#define TREE_ERROR(nm, d, ...) \
-        ERROR(nm, check_##nm, NULL, NULL, d, __VA_ARGS__)
-#define TREE_CHECK(nm, d, ...) \
-        CHECK(nm, check_##nm, NULL, NULL, d, __VA_ARGS__)
-#define NODE_WARNING(nm, d, ...) \
-        WARNING(nm, NULL, check_##nm, NULL, d,  __VA_ARGS__)
-#define NODE_ERROR(nm, d, ...) \
-        ERROR(nm, NULL, check_##nm, NULL, d, __VA_ARGS__)
-#define NODE_CHECK(nm, d, ...) \
-        CHECK(nm, NULL, check_##nm, NULL, d, __VA_ARGS__)
-#define PROP_WARNING(nm, d, ...) \
-        WARNING(nm, NULL, NULL, check_##nm, d, __VA_ARGS__)
-#define PROP_ERROR(nm, d, ...) \
-        ERROR(nm, NULL, NULL, check_##nm, d, __VA_ARGS__)
-#define PROP_CHECK(nm, d, ...) \
-        CHECK(nm, NULL, NULL, check_##nm, d, __VA_ARGS__)
+
+#define TREE_CHECK(nm, d, lvl, ...) \
+        CHECK(nm, check_##nm, NULL, NULL, d, lvl, __VA_ARGS__)
+#define NODE_CHECK(nm, d, lvl, ...) \
+        CHECK(nm, NULL, check_##nm, NULL, d, lvl, __VA_ARGS__)
+#define PROP_CHECK(nm, d, lvl, ...) \
+        CHECK(nm, NULL, NULL, check_##nm, d, lvl, __VA_ARGS__)
+#define BATCH_CHECK(nm, lvl, ...) \
+        CHECK(nm, NULL, NULL, NULL, NULL, lvl, __VA_ARGS__)
 
 #ifdef __GNUC__
 static inline void check_msg(struct check *c, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
@@ -106,13 +95,13 @@ static inline void check_msg(struct check *c, const char *fmt, ...)
         va_list ap;
         va_start(ap, fmt);
 
-        if ((c->warn && (quiet < 1))
-            || (c->error && (quiet < 2))) {
-                fprintf(stderr, "%s (%s): ",
-                        (c->error) ? "ERROR" : "Warning", c->name);
-                vfprintf(stderr, fmt, ap);
-                fprintf(stderr, "\n");
-        }
+        if ((c->level < WARN) || (c->level <= quiet))
+                return; /* Suppress message */
+
+        fprintf(stderr, "%s (%s): ",
+                (c->level == ERROR) ? "ERROR" : "Warning", c->name);
+        vfprintf(stderr, fmt, ap);
+        fprintf(stderr, "\n");
 }
 
 #define FAIL(c, ...) \
@@ -178,7 +167,7 @@ static int run_check(struct check *c, struct node *dt)
 
 out:
         c->inprogress = 0;
-        if ((c->status != PASSED) && (c->error))
+        if ((c->status != PASSED) && (c->level == ERROR))
                 error = 1;
         return error;
 }
@@ -187,13 +176,6 @@ out:
  * Utility check functions
  */
 
-/* A check which always fails, for testing purposes only */
-static inline void check_always_fail(struct check *c, struct node *dt)
-{
-        FAIL(c, "always_fail check");
-}
-TREE_CHECK(always_fail, NULL);
-
 static void check_is_string(struct check *c, struct node *root,
                             struct node *node)
 {
@@ -208,10 +190,8 @@ static void check_is_string(struct check *c, struct node *root,
                 FAIL(c, "\"%s\" property in %s is not a string",
                      propname, node->fullpath);
 }
-#define WARNING_IF_NOT_STRING(nm, propname) \
-        WARNING(nm, NULL, check_is_string, NULL, (propname))
-#define ERROR_IF_NOT_STRING(nm, propname) \
-        ERROR(nm, NULL, check_is_string, NULL, (propname))
+#define CHECK_IS_STRING(nm, propname, lvl) \
+        CHECK(nm, NULL, check_is_string, NULL, (propname), (lvl))
 
 static void check_is_cell(struct check *c, struct node *root,
                           struct node *node)
@@ -227,10 +207,8 @@ static void check_is_cell(struct check *c, struct node *root,
                 FAIL(c, "\"%s\" property in %s is not a single cell",
                      propname, node->fullpath);
 }
-#define WARNING_IF_NOT_CELL(nm, propname) \
-        WARNING(nm, NULL, check_is_cell, NULL, (propname))
-#define ERROR_IF_NOT_CELL(nm, propname) \
-        ERROR(nm, NULL, check_is_cell, NULL, (propname))
+#define CHECK_IS_CELL(nm, propname, lvl) \
+        CHECK(nm, NULL, check_is_cell, NULL, (propname), (lvl))
 
 /*
  * Structural check functions
@@ -249,24 +227,20 @@ static void check_duplicate_node_names(struct check *c, struct node *dt,
                                 FAIL(c, "Duplicate node name %s",
                                      child->fullpath);
 }
-NODE_ERROR(duplicate_node_names, NULL);
+NODE_CHECK(duplicate_node_names, NULL, ERROR);
 
 static void check_duplicate_property_names(struct check *c, struct node *dt,
                                            struct node *node)
 {
         struct property *prop, *prop2;
 
-        for_each_property(node, prop) {
-                for (prop2 = prop->next; prop2; prop2 = prop2->next) {
-                        if (prop2->deleted)
-                                continue;
+        for_each_property(node, prop)
+                for (prop2 = prop->next; prop2; prop2 = prop2->next)
                         if (streq(prop->name, prop2->name))
                                 FAIL(c, "Duplicate property name %s in %s",
                                      prop->name, node->fullpath);
-                }
-        }
 }
-NODE_ERROR(duplicate_property_names, NULL);
+NODE_CHECK(duplicate_property_names, NULL, ERROR);
 
 #define LOWERCASE       "abcdefghijklmnopqrstuvwxyz"
 #define UPPERCASE       "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -282,7 +256,7 @@ static void check_node_name_chars(struct check *c, struct node *dt,
                 FAIL(c, "Bad character '%c' in node %s",
                      node->name[n], node->fullpath);
 }
-NODE_ERROR(node_name_chars, PROPNODECHARS "@");
+NODE_CHECK(node_name_chars, PROPNODECHARS "@", ERROR);
 
 static void check_node_name_format(struct check *c, struct node *dt,
                                    struct node *node)
@@ -291,7 +265,7 @@ static void check_node_name_format(struct check *c, struct node *dt,
                 FAIL(c, "Node %s has multiple '@' characters in name",
                      node->fullpath);
 }
-NODE_ERROR(node_name_format, NULL, &node_name_chars);
+NODE_CHECK(node_name_format, NULL, ERROR, &node_name_chars);
 
 static void check_property_name_chars(struct check *c, struct node *dt,
                                       struct node *node, struct property *prop)
@@ -302,7 +276,7 @@ static void check_property_name_chars(struct check *c, struct node *dt,
                 FAIL(c, "Bad character '%c' in property name \"%s\", node %s",
                      prop->name[n], prop->name, node->fullpath);
 }
-PROP_ERROR(property_name_chars, PROPNODECHARS);
+PROP_CHECK(property_name_chars, PROPNODECHARS, ERROR);
 
 #define DESCLABEL_FMT   "%s%s%s%s%s"
 #define DESCLABEL_ARGS(node,prop,mark)          \
@@ -357,8 +331,8 @@ static void check_duplicate_label_prop(struct check *c, struct node *dt,
         for_each_marker_of_type(m, LABEL)
                 check_duplicate_label(c, dt, m->ref, node, prop, m);
 }
-ERROR(duplicate_label, NULL, check_duplicate_label_node,
-      check_duplicate_label_prop, NULL);
+CHECK(duplicate_label, NULL, check_duplicate_label_node,
+      check_duplicate_label_prop, NULL, ERROR);
 
 static void check_explicit_phandles(struct check *c, struct node *root,
                                     struct node *node, struct property *prop)
@@ -417,7 +391,7 @@ static void check_explicit_phandles(struct check *c, struct node *root,
 
         node->phandle = phandle;
 }
-PROP_ERROR(explicit_phandles, NULL);
+PROP_CHECK(explicit_phandles, NULL, ERROR);
 
 static void check_name_properties(struct check *c, struct node *root,
                                   struct node *node)
@@ -446,8 +420,8 @@ static void check_name_properties(struct check *c, struct node *root,
                 free(prop);
         }
 }
-ERROR_IF_NOT_STRING(name_is_string, "name");
-NODE_ERROR(name_properties, NULL, &name_is_string);
+CHECK_IS_STRING(name_is_string, "name", ERROR);
+NODE_CHECK(name_properties, NULL, ERROR, &name_is_string);
 
 /*
  * Reference fixup functions
@@ -474,7 +448,7 @@ static void fixup_phandle_references(struct check *c, struct node *dt,
                 *((cell_t *)(prop->val.val + m->offset)) = cpu_to_fdt32(phandle);
         }
 }
-ERROR(phandle_references, NULL, NULL, fixup_phandle_references, NULL,
+CHECK(phandle_references, NULL, NULL, fixup_phandle_references, NULL, ERROR,
       &duplicate_node_names, &explicit_phandles);
 
 static void fixup_path_references(struct check *c, struct node *dt,
@@ -499,19 +473,19 @@ static void fixup_path_references(struct check *c, struct node *dt,
                                                   strlen(path) + 1);
         }
 }
-ERROR(path_references, NULL, NULL, fixup_path_references, NULL,
+CHECK(path_references, NULL, NULL, fixup_path_references, NULL, ERROR,
       &duplicate_node_names);
 
 /*
  * Semantic checks
  */
-WARNING_IF_NOT_CELL(address_cells_is_cell, "#address-cells");
-WARNING_IF_NOT_CELL(size_cells_is_cell, "#size-cells");
-WARNING_IF_NOT_CELL(interrupt_cells_is_cell, "#interrupt-cells");
+CHECK_IS_CELL(address_cells_is_cell, "#address-cells", WARN);
+CHECK_IS_CELL(size_cells_is_cell, "#size-cells", WARN);
+CHECK_IS_CELL(interrupt_cells_is_cell, "#interrupt-cells", WARN);
 
-WARNING_IF_NOT_STRING(device_type_is_string, "device_type");
-WARNING_IF_NOT_STRING(model_is_string, "model");
-WARNING_IF_NOT_STRING(status_is_string, "status");
+CHECK_IS_STRING(device_type_is_string, "device_type", WARN);
+CHECK_IS_STRING(model_is_string, "model", WARN);
+CHECK_IS_STRING(status_is_string, "status", WARN);
 
 static void fixup_addr_size_cells(struct check *c, struct node *dt,
                                   struct node *node)
@@ -529,8 +503,8 @@ static void fixup_addr_size_cells(struct check *c, struct node *dt,
         if (prop)
                 node->size_cells = propval_cell(prop);
 }
-WARNING(addr_size_cells, NULL, fixup_addr_size_cells, NULL, NULL,
-        &address_cells_is_cell, &size_cells_is_cell);
+CHECK(addr_size_cells, NULL, fixup_addr_size_cells, NULL, NULL, WARN,
+      &address_cells_is_cell, &size_cells_is_cell);
 
 #define node_addr_cells(n) \
         (((n)->addr_cells == -1) ? 2 : (n)->addr_cells)
@@ -564,7 +538,7 @@ static void check_reg_format(struct check *c, struct node *dt,
                      "(#address-cells == %d, #size-cells == %d)",
                      node->fullpath, prop->val.len, addr_cells, size_cells);
 }
-NODE_WARNING(reg_format, NULL, &addr_size_cells);
+NODE_CHECK(reg_format, NULL, WARN, &addr_size_cells);
 
 static void check_ranges_format(struct check *c, struct node *dt,
                                 struct node *node)
@@ -605,7 +579,7 @@ static void check_ranges_format(struct check *c, struct node *dt,
                      p_addr_cells, c_addr_cells, c_size_cells);
         }
 }
-NODE_WARNING(ranges_format, NULL, &addr_size_cells);
+NODE_CHECK(ranges_format, NULL, WARN, &addr_size_cells);
 
 /*
  * Style checks
@@ -632,7 +606,7 @@ static void check_avoid_default_addr_size(struct check *c, struct node *dt,
                 FAIL(c, "Relying on default #size-cells value for %s",
                      node->fullpath);
 }
-NODE_WARNING(avoid_default_addr_size, NULL, &addr_size_cells);
+NODE_CHECK(avoid_default_addr_size, NULL, WARN, &addr_size_cells);
 
 static void check_obsolete_chosen_interrupt_controller(struct check *c,
                                                        struct node *dt)
@@ -649,7 +623,7 @@ static void check_obsolete_chosen_interrupt_controller(struct check *c,
                 FAIL(c, "/chosen has obsolete \"interrupt-controller\" "
                      "property");
 }
-TREE_WARNING(obsolete_chosen_interrupt_controller, NULL);
+TREE_CHECK(obsolete_chosen_interrupt_controller, NULL, WARN);
 
 static struct check *check_table[] = {
         &duplicate_node_names, &duplicate_property_names,
@@ -668,71 +642,8 @@ static struct check *check_table[] = {
 
         &avoid_default_addr_size,
         &obsolete_chosen_interrupt_controller,
-
-        &always_fail,
 };
 
-static void enable_warning_error(struct check *c, bool warn, bool error)
-{
-        int i;
-
-        /* Raising level, also raise it for prereqs */
-        if ((warn && !c->warn) || (error && !c->error))
-                for (i = 0; i < c->num_prereqs; i++)
-                        enable_warning_error(c->prereq[i], warn, error);
-
-        c->warn = c->warn || warn;
-        c->error = c->error || error;
-}
-
-static void disable_warning_error(struct check *c, bool warn, bool error)
-{
-        int i;
-
-        /* Lowering level, also lower it for things this is the prereq
-         * for */
-        if ((warn && c->warn) || (error && c->error)) {
-                for (i = 0; i < ARRAY_SIZE(check_table); i++) {
-                        struct check *cc = check_table[i];
-                        int j;
-
-                        for (j = 0; j < cc->num_prereqs; j++)
-                                if (cc->prereq[j] == c)
-                                        disable_warning_error(cc, warn, error);
-                }
-        }
-
-        c->warn = c->warn && !warn;
-        c->error = c->error && !error;
-}
-
-void parse_checks_option(bool warn, bool error, const char *optarg)
-{
-        int i;
-        const char *name = optarg;
-        bool enable = true;
-
-        if ((strncmp(optarg, "no-", 3) == 0)
-            || (strncmp(optarg, "no_", 3) == 0)) {
-                name = optarg + 3;
-                enable = false;
-        }
-
-        for (i = 0; i < ARRAY_SIZE(check_table); i++) {
-                struct check *c = check_table[i];
-
-                if (streq(c->name, name)) {
-                        if (enable)
-                                enable_warning_error(c, warn, error);
-                        else
-                                disable_warning_error(c, warn, error);
-                        return;
-                }
-        }
-
-        die("Unrecognized check name \"%s\"\n", name);
-}
-
 void process_checks(int force, struct boot_info *bi)
 {
         struct node *dt = bi->dt;
@@ -742,7 +653,7 @@ void process_checks(int force, struct boot_info *bi)
         for (i = 0; i < ARRAY_SIZE(check_table); i++) {
                 struct check *c = check_table[i];
 
-                if (c->warn || c->error)
+                if (c->level != IGNORE)
                         error = error || run_check(c, dt);
         }
 
diff --git a/scripts/dtc/data.c b/scripts/dtc/data.c
index 4a40c5b9247..fe555e819bf 100644
--- a/scripts/dtc/data.c
+++ b/scripts/dtc/data.c
@@ -68,6 +68,40 @@ struct data data_copy_mem(const char *mem, int len)
         return d;
 }
 
+static char get_oct_char(const char *s, int *i)
+{
+        char x[4];
+        char *endx;
+        long val;
+
+        x[3] = '\0';
+        strncpy(x, s + *i, 3);
+
+        val = strtol(x, &endx, 8);
+
+        assert(endx > x);
+
+        (*i) += endx - x;
+        return val;
+}
+
+static char get_hex_char(const char *s, int *i)
+{
+        char x[3];
+        char *endx;
+        long val;
+
+        x[2] = '\0';
+        strncpy(x, s + *i, 2);
+
+        val = strtol(x, &endx, 16);
+        if (!(endx  > x))
+                die("\\x used with no following hex digits\n");
+
+        (*i) += endx - x;
+        return val;
+}
+
 struct data data_copy_escape_string(const char *s, int len)
 {
         int i = 0;
@@ -80,10 +114,53 @@ struct data data_copy_escape_string(const char *s, int len)
         while (i < len) {
                 char c = s[i++];
 
-                if (c == '\\')
-                        c = get_escape_char(s, &i);
-
-                q[d.len++] = c;
+                if (c != '\\') {
+                        q[d.len++] = c;
+                        continue;
+                }
+
+                c = s[i++];
+                assert(c);
+                switch (c) {
+                case 'a':
+                        q[d.len++] = '\a';
+                        break;
+                case 'b':
+                        q[d.len++] = '\b';
+                        break;
+                case 't':
+                        q[d.len++] = '\t';
+                        break;
+                case 'n':
+                        q[d.len++] = '\n';
+                        break;
+                case 'v':
+                        q[d.len++] = '\v';
+                        break;
+                case 'f':
+                        q[d.len++] = '\f';
+                        break;
+                case 'r':
+                        q[d.len++] = '\r';
+                        break;
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                        i--; /* need to re-read the first digit as
+                              * part of the octal value */
+                        q[d.len++] = get_oct_char(s, &i);
+                        break;
+                case 'x':
+                        q[d.len++] = get_hex_char(s, &i);
+                        break;
+                default:
+                        q[d.len++] = c;
+                }
         }
 
         q[d.len++] = '\0';
@@ -168,33 +245,11 @@ struct data data_merge(struct data d1, struct data d2)
         return d;
 }
 
-struct data data_append_integer(struct data d, uint64_t value, int bits)
+struct data data_append_cell(struct data d, cell_t word)
 {
-        uint8_t value_8;
-        uint16_t value_16;
-        uint32_t value_32;
-        uint64_t value_64;
-
-        switch (bits) {
-        case 8:
-                value_8 = value;
-                return data_append_data(d, &value_8, 1);
-
-        case 16:
-                value_16 = cpu_to_fdt16(value);
-                return data_append_data(d, &value_16, 2);
-
-        case 32:
-                value_32 = cpu_to_fdt32(value);
-                return data_append_data(d, &value_32, 4);
-
-        case 64:
-                value_64 = cpu_to_fdt64(value);
-                return data_append_data(d, &value_64, 8);
-
-        default:
-                die("Invalid literal size (%d)\n", bits);
-        }
+        cell_t beword = cpu_to_fdt32(word);
+
+        return data_append_data(d, &beword, sizeof(beword));
 }
 
 struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)
@@ -207,14 +262,11 @@ struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)
         return data_append_data(d, &bere, sizeof(bere));
 }
 
-struct data data_append_cell(struct data d, cell_t word)
-{
-        return data_append_integer(d, word, sizeof(word) * 8);
-}
-
 struct data data_append_addr(struct data d, uint64_t addr)
 {
-        return data_append_integer(d, addr, sizeof(addr) * 8);
+        uint64_t beaddr = cpu_to_fdt64(addr);
+
+        return data_append_data(d, &beaddr, sizeof(beaddr));
 }
 
 struct data data_append_byte(struct data d, uint8_t byte)
diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index 254d5af8895..e866ea5166a 100644
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -29,7 +29,6 @@ PROPNODECHAR	[a-zA-Z0-9,._+*#?@-]
 PATHCHAR        ({PROPNODECHAR}|[/])
 LABEL           [a-zA-Z_][a-zA-Z0-9_]*
 STRING          \"([^\\"]|\\.)*\"
-CHAR_LITERAL    '([^']|\\')*'
 WS              [[:space:]]
 COMMENT         "/*"([^*]|\*+[^*/])*\*+"/"
 LINECOMMENT     "//".*\n
@@ -71,27 +70,6 @@ static int pop_input_file(void);
                         push_input_file(name);
                 }
 
-<*>^"#"(line)?{WS}+[0-9]+{WS}+{STRING}({WS}+[0-9]+)? {
-                        char *line, *tmp, *fn;
-                        /* skip text before line # */
-                        line = yytext;
-                        while (!isdigit(*line))
-                                line++;
-                        /* skip digits in line # */
-                        tmp = line;
-                        while (!isspace(*tmp))
-                                tmp++;
-                        /* "NULL"-terminate line # */
-                        *tmp = '\0';
-                        /* start of filename */
-                        fn = strchr(tmp + 1, '"') + 1;
-                        /* strip trailing " from filename */
-                        tmp = strchr(fn, '"');
-                        *tmp = 0;
-                        /* -1 since #line is the number of the next line */
-                        srcpos_set_line(xstrdup(fn), atoi(line) - 1);
-                }
-
 <*><<EOF>>              {
                         if (!pop_input_file()) {
                                 yyterminate();
@@ -118,26 +96,6 @@ static int pop_input_file(void);
                         return DT_MEMRESERVE;
                 }
 
-<*>"/bits/"     {
-                        DPRINT("Keyword: /bits/\n");
-                        BEGIN_DEFAULT();
-                        return DT_BITS;
-                }
-
-<*>"/delete-property/"  {
-                        DPRINT("Keyword: /delete-property/\n");
-                        DPRINT("<PROPNODENAME>\n");
-                        BEGIN(PROPNODENAME);
-                        return DT_DEL_PROP;
-                }
-
-<*>"/delete-node/"      {
-                        DPRINT("Keyword: /delete-node/\n");
-                        DPRINT("<PROPNODENAME>\n");
-                        BEGIN(PROPNODENAME);
-                        return DT_DEL_NODE;
-                }
-
 <*>{LABEL}:     {
                         DPRINT("Label: %s\n", yytext);
                         yylval.labelref = xstrdup(yytext);
@@ -145,19 +103,12 @@ static int pop_input_file(void);
                         return DT_LABEL;
                 }
 
-<V1>([0-9]+|0[xX][0-9a-fA-F]+)(U|L|UL|LL|ULL)? {
+<V1>[0-9]+|0[xX][0-9a-fA-F]+      {
                         yylval.literal = xstrdup(yytext);
                         DPRINT("Literal: '%s'\n", yylval.literal);
                         return DT_LITERAL;
                 }
 
-<*>{CHAR_LITERAL}       {
-                        yytext[yyleng-1] = '\0';
-                        yylval.literal = xstrdup(yytext+1);
-                        DPRINT("Character literal: %s\n", yylval.literal);
-                        return DT_CHAR_LITERAL;
-                }
-
 <*>\&{LABEL}    {       /* label reference */
                         DPRINT("Ref: %s\n", yytext+1);
                         yylval.labelref = xstrdup(yytext+1);
@@ -183,10 +134,9 @@ static int pop_input_file(void);
                         return ']';
                 }
 
-<PROPNODENAME>\\?{PROPNODECHAR}+ {
+<PROPNODENAME>{PROPNODECHAR}+ {
                         DPRINT("PropNodeName: %s\n", yytext);
-                        yylval.propnodename = xstrdup((yytext[0] == '\\') ?
-                                                        yytext + 1 : yytext);
+                        yylval.propnodename = xstrdup(yytext);
                         BEGIN_DEFAULT();
                         return DT_PROPNODENAME;
                 }
@@ -200,15 +150,6 @@ static int pop_input_file(void);
 <*>{COMMENT}+   /* eat C-style comments */
 <*>{LINECOMMENT}+ /* eat C++-style comments */
 
-<*>"<<"         { return DT_LSHIFT; };
-<*>">>"         { return DT_RSHIFT; };
-<*>"<="         { return DT_LE; };
-<*>">="         { return DT_GE; };
-<*>"=="         { return DT_EQ; };
-<*>"!="         { return DT_NE; };
-<*>"&&"         { return DT_AND; };
-<*>"||"         { return DT_OR; };
-
 <*>.            {
                         DPRINT("Char: %c (\\x%02x)\n", yytext[0],
                                 (unsigned)yytext[0]);
diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
index a6c5fcdfc03..8bbe1281705 100644
--- a/scripts/dtc/dtc-lexer.lex.c_shipped
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped
@@ -1,6 +1,5 @@
-#line 2 "dtc-lexer.lex.c"
 
-#line 4 "dtc-lexer.lex.c"
+#line 3 "scripts/dtc/dtc-lexer.lex.c_shipped"
 
 #define  YY_INT_ALIGNED short int
 
@@ -54,6 +53,7 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -84,8 +84,6 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -142,15 +140,7 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -372,8 +362,8 @@ static void yy_fatal_error (yyconst char msg[]  );
         *yy_cp = '\0'; \
         (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 30
-#define YY_END_OF_BUFFER 31
+#define YY_NUM_RULES 17
+#define YY_END_OF_BUFFER 18
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -381,25 +371,19 @@ struct yy_trans_info
         flex_int32_t yy_verify;
         flex_int32_t yy_nxt;
         };
-static yyconst flex_int16_t yy_accept[161] =
+static yyconst flex_int16_t yy_accept[94] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       31,   29,   18,   18,   29,   29,   29,   29,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   15,   16,
-       16,   29,   16,   10,   10,   18,   26,    0,    3,    0,
-       27,   12,    0,    0,   11,    0,    0,    0,    0,    0,
-        0,    0,   21,   23,   25,   24,   22,    0,    9,   28,
-        0,    0,    0,   14,   14,   16,   16,   16,   10,   10,
-       10,    0,   12,    0,   11,    0,    0,    0,   20,    0,
-        0,    0,    0,    0,    0,    0,    0,   16,   10,   10,
-       10,    0,   19,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,   16,   13,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   16,    6,    0,    0,    0,    0,    0,
-        0,    2,    0,    0,    0,    0,    0,    0,    0,    0,
-        4,   17,    0,    0,    2,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    1,    0,    0,
-        0,    0,    5,    8,    0,    0,    0,    0,    7,    0
+       18,   16,   13,   13,   16,   16,   16,   16,   16,   16,
+       16,   10,   11,   11,    6,    6,   13,    0,    2,    0,
+        7,    0,    0,    0,    0,    0,    0,    0,    5,    0,
+        9,    9,   11,   11,    6,    0,    7,    0,    0,    0,
+        0,   15,    0,    0,    0,    0,    6,    0,   14,    0,
+        0,    0,    0,    0,    8,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    3,   12,
+        0,    0,    0,    0,    0,    0,    0,    0,    1,    0,
+        0,    4,    0
+
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -407,17 +391,17 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         2,    2,    2,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    4,    5,    6,    1,    1,    7,    8,    1,
-        1,    9,   10,   10,   11,   10,   12,   13,   14,   15,
-       15,   15,   15,   15,   15,   15,   15,   16,    1,   17,
-       18,   19,   10,   10,   20,   20,   20,   20,   20,   20,
-       21,   21,   21,   21,   21,   22,   21,   21,   21,   21,
-       21,   21,   21,   21,   23,   21,   21,   24,   21,   21,
-        1,   25,   26,    1,   21,    1,   20,   27,   28,   29,
-
-       30,   20,   21,   21,   31,   21,   21,   32,   33,   34,
-       35,   36,   21,   37,   38,   39,   40,   41,   21,   24,
-       42,   21,   43,   44,   45,    1,    1,    1,    1,    1,
+        1,    2,    1,    4,    5,    1,    1,    6,    1,    1,
+        1,    7,    5,    5,    8,    5,    9,   10,   11,   12,
+       12,   12,   12,   12,   12,   12,   12,   13,    1,    1,
+        1,    1,    5,    5,   14,   14,   14,   14,   14,   14,
+       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
+       15,   15,   15,   15,   15,   15,   15,   16,   15,   15,
+        1,   17,   18,    1,   15,    1,   14,   19,   20,   21,
+
+       22,   14,   15,   15,   23,   15,   15,   24,   25,   26,
+       15,   15,   15,   27,   28,   29,   30,   31,   15,   16,
+       15,   15,   32,    1,   33,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -434,163 +418,112 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[46] =
+static yyconst flex_int32_t yy_meta[34] =
     {   0,
-        1,    1,    1,    1,    1,    2,    3,    1,    2,    2,
-        2,    4,    5,    5,    5,    6,    1,    1,    1,    7,
-        8,    8,    8,    8,    1,    1,    7,    7,    7,    7,
-        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-        8,    8,    3,    1,    1
+        1,    1,    1,    1,    2,    1,    2,    2,    3,    4,
+        4,    4,    5,    6,    7,    7,    1,    1,    6,    6,
+        6,    6,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    8,    1
     } ;
 
-static yyconst flex_int16_t yy_base[175] =
+static yyconst flex_int16_t yy_base[106] =
     {   0,
-        0,  388,  381,   40,   41,  386,   71,  385,   34,   44,
-      390,  395,   60,   62,  371,  112,  111,  111,  111,  104,
-      370,  106,  371,  342,  124,  119,    0,  144,  395,    0,
-      123,    0,  159,  153,  165,  167,  395,  130,  395,  382,
-      395,    0,  372,  122,  395,  157,  374,  379,  350,   21,
-      346,  349,  395,  395,  395,  395,  395,  362,  395,  395,
-      181,  346,  342,  395,  359,    0,  191,  343,  190,  351,
-      350,    0,    0,    0,  173,  362,  177,  367,  357,  329,
-      335,  328,  337,  331,  206,  329,  334,  327,  395,  338,
-      170,  314,  346,  345,  318,  325,  343,  158,  316,  212,
-
-      322,  319,  320,  395,  340,  336,  308,  305,  314,  304,
-      295,  138,  208,  220,  395,  292,  305,  265,  264,  254,
-      201,  222,  285,  275,  273,  270,  236,  235,  225,  115,
-      395,  395,  252,  216,  216,  217,  214,  230,  209,  220,
-      213,  239,  211,  217,  216,  209,  229,  395,  240,  225,
-      206,  169,  395,  395,  116,  106,   99,   54,  395,  395,
-      254,  260,  268,  272,  276,  282,  289,  293,  301,  309,
-      313,  319,  327,  335
+        0,    0,  237,  236,   25,    0,   47,    0,   30,   71,
+      244,  247,   82,   84,   84,  211,   95,  229,  218,    0,
+      111,  247,    0,   84,   83,   95,  106,   86,  247,  237,
+        0,  230,  231,  234,  207,  209,  212,  220,  247,  206,
+      247,  218,    0,  106,  116,    0,    0,    0,  223,   89,
+      226,  219,  199,  206,  200,  204,    0,  190,  213,  212,
+      202,   91,  178,  161,  247,  172,  144,  150,  140,  130,
+      140,  124,  128,  120,  138,  137,  123,  122,  247,  247,
+      134,  114,  132,   86,  135,  125,   90,  136,  247,   97,
+       29,  247,  247,  153,  156,  161,  165,  170,  176,  180,
+
+      187,  195,  200,  205,  212
     } ;
 
-static yyconst flex_int16_t yy_def[175] =
+static yyconst flex_int16_t yy_def[106] =
     {   0,
-      160,    1,    1,    1,    1,    5,  160,    7,    1,    1,
-      160,  160,  160,  160,  160,  161,  162,  163,  160,  160,
-      160,  160,  164,  160,  160,  160,  165,  164,  160,  166,
-      167,  166,  166,  160,  160,  160,  160,  161,  160,  161,
-      160,  168,  160,  163,  160,  163,  169,  170,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  164,  160,  160,
-      160,  160,  160,  160,  164,  166,  167,  166,  160,  160,
-      160,  171,  168,  172,  163,  169,  169,  170,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  166,  160,  160,
-      171,  172,  160,  160,  160,  160,  160,  160,  160,  160,
-
-      160,  160,  166,  160,  160,  160,  160,  160,  160,  160,
-      160,  173,  160,  166,  160,  160,  160,  160,  160,  160,
-      173,  160,  173,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  174,  160,  160,  160,  174,  160,  174,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,    0,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160
+       93,    1,    1,    1,    1,    5,   93,    7,    1,    1,
+       93,   93,   93,   93,   94,   95,   93,   96,   17,   97,
+       96,   93,   98,   99,   93,   93,   93,   94,   93,   94,
+      100,   93,  101,  102,   93,   93,   93,   96,   93,   93,
+       93,   96,   98,   99,   93,  103,  100,  104,  101,  101,
+      102,   93,   93,   93,   93,   93,  103,  104,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,  105,   93,  105,   93,  105,
+       93,   93,    0,   93,   93,   93,   93,   93,   93,   93,
+
+       93,   93,   93,   93,   93
     } ;
 
-static yyconst flex_int16_t yy_nxt[441] =
+static yyconst flex_int16_t yy_nxt[281] =
     {   0,
-       12,   13,   14,   15,   16,   12,   17,   18,   12,   12,
-       12,   19,   12,   12,   12,   12,   20,   21,   22,   23,
-       23,   23,   23,   23,   12,   12,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   12,   24,   12,   25,   34,   35,   35,   25,
-       81,   26,   26,   27,   27,   27,   34,   35,   35,   82,
-       28,   36,   36,   36,   36,  159,   29,   28,   28,   28,
-       28,   12,   13,   14,   15,   16,   30,   17,   18,   30,
-       30,   30,   26,   30,   30,   30,   12,   20,   21,   22,
-       31,   31,   31,   31,   31,   32,   12,   31,   31,   31,
-
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   12,   24,   12,   39,   41,   45,   47,
-       53,   54,   48,   56,   57,   61,   61,   47,   66,   45,
-       48,   66,   66,   66,   39,   46,   40,   49,   59,   50,
-      158,   51,  122,   52,  157,   49,   46,   50,  136,   63,
-      137,   52,  156,   43,   40,   62,   65,   65,   65,   59,
-       61,   61,  123,   65,   75,   69,   69,   69,   36,   36,
-       65,   65,   65,   65,   70,   71,   72,   69,   69,   69,
-       45,   46,   61,   61,  109,   77,   70,   71,   93,  110,
-       68,   70,   71,   85,   85,   85,   66,   46,  155,   66,
-
-       66,   66,   69,   69,   69,  122,   59,  100,  100,   61,
-       61,   70,   71,  100,  100,  148,  112,  154,   85,   85,
-       85,   61,   61,  129,  129,  123,  129,  129,  135,  135,
-      135,  142,  142,  148,  143,  149,  153,  135,  135,  135,
-      142,  142,  160,  143,  152,  151,  150,  146,  145,  144,
-      141,  140,  139,  149,   38,   38,   38,   38,   38,   38,
-       38,   38,   42,  138,  134,  133,   42,   42,   44,   44,
-       44,   44,   44,   44,   44,   44,   58,   58,   58,   58,
-       64,  132,   64,   66,  131,  130,   66,  160,   66,   66,
-       67,  128,  127,   67,   67,   67,   67,   73,  126,   73,
-
-       73,   76,   76,   76,   76,   76,   76,   76,   76,   78,
-       78,   78,   78,   78,   78,   78,   78,   91,  125,   91,
-       92,  124,   92,   92,  120,   92,   92,  121,  121,  121,
-      121,  121,  121,  121,  121,  147,  147,  147,  147,  147,
-      147,  147,  147,  119,  118,  117,  116,  115,   47,  114,
-      110,  113,  111,  108,  107,  106,   48,  105,  104,   89,
-      103,  102,  101,   99,   98,   97,   96,   95,   94,   79,
-       77,   90,   89,   88,   59,   87,   86,   59,   84,   83,
-       80,   79,   77,   74,  160,   60,   59,   55,   37,  160,
-       33,   25,   26,   25,   11,  160,  160,  160,  160,  160,
-
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160
+       12,   13,   14,   15,   12,   16,   12,   12,   17,   12,
+       12,   12,   12,   18,   18,   18,   12,   12,   18,   18,
+       18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
+       18,   12,   12,   19,   20,   20,   20,   92,   21,   25,
+       26,   26,   22,   21,   21,   21,   21,   12,   13,   14,
+       15,   23,   16,   23,   23,   19,   23,   23,   23,   12,
+       24,   24,   24,   12,   12,   24,   24,   24,   24,   24,
+       24,   24,   24,   24,   24,   24,   24,   24,   12,   12,
+       25,   26,   26,   27,   27,   27,   27,   29,   43,   29,
+       43,   43,   45,   45,   45,   50,   39,   59,   46,   93,
+
+       30,   33,   30,   34,   45,   45,   45,   27,   27,   68,
+       43,   91,   43,   43,   69,   35,   87,   36,   39,   37,
+       42,   42,   42,   39,   42,   45,   45,   45,   89,   42,
+       42,   42,   42,   85,   85,   86,   85,   85,   86,   89,
+       84,   90,   83,   82,   81,   80,   79,   78,   77,   76,
+       75,   74,   90,   28,   28,   28,   28,   28,   28,   28,
+       28,   31,   31,   31,   38,   38,   38,   38,   41,   73,
+       41,   43,   72,   43,   71,   43,   43,   44,   33,   44,
+       44,   44,   44,   47,   69,   47,   47,   49,   49,   49,
+       49,   49,   49,   49,   49,   51,   51,   51,   51,   51,
+
+       51,   51,   51,   57,   70,   57,   58,   58,   58,   67,
+       58,   58,   88,   88,   88,   88,   88,   88,   88,   88,
+       34,   66,   65,   64,   63,   62,   61,   60,   52,   50,
+       39,   56,   39,   55,   54,   53,   52,   50,   48,   93,
+       40,   39,   32,   93,   19,   19,   11,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93
     } ;
 
-static yyconst flex_int16_t yy_chk[441] =
+static yyconst flex_int16_t yy_chk[281] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    4,    9,    9,    9,   10,
-       50,    4,    5,    5,    5,    5,   10,   10,   10,   50,
-        5,   13,   13,   14,   14,  158,    5,    5,    5,    5,
-        5,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        1,    1,    1,    5,    5,    5,    5,   91,    5,    9,
+        9,    9,    5,    5,    5,    5,    5,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-        7,    7,    7,    7,    7,    7,   16,   17,   18,   19,
-       20,   20,   19,   22,   22,   25,   25,   26,   31,   44,
-       26,   31,   31,   31,   38,   18,   16,   19,   31,   19,
-      157,   19,  112,   19,  156,   26,   44,   26,  130,   26,
-      130,   26,  155,   17,   38,   25,   28,   28,   28,   28,
-       33,   33,  112,   28,   46,   34,   34,   34,   36,   36,
-       28,   28,   28,   28,   34,   34,   34,   35,   35,   35,
-       75,   46,   61,   61,   98,   77,   35,   35,   77,   98,
-       33,   91,   91,   61,   61,   61,   67,   75,  152,   67,
-
-       67,   67,   69,   69,   69,  121,   67,   85,   85,  113,
-      113,   69,   69,  100,  100,  143,  100,  151,   85,   85,
-       85,  114,  114,  122,  122,  121,  129,  129,  135,  135,
-      135,  138,  138,  147,  138,  143,  150,  129,  129,  129,
-      142,  142,  149,  142,  146,  145,  144,  141,  140,  139,
-      137,  136,  134,  147,  161,  161,  161,  161,  161,  161,
-      161,  161,  162,  133,  128,  127,  162,  162,  163,  163,
-      163,  163,  163,  163,  163,  163,  164,  164,  164,  164,
-      165,  126,  165,  166,  125,  124,  166,  123,  166,  166,
-      167,  120,  119,  167,  167,  167,  167,  168,  118,  168,
-
-      168,  169,  169,  169,  169,  169,  169,  169,  169,  170,
-      170,  170,  170,  170,  170,  170,  170,  171,  117,  171,
-      172,  116,  172,  172,  111,  172,  172,  173,  173,  173,
-      173,  173,  173,  173,  173,  174,  174,  174,  174,  174,
-      174,  174,  174,  110,  109,  108,  107,  106,  105,  103,
-      102,  101,   99,   97,   96,   95,   94,   93,   92,   90,
-       88,   87,   86,   84,   83,   82,   81,   80,   79,   78,
-       76,   71,   70,   68,   65,   63,   62,   58,   52,   51,
-       49,   48,   47,   43,   40,   24,   23,   21,   15,   11,
-        8,    6,    3,    2,  160,  160,  160,  160,  160,  160,
-
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160
+       10,   10,   10,   13,   13,   14,   14,   15,   24,   28,
+       24,   24,   25,   25,   25,   50,   24,   50,   25,   90,
+
+       15,   17,   28,   17,   26,   26,   26,   27,   27,   62,
+       44,   87,   44,   44,   62,   17,   84,   17,   44,   17,
+       21,   21,   21,   21,   21,   45,   45,   45,   86,   21,
+       21,   21,   21,   83,   83,   83,   85,   85,   85,   88,
+       82,   86,   81,   78,   77,   76,   75,   74,   73,   72,
+       71,   70,   88,   94,   94,   94,   94,   94,   94,   94,
+       94,   95,   95,   95,   96,   96,   96,   96,   97,   69,
+       97,   98,   68,   98,   67,   98,   98,   99,   66,   99,
+       99,   99,   99,  100,   64,  100,  100,  101,  101,  101,
+      101,  101,  101,  101,  101,  102,  102,  102,  102,  102,
+
+      102,  102,  102,  103,   63,  103,  104,  104,  104,   61,
+      104,  104,  105,  105,  105,  105,  105,  105,  105,  105,
+       60,   59,   58,   56,   55,   54,   53,   52,   51,   49,
+       42,   40,   38,   37,   36,   35,   34,   33,   32,   30,
+       19,   18,   16,   11,    4,    3,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -607,7 +540,6 @@ int yy_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "dtc-lexer.l"
 /*
  * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
  *
@@ -629,10 +561,6 @@ char *yytext;
  */
 #define YY_NO_INPUT 1
 
-
-
-
-#line 38 "dtc-lexer.l"
 #include "dtc.h"
 #include "srcpos.h"
 #include "dtc-parser.tab.h"
@@ -660,7 +588,6 @@ static int dts_version = 1;
 
 static void push_input_file(const char *filename);
 static int pop_input_file(void);
-#line 664 "dtc-lexer.lex.c"
 
 #define INITIAL 0
 #define INCLUDE 1
@@ -743,12 +670,7 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -767,7 +689,7 @@ static int input (void );
         if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                 { \
                 int c = '*'; \
-                size_t n; \
+                unsigned n; \
                 for ( n = 0; n < max_size && \
                              (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
                         buf[n] = (char) c; \
@@ -839,9 +761,6 @@ extern int yylex (void);
 #endif
 
 #define YY_RULE_SETUP \
-        if ( yyleng > 0 ) \
-                YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
-                                (yytext[yyleng - 1] == '\n'); \
         YY_USER_ACTION
 
 /** The main scanner function which does all the work.
@@ -852,10 +771,6 @@ YY_DECL
         register char *yy_cp, *yy_bp;
         register int yy_act;
     
-#line 67 "dtc-lexer.l"
-
-#line 858 "dtc-lexer.lex.c"
-
         if ( !(yy_init) )
                 {
                 (yy_init) = 1;
@@ -895,7 +810,6 @@ YY_DECL
                 yy_bp = yy_cp;
 
                 yy_current_state = (yy_start);
-                yy_current_state += YY_AT_BOL();
 yy_match:
                 do
                         {
@@ -908,13 +822,13 @@ yy_match:
                         while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                 {
                                 yy_current_state = (int) yy_def[yy_current_state];
-                                if ( yy_current_state >= 161 )
+                                if ( yy_current_state >= 94 )
                                         yy_c = yy_meta[(unsigned int) yy_c];
                                 }
                         yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                         ++yy_cp;
                         }
-                while ( yy_current_state != 160 );
+                while ( yy_current_state != 93 );
                 yy_cp = (yy_last_accepting_cpos);
                 yy_current_state = (yy_last_accepting_state);
 
@@ -937,54 +851,26 @@ do_action:	/* This label is used only to access EOF actions. */
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 68 "dtc-lexer.l"
 {
                         char *name = strchr(yytext, '\"') + 1;
                         yytext[yyleng-1] = '\0';
                         push_input_file(name);
                 }
         YY_BREAK
-case 2:
-/* rule 2 can match eol */
-YY_RULE_SETUP
-#line 74 "dtc-lexer.l"
-{
-                        char *line, *tmp, *fn;
-                        /* skip text before line # */
-                        line = yytext;
-                        while (!isdigit(*line))
-                                line++;
-                        /* skip digits in line # */
-                        tmp = line;
-                        while (!isspace(*tmp))
-                                tmp++;
-                        /* "NULL"-terminate line # */
-                        *tmp = '\0';
-                        /* start of filename */
-                        fn = strchr(tmp + 1, '"') + 1;
-                        /* strip trailing " from filename */
-                        tmp = strchr(fn, '"');
-                        *tmp = 0;
-                        /* -1 since #line is the number of the next line */
-                        srcpos_set_line(xstrdup(fn), atoi(line) - 1);
-                }
-        YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(INCLUDE):
 case YY_STATE_EOF(BYTESTRING):
 case YY_STATE_EOF(PROPNODENAME):
 case YY_STATE_EOF(V1):
-#line 95 "dtc-lexer.l"
 {
                         if (!pop_input_file()) {
                                 yyterminate();
                         }
                 }
         YY_BREAK
-case 3:
-/* rule 3 can match eol */
+case 2:
+/* rule 2 can match eol */
 YY_RULE_SETUP
-#line 101 "dtc-lexer.l"
 {
                         DPRINT("String: %s\n", yytext);
                         yylval.data = data_copy_escape_string(yytext+1,
@@ -992,9 +878,8 @@ YY_RULE_SETUP
                         return DT_STRING;
                 }
         YY_BREAK
-case 4:
+case 3:
 YY_RULE_SETUP
-#line 108 "dtc-lexer.l"
 {
                         DPRINT("Keyword: /dts-v1/\n");
                         dts_version = 1;
@@ -1002,47 +887,16 @@ YY_RULE_SETUP
                         return DT_V1;
                 }
         YY_BREAK
-case 5:
+case 4:
 YY_RULE_SETUP
-#line 115 "dtc-lexer.l"
 {
                         DPRINT("Keyword: /memreserve/\n");
                         BEGIN_DEFAULT();
                         return DT_MEMRESERVE;
                 }
         YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 121 "dtc-lexer.l"
-{
-                        DPRINT("Keyword: /bits/\n");
-                        BEGIN_DEFAULT();
-                        return DT_BITS;
-                }
-        YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 127 "dtc-lexer.l"
-{
-                        DPRINT("Keyword: /delete-property/\n");
-                        DPRINT("<PROPNODENAME>\n");
-                        BEGIN(PROPNODENAME);
-                        return DT_DEL_PROP;
-                }
-        YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 134 "dtc-lexer.l"
-{
-                        DPRINT("Keyword: /delete-node/\n");
-                        DPRINT("<PROPNODENAME>\n");
-                        BEGIN(PROPNODENAME);
-                        return DT_DEL_NODE;
-                }
-        YY_BREAK
-case 9:
+case 5:
 YY_RULE_SETUP
-#line 141 "dtc-lexer.l"
 {
                         DPRINT("Label: %s\n", yytext);
                         yylval.labelref = xstrdup(yytext);
@@ -1050,38 +904,24 @@ YY_RULE_SETUP
                         return DT_LABEL;
                 }
         YY_BREAK
-case 10:
+case 6:
 YY_RULE_SETUP
-#line 148 "dtc-lexer.l"
 {
                         yylval.literal = xstrdup(yytext);
                         DPRINT("Literal: '%s'\n", yylval.literal);
                         return DT_LITERAL;
                 }
         YY_BREAK
-case 11:
-/* rule 11 can match eol */
-YY_RULE_SETUP
-#line 154 "dtc-lexer.l"
-{
-                        yytext[yyleng-1] = '\0';
-                        yylval.literal = xstrdup(yytext+1);
-                        DPRINT("Character literal: %s\n", yylval.literal);
-                        return DT_CHAR_LITERAL;
-                }
-        YY_BREAK
-case 12:
+case 7:
 YY_RULE_SETUP
-#line 161 "dtc-lexer.l"
 {       /* label reference */
                         DPRINT("Ref: %s\n", yytext+1);
                         yylval.labelref = xstrdup(yytext+1);
                         return DT_REF;
                 }
         YY_BREAK
-case 13:
+case 8:
 YY_RULE_SETUP
-#line 167 "dtc-lexer.l"
 {       /* new-style path reference */
                         yytext[yyleng-1] = '\0';
                         DPRINT("Ref: %s\n", yytext+2);
@@ -1089,104 +929,55 @@ YY_RULE_SETUP
                         return DT_REF;
                 }
         YY_BREAK
-case 14:
+case 9:
 YY_RULE_SETUP
-#line 174 "dtc-lexer.l"
 {
                         yylval.byte = strtol(yytext, NULL, 16);
                         DPRINT("Byte: %02x\n", (int)yylval.byte);
                         return DT_BYTE;
                 }
         YY_BREAK
-case 15:
+case 10:
 YY_RULE_SETUP
-#line 180 "dtc-lexer.l"
 {
                         DPRINT("/BYTESTRING\n");
                         BEGIN_DEFAULT();
                         return ']';
                 }
         YY_BREAK
-case 16:
+case 11:
 YY_RULE_SETUP
-#line 186 "dtc-lexer.l"
 {
                         DPRINT("PropNodeName: %s\n", yytext);
-                        yylval.propnodename = xstrdup((yytext[0] == '\\') ?
-                                                        yytext + 1 : yytext);
+                        yylval.propnodename = xstrdup(yytext);
                         BEGIN_DEFAULT();
                         return DT_PROPNODENAME;
                 }
         YY_BREAK
-case 17:
+case 12:
 YY_RULE_SETUP
-#line 194 "dtc-lexer.l"
 {
                         DPRINT("Binary Include\n");
                         return DT_INCBIN;
                 }
         YY_BREAK
-case 18:
-/* rule 18 can match eol */
+case 13:
+/* rule 13 can match eol */
 YY_RULE_SETUP
-#line 199 "dtc-lexer.l"
 /* eat whitespace */
         YY_BREAK
-case 19:
-/* rule 19 can match eol */
+case 14:
+/* rule 14 can match eol */
 YY_RULE_SETUP
-#line 200 "dtc-lexer.l"
 /* eat C-style comments */
         YY_BREAK
-case 20:
-/* rule 20 can match eol */
+case 15:
+/* rule 15 can match eol */
 YY_RULE_SETUP
-#line 201 "dtc-lexer.l"
 /* eat C++-style comments */
         YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 203 "dtc-lexer.l"
-{ return DT_LSHIFT; };
-        YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 204 "dtc-lexer.l"
-{ return DT_RSHIFT; };
-        YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 205 "dtc-lexer.l"
-{ return DT_LE; };
-        YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 206 "dtc-lexer.l"
-{ return DT_GE; };
-        YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 207 "dtc-lexer.l"
-{ return DT_EQ; };
-        YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 208 "dtc-lexer.l"
-{ return DT_NE; };
-        YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 209 "dtc-lexer.l"
-{ return DT_AND; };
-        YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 210 "dtc-lexer.l"
-{ return DT_OR; };
-        YY_BREAK
-case 29:
+case 16:
 YY_RULE_SETUP
-#line 212 "dtc-lexer.l"
 {
                         DPRINT("Char: %c (\\x%02x)\n", yytext[0],
                                 (unsigned)yytext[0]);
@@ -1202,12 +993,10 @@ YY_RULE_SETUP
                         return yytext[0];
                 }
         YY_BREAK
-case 30:
+case 17:
 YY_RULE_SETUP
-#line 227 "dtc-lexer.l"
 ECHO;
         YY_BREAK
-#line 1211 "dtc-lexer.lex.c"
 
         case YY_END_OF_BUFFER:
                 {
@@ -1486,7 +1275,6 @@ static int yy_get_next_buffer (void)
         register char *yy_cp;
     
         yy_current_state = (yy_start);
-        yy_current_state += YY_AT_BOL();
 
         for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
                 {
@@ -1499,7 +1287,7 @@ static int yy_get_next_buffer (void)
                 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                         {
                         yy_current_state = (int) yy_def[yy_current_state];
-                        if ( yy_current_state >= 161 )
+                        if ( yy_current_state >= 94 )
                                 yy_c = yy_meta[(unsigned int) yy_c];
                         }
                 yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1527,11 +1315,11 @@ static int yy_get_next_buffer (void)
         while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                 {
                 yy_current_state = (int) yy_def[yy_current_state];
-                if ( yy_current_state >= 161 )
+                if ( yy_current_state >= 94 )
                         yy_c = yy_meta[(unsigned int) yy_c];
                 }
         yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-        yy_is_jam = (yy_current_state == 160);
+        yy_is_jam = (yy_current_state == 93);
 
         return yy_is_jam ? 0 : yy_current_state;
 }
@@ -1606,8 +1394,6 @@ static int yy_get_next_buffer (void)
         *(yy_c_buf_p) = '\0';   /* preserve yytext */
         (yy_hold_char) = *++(yy_c_buf_p);
 
-        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
-
         return c;
 }
 #endif  /* ifndef YY_NO_INPUT */
@@ -1926,8 +1712,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
@@ -2166,10 +1952,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 227 "dtc-lexer.l"
-
-
-
 static void push_input_file(const char *filename)
 {
         assert(filename);
@@ -2181,7 +1963,6 @@ static void push_input_file(const char *filename)
         yypush_buffer_state(yy_create_buffer(yyin,YY_BUF_SIZE));
 }
 
-
 static int pop_input_file(void)
 {
         if (srcfile_pop() == 0)
diff --git a/scripts/dtc/dtc-parser.tab.c_shipped b/scripts/dtc/dtc-parser.tab.c_shipped
index 4af55900a15..b05921e1e84 100644
--- a/scripts/dtc/dtc-parser.tab.c_shipped
+++ b/scripts/dtc/dtc-parser.tab.c_shipped
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 Free Software Foundation, Inc.
    
    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
@@ -46,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -67,8 +66,6 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 189 of yacc.c  */
-#line 21 "dtc-parser.y"
 
 #include <stdio.h>
 
@@ -85,15 +82,12 @@ extern struct boot_info *the_boot_info;
 extern int treesource_error;
 
 static unsigned long long eval_literal(const char *s, int base, int bits);
-static unsigned char eval_char_literal(const char *s);
 
 
-/* Line 189 of yacc.c  */
-#line 93 "dtc-parser.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+# define YYDEBUG 1
 #endif
 
 /* Enabling verbose error messages.  */
@@ -118,26 +112,14 @@ static unsigned char eval_char_literal(const char *s);
    enum yytokentype {
      DT_V1 = 258,
      DT_MEMRESERVE = 259,
-     DT_LSHIFT = 260,
-     DT_RSHIFT = 261,
-     DT_LE = 262,
-     DT_GE = 263,
-     DT_EQ = 264,
-     DT_NE = 265,
-     DT_AND = 266,
-     DT_OR = 267,
-     DT_BITS = 268,
-     DT_DEL_PROP = 269,
-     DT_DEL_NODE = 270,
-     DT_PROPNODENAME = 271,
-     DT_LITERAL = 272,
-     DT_CHAR_LITERAL = 273,
-     DT_BASE = 274,
-     DT_BYTE = 275,
-     DT_STRING = 276,
-     DT_LABEL = 277,
-     DT_REF = 278,
-     DT_INCBIN = 279
+     DT_PROPNODENAME = 260,
+     DT_LITERAL = 261,
+     DT_BASE = 262,
+     DT_BYTE = 263,
+     DT_STRING = 264,
+     DT_LABEL = 265,
+     DT_REF = 266,
+     DT_INCBIN = 267
    };
 #endif
 
@@ -147,8 +129,6 @@ static unsigned char eval_char_literal(const char *s);
 typedef union YYSTYPE
 {
 
-/* Line 214 of yacc.c  */
-#line 40 "dtc-parser.y"
 
         char *propnodename;
         char *literal;
@@ -157,22 +137,16 @@ typedef union YYSTYPE
         uint8_t byte;
         struct data data;
 
-        struct {
-                struct data     data;
-                int             bits;
-        } array;
-
+        uint64_t addr;
+        cell_t cell;
         struct property *prop;
         struct property *proplist;
         struct node *node;
         struct node *nodelist;
         struct reserve_info *re;
-        uint64_t integer;
 
 
 
-/* Line 214 of yacc.c  */
-#line 176 "dtc-parser.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -183,8 +157,6 @@ typedef union YYSTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 188 "dtc-parser.tab.c"
 
 #ifdef short
 # undef short
@@ -234,7 +206,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -399,20 +371,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   133
+#define YYLAST   56
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  48
+#define YYNTOKENS  25
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  28
+#define YYNNTS  16
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  79
+#define YYNRULES  39
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  141
+#define YYNSTATES  67
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   279
+#define YYMAXUTOK   267
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -423,16 +395,16 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    47,     2,     2,     2,    45,    41,     2,
-      33,    35,    44,    42,    34,    43,     2,    26,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    38,    25,
-      36,    29,    30,    37,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+      22,    24,     2,     2,    23,     2,     2,    14,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,    13,
+      18,    17,    19,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    31,     2,    32,    40,     2,     2,     2,     2,     2,
+       2,    20,     2,    21,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    27,    39,    28,    46,     2,     2,     2,
+       2,     2,     2,    15,     2,    16,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -446,68 +418,45 @@ static const yytype_uint8 yytranslate[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24
+       5,     6,     7,     8,     9,    10,    11,    12
 };
 
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const yytype_uint16 yyprhs[] =
+static const yytype_uint8 yyprhs[] =
 {
-       0,     0,     3,     8,     9,    12,    17,    20,    23,    27,
-      31,    36,    42,    43,    46,    51,    54,    58,    61,    64,
-      68,    73,    76,    86,    92,    95,    96,    99,   102,   106,
-     108,   111,   114,   117,   119,   121,   125,   127,   129,   135,
-     137,   141,   143,   147,   149,   153,   155,   159,   161,   165,
-     167,   171,   175,   177,   181,   185,   189,   193,   197,   201,
-     203,   207,   211,   213,   217,   221,   225,   227,   229,   232,
-     235,   238,   239,   242,   245,   246,   249,   252,   255,   259
+       0,     0,     3,     8,     9,    12,    17,    20,    22,    25,
+      29,    33,    39,    40,    43,    48,    51,    54,    57,    62,
+      67,    70,    80,    86,    89,    90,    93,    96,    97,   100,
+     103,   106,   108,   109,   112,   115,   116,   119,   122,   125
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      49,     0,    -1,     3,    25,    50,    52,    -1,    -1,    51,
-      50,    -1,     4,    59,    59,    25,    -1,    22,    51,    -1,
-      26,    53,    -1,    52,    26,    53,    -1,    52,    23,    53,
-      -1,    52,    15,    23,    25,    -1,    27,    54,    74,    28,
-      25,    -1,    -1,    54,    55,    -1,    16,    29,    56,    25,
-      -1,    16,    25,    -1,    14,    16,    25,    -1,    22,    55,
-      -1,    57,    21,    -1,    57,    58,    30,    -1,    57,    31,
-      73,    32,    -1,    57,    23,    -1,    57,    24,    33,    21,
-      34,    59,    34,    59,    35,    -1,    57,    24,    33,    21,
-      35,    -1,    56,    22,    -1,    -1,    56,    34,    -1,    57,
-      22,    -1,    13,    17,    36,    -1,    36,    -1,    58,    59,
-      -1,    58,    23,    -1,    58,    22,    -1,    17,    -1,    18,
-      -1,    33,    60,    35,    -1,    61,    -1,    62,    -1,    62,
-      37,    60,    38,    61,    -1,    63,    -1,    62,    12,    63,
-      -1,    64,    -1,    63,    11,    64,    -1,    65,    -1,    64,
-      39,    65,    -1,    66,    -1,    65,    40,    66,    -1,    67,
-      -1,    66,    41,    67,    -1,    68,    -1,    67,     9,    68,
-      -1,    67,    10,    68,    -1,    69,    -1,    68,    36,    69,
-      -1,    68,    30,    69,    -1,    68,     7,    69,    -1,    68,
-       8,    69,    -1,    69,     5,    70,    -1,    69,     6,    70,
-      -1,    70,    -1,    70,    42,    71,    -1,    70,    43,    71,
-      -1,    71,    -1,    71,    44,    72,    -1,    71,    26,    72,
-      -1,    71,    45,    72,    -1,    72,    -1,    59,    -1,    43,
-      72,    -1,    46,    72,    -1,    47,    72,    -1,    -1,    73,
-      20,    -1,    73,    22,    -1,    -1,    75,    74,    -1,    75,
-      55,    -1,    16,    53,    -1,    15,    16,    25,    -1,    22,
-      75,    -1
+      26,     0,    -1,     3,    13,    27,    30,    -1,    -1,    28,
+      27,    -1,     4,    29,    29,    13,    -1,    10,    28,    -1,
+       6,    -1,    14,    31,    -1,    30,    14,    31,    -1,    30,
+      11,    31,    -1,    15,    32,    39,    16,    13,    -1,    -1,
+      32,    33,    -1,     5,    17,    34,    13,    -1,     5,    13,
+      -1,    10,    33,    -1,    35,     9,    -1,    35,    18,    36,
+      19,    -1,    35,    20,    38,    21,    -1,    35,    11,    -1,
+      35,    12,    22,     9,    23,    29,    23,    29,    24,    -1,
+      35,    12,    22,     9,    24,    -1,    34,    10,    -1,    -1,
+      34,    23,    -1,    35,    10,    -1,    -1,    36,    37,    -1,
+      36,    11,    -1,    36,    10,    -1,     6,    -1,    -1,    38,
+       8,    -1,    38,    10,    -1,    -1,    40,    39,    -1,    40,
+      33,    -1,     5,    31,    -1,    10,    40,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   109,   109,   118,   121,   128,   132,   140,   144,   148,
-     158,   172,   180,   183,   190,   194,   198,   202,   210,   214,
-     218,   222,   226,   243,   253,   261,   264,   268,   275,   290,
-     295,   315,   329,   336,   340,   344,   351,   355,   356,   360,
-     361,   365,   366,   370,   371,   375,   376,   380,   381,   385,
-     386,   387,   391,   392,   393,   394,   395,   399,   400,   401,
-     405,   406,   407,   411,   412,   413,   414,   418,   419,   420,
-     421,   426,   429,   433,   441,   444,   448,   456,   460,   464
+       0,    86,    86,    95,    98,   105,   109,   117,   124,   128,
+     132,   145,   153,   156,   163,   167,   171,   179,   183,   187,
+     191,   195,   212,   222,   230,   233,   237,   245,   248,   252,
+     257,   264,   272,   275,   279,   287,   290,   294,   302,   306
 };
 #endif
 
@@ -516,19 +465,13 @@ static const yytype_uint16 yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "DT_V1", "DT_MEMRESERVE", "DT_LSHIFT",
-  "DT_RSHIFT", "DT_LE", "DT_GE", "DT_EQ", "DT_NE", "DT_AND", "DT_OR",
-  "DT_BITS", "DT_DEL_PROP", "DT_DEL_NODE", "DT_PROPNODENAME", "DT_LITERAL",
-  "DT_CHAR_LITERAL", "DT_BASE", "DT_BYTE", "DT_STRING", "DT_LABEL",
-  "DT_REF", "DT_INCBIN", "';'", "'/'", "'{'", "'}'", "'='", "'>'", "'['",
-  "']'", "'('", "','", "')'", "'<'", "'?'", "':'", "'|'", "'^'", "'&'",
-  "'+'", "'-'", "'*'", "'%'", "'~'", "'!'", "$accept", "sourcefile",
-  "memreserves", "memreserve", "devicetree", "nodedef", "proplist",
-  "propdef", "propdata", "propdataprefix", "arrayprefix", "integer_prim",
-  "integer_expr", "integer_trinary", "integer_or", "integer_and",
-  "integer_bitor", "integer_bitxor", "integer_bitand", "integer_eq",
-  "integer_rela", "integer_shift", "integer_add", "integer_mul",
-  "integer_unary", "bytestring", "subnodes", "subnode", 0
+  "$end", "error", "$undefined", "DT_V1", "DT_MEMRESERVE",
+  "DT_PROPNODENAME", "DT_LITERAL", "DT_BASE", "DT_BYTE", "DT_STRING",
+  "DT_LABEL", "DT_REF", "DT_INCBIN", "';'", "'/'", "'{'", "'}'", "'='",
+  "'<'", "'>'", "'['", "']'", "'('", "','", "')'", "$accept", "sourcefile",
+  "memreserves", "memreserve", "addr", "devicetree", "nodedef", "proplist",
+  "propdef", "propdata", "propdataprefix", "celllist", "cellval",
+  "bytestring", "subnodes", "subnode", 0
 };
 #endif
 
@@ -538,37 +481,27 @@ static const char *const yytname[] =
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,    59,    47,   123,   125,    61,
-      62,    91,    93,    40,    44,    41,    60,    63,    58,   124,
-      94,    38,    43,    45,    42,    37,   126,    33
+     265,   266,   267,    59,    47,   123,   125,    61,    60,    62,
+      91,    93,    40,    44,    41
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    48,    49,    50,    50,    51,    51,    52,    52,    52,
-      52,    53,    54,    54,    55,    55,    55,    55,    56,    56,
-      56,    56,    56,    56,    56,    57,    57,    57,    58,    58,
-      58,    58,    58,    59,    59,    59,    60,    61,    61,    62,
-      62,    63,    63,    64,    64,    65,    65,    66,    66,    67,
-      67,    67,    68,    68,    68,    68,    68,    69,    69,    69,
-      70,    70,    70,    71,    71,    71,    71,    72,    72,    72,
-      72,    73,    73,    73,    74,    74,    74,    75,    75,    75
+       0,    25,    26,    27,    27,    28,    28,    29,    30,    30,
+      30,    31,    32,    32,    33,    33,    33,    34,    34,    34,
+      34,    34,    34,    34,    35,    35,    35,    36,    36,    36,
+      36,    37,    38,    38,    38,    39,    39,    39,    40,    40
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
-       0,     2,     4,     0,     2,     4,     2,     2,     3,     3,
-       4,     5,     0,     2,     4,     2,     3,     2,     2,     3,
-       4,     2,     9,     5,     2,     0,     2,     2,     3,     1,
-       2,     2,     2,     1,     1,     3,     1,     1,     5,     1,
-       3,     1,     3,     1,     3,     1,     3,     1,     3,     1,
-       3,     3,     1,     3,     3,     3,     3,     3,     3,     1,
-       3,     3,     1,     3,     3,     3,     1,     1,     2,     2,
-       2,     0,     2,     2,     0,     2,     2,     2,     3,     2
+       0,     2,     4,     0,     2,     4,     2,     1,     2,     3,
+       3,     5,     0,     2,     4,     2,     2,     2,     4,     4,
+       2,     9,     5,     2,     0,     2,     2,     0,     2,     2,
+       2,     1,     0,     2,     2,     0,     2,     2,     2,     2
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -576,59 +509,41 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       0,     0,     0,     3,     1,     0,     0,     0,     3,    33,
-      34,     0,     0,     6,     0,     2,     4,     0,     0,     0,
-      67,     0,    36,    37,    39,    41,    43,    45,    47,    49,
-      52,    59,    62,    66,     0,    12,     7,     0,     0,     0,
-      68,    69,    70,    35,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     5,    74,     0,     9,     8,    40,     0,
-      42,    44,    46,    48,    50,    51,    55,    56,    54,    53,
-      57,    58,    60,    61,    64,    63,    65,     0,     0,     0,
-       0,    13,     0,    74,    10,     0,     0,     0,    15,    25,
-      77,    17,    79,     0,    76,    75,    38,    16,    78,     0,
-       0,    11,    24,    14,    26,     0,    18,    27,    21,     0,
-      71,    29,     0,     0,     0,     0,    32,    31,    19,    30,
-      28,     0,    72,    73,    20,     0,    23,     0,     0,     0,
-      22
+       0,     0,     0,     3,     1,     0,     0,     0,     3,     7,
+       0,     6,     0,     2,     4,     0,    12,     8,     0,     0,
+       5,    35,    10,     9,     0,     0,    13,     0,    35,    15,
+      24,    38,    16,    39,     0,    37,    36,     0,     0,    11,
+      23,    14,    25,    17,    26,    20,     0,    27,    32,     0,
+       0,     0,     0,    31,    30,    29,    18,    28,    33,    34,
+      19,     0,    22,     0,     0,     0,    21
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,     2,     7,     8,    15,    36,    64,    91,   109,   110,
-     122,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,   125,    92,    93
+      -1,     2,     7,     8,    10,    13,    17,    21,    26,    37,
+      38,    50,    57,    51,    27,    28
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -78
+#define YYPACT_NINF -12
 static const yytype_int8 yypact[] =
 {
-      22,    11,    51,    10,   -78,    23,    10,     2,    10,   -78,
-     -78,    -9,    23,   -78,    30,    38,   -78,    -9,    -9,    -9,
-     -78,    35,   -78,    -6,    52,    29,    48,    49,    33,     3,
-      71,    36,     0,   -78,    64,   -78,   -78,    68,    30,    30,
-     -78,   -78,   -78,   -78,    -9,    -9,    -9,    -9,    -9,    -9,
-      -9,    -9,    -9,    -9,    -9,    -9,    -9,    -9,    -9,    -9,
-      -9,    -9,    -9,   -78,    44,    67,   -78,   -78,    52,    55,
-      29,    48,    49,    33,     3,     3,    71,    71,    71,    71,
-      36,    36,     0,     0,   -78,   -78,   -78,    78,    79,    42,
-      44,   -78,    69,    44,   -78,    -9,    73,    74,   -78,   -78,
-     -78,   -78,   -78,    75,   -78,   -78,   -78,   -78,   -78,    -7,
-      -1,   -78,   -78,   -78,   -78,    84,   -78,   -78,   -78,    63,
-     -78,   -78,    32,    66,    82,    -3,   -78,   -78,   -78,   -78,
-     -78,    46,   -78,   -78,   -78,    23,   -78,    70,    23,    72,
-     -78
+      10,   -11,    18,    -1,   -12,    22,    -1,    15,    -1,   -12,
+      22,   -12,    20,     1,   -12,    17,   -12,   -12,    20,    20,
+     -12,     6,   -12,   -12,    21,     6,   -12,    23,     6,   -12,
+     -12,   -12,   -12,   -12,    28,   -12,   -12,    -6,    13,   -12,
+     -12,   -12,   -12,   -12,   -12,   -12,    24,   -12,   -12,    33,
+      -5,     0,    -4,   -12,   -12,   -12,   -12,   -12,   -12,   -12,
+     -12,    22,   -12,    25,    22,    19,   -12
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -78,   -78,    97,   100,   -78,   -37,   -78,   -77,   -78,   -78,
-     -78,    -5,    65,    13,   -78,    76,    77,    62,    80,    83,
-      34,    20,    26,    28,   -14,   -78,    18,    24
+     -12,   -12,    36,    39,   -10,   -12,     8,   -12,    12,   -12,
+     -12,   -12,   -12,   -12,    27,    31
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -638,59 +553,35 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      12,    66,    67,    40,    41,    42,    44,    34,     9,    10,
-      52,    53,   115,   101,     5,   112,   104,   132,   113,   133,
-     116,   117,   118,   119,    11,     1,    60,   114,    14,   134,
-     120,    45,     6,    54,    17,   121,     3,    18,    19,    55,
-       9,    10,    50,    51,    61,    62,    84,    85,    86,     9,
-      10,     4,   100,    37,   126,   127,    11,    35,    87,    88,
-      89,    38,   128,    46,    39,    11,    90,    98,    47,    35,
-      43,    99,    76,    77,    78,    79,    56,    57,    58,    59,
-     135,   136,    80,    81,    74,    75,    82,    83,    48,    63,
-      49,    65,    94,    95,    96,    97,   124,   103,   107,   108,
-     111,   123,   130,   131,   138,    16,    13,   140,   106,    71,
-      69,   105,     0,     0,   102,     0,     0,   129,     0,     0,
-      68,     0,     0,    70,     0,     0,     0,     0,    72,     0,
-     137,     0,    73,   139
+      15,    53,     3,     5,    40,    54,    55,    41,    58,     6,
+      59,    24,    18,     1,    56,    19,    25,    42,     4,    61,
+      62,    60,    43,    44,    45,    46,    22,    23,     9,    12,
+      20,    47,    31,    48,    29,    16,    16,    32,    30,    34,
+      35,    39,    52,    66,    14,    11,    49,     0,    64,     0,
+       0,    63,     0,     0,    65,    36,    33
 };
 
-static const yytype_int16 yycheck[] =
+static const yytype_int8 yycheck[] =
 {
-       5,    38,    39,    17,    18,    19,    12,    12,    17,    18,
-       7,     8,    13,    90,     4,    22,    93,    20,    25,    22,
-      21,    22,    23,    24,    33,     3,    26,    34,    26,    32,
-      31,    37,    22,    30,    43,    36,    25,    46,    47,    36,
-      17,    18,     9,    10,    44,    45,    60,    61,    62,    17,
-      18,     0,    89,    15,    22,    23,    33,    27,    14,    15,
-      16,    23,    30,    11,    26,    33,    22,    25,    39,    27,
-      35,    29,    52,    53,    54,    55,     5,     6,    42,    43,
-      34,    35,    56,    57,    50,    51,    58,    59,    40,    25,
-      41,    23,    25,    38,    16,    16,    33,    28,    25,    25,
-      25,    17,    36,    21,    34,     8,     6,    35,    95,    47,
-      45,    93,    -1,    -1,    90,    -1,    -1,   122,    -1,    -1,
-      44,    -1,    -1,    46,    -1,    -1,    -1,    -1,    48,    -1,
-     135,    -1,    49,   138
+      10,     6,    13,     4,    10,    10,    11,    13,     8,    10,
+      10,     5,    11,     3,    19,    14,    10,    23,     0,    23,
+      24,    21,     9,    10,    11,    12,    18,    19,     6,    14,
+      13,    18,    24,    20,    13,    15,    15,    25,    17,    16,
+      28,    13,     9,    24,     8,     6,    22,    -1,    23,    -1,
+      -1,    61,    -1,    -1,    64,    28,    25
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,     3,    49,    25,     0,     4,    22,    50,    51,    17,
-      18,    33,    59,    51,    26,    52,    50,    43,    46,    47,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    59,    27,    53,    15,    23,    26,
-      72,    72,    72,    35,    12,    37,    11,    39,    40,    41,
-       9,    10,     7,     8,    30,    36,     5,     6,    42,    43,
-      26,    44,    45,    25,    54,    23,    53,    53,    63,    60,
-      64,    65,    66,    67,    68,    68,    69,    69,    69,    69,
-      70,    70,    71,    71,    72,    72,    72,    14,    15,    16,
-      22,    55,    74,    75,    25,    38,    16,    16,    25,    29,
-      53,    55,    75,    28,    55,    74,    61,    25,    25,    56,
-      57,    25,    22,    25,    34,    13,    21,    22,    23,    24,
-      31,    36,    58,    17,    33,    73,    22,    23,    30,    59,
-      36,    21,    20,    22,    32,    34,    35,    59,    34,    59,
-      35
+       0,     3,    26,    13,     0,     4,    10,    27,    28,     6,
+      29,    28,    14,    30,    27,    29,    15,    31,    11,    14,
+      13,    32,    31,    31,     5,    10,    33,    39,    40,    13,
+      17,    31,    33,    40,    16,    33,    39,    34,    35,    13,
+      10,    13,    23,     9,    10,    11,    12,    18,    20,    22,
+      36,    38,     9,     6,    10,    11,    19,    37,     8,    10,
+      21,    23,    24,    29,    23,    29,    24
 };
 
 #define yyerrok         (yyerrstatus = 0)
@@ -705,9 +596,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL          goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -764,7 +664,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)                  \
      fprintf (File, "%d.%d-%d.%d",                      \
               (Loc).first_line, (Loc).first_column,     \
@@ -1503,8 +1403,6 @@ yyreduce:
     {
         case 2:
 
-/* Line 1455 of yacc.c  */
-#line 110 "dtc-parser.y"
     {
                         the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node),
                                                         guess_boot_cpuid((yyvsp[(4) - (4)].node)));
@@ -1513,8 +1411,6 @@ yyreduce:
 
   case 3:
 
-/* Line 1455 of yacc.c  */
-#line 118 "dtc-parser.y"
     {
                         (yyval.re) = NULL;
                 ;}
@@ -1522,8 +1418,6 @@ yyreduce:
 
   case 4:
 
-/* Line 1455 of yacc.c  */
-#line 122 "dtc-parser.y"
     {
                         (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re));
                 ;}
@@ -1531,17 +1425,13 @@ yyreduce:
 
   case 5:
 
-/* Line 1455 of yacc.c  */
-#line 129 "dtc-parser.y"
     {
-                        (yyval.re) = build_reserve_entry((yyvsp[(2) - (4)].integer), (yyvsp[(3) - (4)].integer));
+                        (yyval.re) = build_reserve_entry((yyvsp[(2) - (4)].addr), (yyvsp[(3) - (4)].addr));
                 ;}
     break;
 
   case 6:
 
-/* Line 1455 of yacc.c  */
-#line 133 "dtc-parser.y"
     {
                         add_label(&(yyvsp[(2) - (2)].re)->labels, (yyvsp[(1) - (2)].labelref));
                         (yyval.re) = (yyvsp[(2) - (2)].re);
@@ -1550,57 +1440,40 @@ yyreduce:
 
   case 7:
 
-/* Line 1455 of yacc.c  */
-#line 141 "dtc-parser.y"
     {
-                        (yyval.node) = name_node((yyvsp[(2) - (2)].node), "");
+                        (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64);
                 ;}
     break;
 
   case 8:
 
-/* Line 1455 of yacc.c  */
-#line 145 "dtc-parser.y"
     {
-                        (yyval.node) = merge_nodes((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
+                        (yyval.node) = name_node((yyvsp[(2) - (2)].node), "");
                 ;}
     break;
 
   case 9:
 
-/* Line 1455 of yacc.c  */
-#line 149 "dtc-parser.y"
     {
-                        struct node *target = get_node_by_ref((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].labelref));
-
-                        if (target)
-                                merge_nodes(target, (yyvsp[(3) - (3)].node));
-                        else
-                                print_error("label or path, '%s', not found", (yyvsp[(2) - (3)].labelref));
-                        (yyval.node) = (yyvsp[(1) - (3)].node);
+                        (yyval.node) = merge_nodes((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
                 ;}
     break;
 
   case 10:
 
-/* Line 1455 of yacc.c  */
-#line 159 "dtc-parser.y"
     {
-                        struct node *target = get_node_by_ref((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].labelref));
+                        struct node *target = get_node_by_ref((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].labelref));
 
-                        if (!target)
-                                print_error("label or path, '%s', not found", (yyvsp[(3) - (4)].labelref));
+                        if (target)
+                                merge_nodes(target, (yyvsp[(3) - (3)].node));
                         else
-                                delete_node(target);
-
-                        (yyval.node) = (yyvsp[(1) - (4)].node);
+                                print_error("label or path, '%s', not found", (yyvsp[(2) - (3)].labelref));
+                        (yyval.node) = (yyvsp[(1) - (3)].node);
                 ;}
     break;
 
   case 11:
 
-/* Line 1455 of yacc.c  */
-#line 173 "dtc-parser.y"
     {
                         (yyval.node) = build_node((yyvsp[(2) - (5)].proplist), (yyvsp[(3) - (5)].nodelist));
                 ;}
@@ -1608,8 +1481,6 @@ yyreduce:
 
   case 12:
 
-/* Line 1455 of yacc.c  */
-#line 180 "dtc-parser.y"
     {
                         (yyval.proplist) = NULL;
                 ;}
@@ -1617,8 +1488,6 @@ yyreduce:
 
   case 13:
 
-/* Line 1455 of yacc.c  */
-#line 184 "dtc-parser.y"
     {
                         (yyval.proplist) = chain_property((yyvsp[(2) - (2)].prop), (yyvsp[(1) - (2)].proplist));
                 ;}
@@ -1626,8 +1495,6 @@ yyreduce:
 
   case 14:
 
-/* Line 1455 of yacc.c  */
-#line 191 "dtc-parser.y"
     {
                         (yyval.prop) = build_property((yyvsp[(1) - (4)].propnodename), (yyvsp[(3) - (4)].data));
                 ;}
@@ -1635,8 +1502,6 @@ yyreduce:
 
   case 15:
 
-/* Line 1455 of yacc.c  */
-#line 195 "dtc-parser.y"
     {
                         (yyval.prop) = build_property((yyvsp[(1) - (2)].propnodename), empty_data);
                 ;}
@@ -1644,85 +1509,62 @@ yyreduce:
 
   case 16:
 
-/* Line 1455 of yacc.c  */
-#line 199 "dtc-parser.y"
-    {
-                        (yyval.prop) = build_property_delete((yyvsp[(2) - (3)].propnodename));
-                ;}
-    break;
-
-  case 17:
-
-/* Line 1455 of yacc.c  */
-#line 203 "dtc-parser.y"
     {
                         add_label(&(yyvsp[(2) - (2)].prop)->labels, (yyvsp[(1) - (2)].labelref));
                         (yyval.prop) = (yyvsp[(2) - (2)].prop);
                 ;}
     break;
 
-  case 18:
+  case 17:
 
-/* Line 1455 of yacc.c  */
-#line 211 "dtc-parser.y"
     {
                         (yyval.data) = data_merge((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].data));
                 ;}
     break;
 
-  case 19:
+  case 18:
 
-/* Line 1455 of yacc.c  */
-#line 215 "dtc-parser.y"
     {
-                        (yyval.data) = data_merge((yyvsp[(1) - (3)].data), (yyvsp[(2) - (3)].array).data);
+                        (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data));
                 ;}
     break;
 
-  case 20:
+  case 19:
 
-/* Line 1455 of yacc.c  */
-#line 219 "dtc-parser.y"
     {
                         (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data));
                 ;}
     break;
 
-  case 21:
+  case 20:
 
-/* Line 1455 of yacc.c  */
-#line 223 "dtc-parser.y"
     {
                         (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), REF_PATH, (yyvsp[(2) - (2)].labelref));
                 ;}
     break;
 
-  case 22:
+  case 21:
 
-/* Line 1455 of yacc.c  */
-#line 227 "dtc-parser.y"
     {
                         FILE *f = srcfile_relative_open((yyvsp[(4) - (9)].data).val, NULL);
                         struct data d;
 
-                        if ((yyvsp[(6) - (9)].integer) != 0)
-                                if (fseek(f, (yyvsp[(6) - (9)].integer), SEEK_SET) != 0)
+                        if ((yyvsp[(6) - (9)].addr) != 0)
+                                if (fseek(f, (yyvsp[(6) - (9)].addr), SEEK_SET) != 0)
                                         print_error("Couldn't seek to offset %llu in \"%s\": %s",
-                                                     (unsigned long long)(yyvsp[(6) - (9)].integer),
+                                                     (unsigned long long)(yyvsp[(6) - (9)].addr),
                                                      (yyvsp[(4) - (9)].data).val,
                                                      strerror(errno));
 
-                        d = data_copy_file(f, (yyvsp[(8) - (9)].integer));
+                        d = data_copy_file(f, (yyvsp[(8) - (9)].addr));
 
                         (yyval.data) = data_merge((yyvsp[(1) - (9)].data), d);
                         fclose(f);
                 ;}
     break;
 
-  case 23:
+  case 22:
 
-/* Line 1455 of yacc.c  */
-#line 244 "dtc-parser.y"
     {
                         FILE *f = srcfile_relative_open((yyvsp[(4) - (5)].data).val, NULL);
                         struct data d = empty_data;
@@ -1734,383 +1576,122 @@ yyreduce:
                 ;}
     break;
 
-  case 24:
+  case 23:
 
-/* Line 1455 of yacc.c  */
-#line 254 "dtc-parser.y"
     {
                         (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
                 ;}
     break;
 
-  case 25:
+  case 24:
 
-/* Line 1455 of yacc.c  */
-#line 261 "dtc-parser.y"
     {
                         (yyval.data) = empty_data;
                 ;}
     break;
 
-  case 26:
+  case 25:
 
-/* Line 1455 of yacc.c  */
-#line 265 "dtc-parser.y"
     {
                         (yyval.data) = (yyvsp[(1) - (2)].data);
                 ;}
     break;
 
-  case 27:
+  case 26:
 
-/* Line 1455 of yacc.c  */
-#line 269 "dtc-parser.y"
     {
                         (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
                 ;}
     break;
 
-  case 28:
-
-/* Line 1455 of yacc.c  */
-#line 276 "dtc-parser.y"
-    {
-                        (yyval.array).data = empty_data;
-                        (yyval.array).bits = eval_literal((yyvsp[(2) - (3)].literal), 0, 7);
-
-                        if (((yyval.array).bits !=  8) &&
-                            ((yyval.array).bits != 16) &&
-                            ((yyval.array).bits != 32) &&
-                            ((yyval.array).bits != 64))
-                        {
-                                print_error("Only 8, 16, 32 and 64-bit elements"
-                                            " are currently supported");
-                                (yyval.array).bits = 32;
-                        }
-                ;}
-    break;
-
-  case 29:
-
-/* Line 1455 of yacc.c  */
-#line 291 "dtc-parser.y"
-    {
-                        (yyval.array).data = empty_data;
-                        (yyval.array).bits = 32;
-                ;}
-    break;
-
-  case 30:
-
-/* Line 1455 of yacc.c  */
-#line 296 "dtc-parser.y"
-    {
-                        if ((yyvsp[(1) - (2)].array).bits < 64) {
-                                uint64_t mask = (1ULL << (yyvsp[(1) - (2)].array).bits) - 1;
-                                /*
-                                 * Bits above mask must either be all zero
-                                 * (positive within range of mask) or all one
-                                 * (negative and sign-extended). The second
-                                 * condition is true if when we set all bits
-                                 * within the mask to one (i.e. | in the
-                                 * mask), all bits are one.
-                                 */
-                                if (((yyvsp[(2) - (2)].integer) > mask) && (((yyvsp[(2) - (2)].integer) | mask) != -1ULL))
-                                        print_error(
-                                                "integer value out of range "
-                                                "%016lx (%d bits)", (yyvsp[(1) - (2)].array).bits);
-                        }
-
-                        (yyval.array).data = data_append_integer((yyvsp[(1) - (2)].array).data, (yyvsp[(2) - (2)].integer), (yyvsp[(1) - (2)].array).bits);
-                ;}
-    break;
-
-  case 31:
+  case 27:
 
-/* Line 1455 of yacc.c  */
-#line 316 "dtc-parser.y"
     {
-                        uint64_t val = ~0ULL >> (64 - (yyvsp[(1) - (2)].array).bits);
-
-                        if ((yyvsp[(1) - (2)].array).bits == 32)
-                                (yyvsp[(1) - (2)].array).data = data_add_marker((yyvsp[(1) - (2)].array).data,
-                                                          REF_PHANDLE,
-                                                          (yyvsp[(2) - (2)].labelref));
-                        else
-                                print_error("References are only allowed in "
-                                            "arrays with 32-bit elements.");
-
-                        (yyval.array).data = data_append_integer((yyvsp[(1) - (2)].array).data, val, (yyvsp[(1) - (2)].array).bits);
+                        (yyval.data) = empty_data;
                 ;}
     break;
 
-  case 32:
+  case 28:
 
-/* Line 1455 of yacc.c  */
-#line 330 "dtc-parser.y"
     {
-                        (yyval.array).data = data_add_marker((yyvsp[(1) - (2)].array).data, LABEL, (yyvsp[(2) - (2)].labelref));
+                        (yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell));
                 ;}
     break;
 
-  case 33:
+  case 29:
 
-/* Line 1455 of yacc.c  */
-#line 337 "dtc-parser.y"
     {
-                        (yyval.integer) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64);
+                        (yyval.data) = data_append_cell(data_add_marker((yyvsp[(1) - (2)].data), REF_PHANDLE,
+                                                              (yyvsp[(2) - (2)].labelref)), -1);
                 ;}
     break;
 
-  case 34:
+  case 30:
 
-/* Line 1455 of yacc.c  */
-#line 341 "dtc-parser.y"
     {
-                        (yyval.integer) = eval_char_literal((yyvsp[(1) - (1)].literal));
+                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
                 ;}
     break;
 
-  case 35:
+  case 31:
 
-/* Line 1455 of yacc.c  */
-#line 345 "dtc-parser.y"
     {
-                        (yyval.integer) = (yyvsp[(2) - (3)].integer);
+                        (yyval.cell) = eval_literal((yyvsp[(1) - (1)].literal), 0, 32);
                 ;}
     break;
 
-  case 38:
-
-/* Line 1455 of yacc.c  */
-#line 356 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (5)].integer) ? (yyvsp[(3) - (5)].integer) : (yyvsp[(5) - (5)].integer); ;}
-    break;
-
-  case 40:
-
-/* Line 1455 of yacc.c  */
-#line 361 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) || (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 42:
-
-/* Line 1455 of yacc.c  */
-#line 366 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) && (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 44:
-
-/* Line 1455 of yacc.c  */
-#line 371 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) | (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 46:
-
-/* Line 1455 of yacc.c  */
-#line 376 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) ^ (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 48:
-
-/* Line 1455 of yacc.c  */
-#line 381 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) & (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 50:
-
-/* Line 1455 of yacc.c  */
-#line 386 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) == (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 51:
-
-/* Line 1455 of yacc.c  */
-#line 387 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) != (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 53:
-
-/* Line 1455 of yacc.c  */
-#line 392 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) < (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 54:
-
-/* Line 1455 of yacc.c  */
-#line 393 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) > (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 55:
-
-/* Line 1455 of yacc.c  */
-#line 394 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) <= (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 56:
-
-/* Line 1455 of yacc.c  */
-#line 395 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) >= (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 57:
-
-/* Line 1455 of yacc.c  */
-#line 399 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) << (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 58:
-
-/* Line 1455 of yacc.c  */
-#line 400 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) >> (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 60:
-
-/* Line 1455 of yacc.c  */
-#line 405 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) + (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 61:
-
-/* Line 1455 of yacc.c  */
-#line 406 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) - (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 63:
-
-/* Line 1455 of yacc.c  */
-#line 411 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) * (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 64:
-
-/* Line 1455 of yacc.c  */
-#line 412 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) / (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 65:
-
-/* Line 1455 of yacc.c  */
-#line 413 "dtc-parser.y"
-    { (yyval.integer) = (yyvsp[(1) - (3)].integer) % (yyvsp[(3) - (3)].integer); ;}
-    break;
-
-  case 68:
-
-/* Line 1455 of yacc.c  */
-#line 419 "dtc-parser.y"
-    { (yyval.integer) = -(yyvsp[(2) - (2)].integer); ;}
-    break;
-
-  case 69:
-
-/* Line 1455 of yacc.c  */
-#line 420 "dtc-parser.y"
-    { (yyval.integer) = ~(yyvsp[(2) - (2)].integer); ;}
-    break;
-
-  case 70:
-
-/* Line 1455 of yacc.c  */
-#line 421 "dtc-parser.y"
-    { (yyval.integer) = !(yyvsp[(2) - (2)].integer); ;}
-    break;
-
-  case 71:
+  case 32:
 
-/* Line 1455 of yacc.c  */
-#line 426 "dtc-parser.y"
     {
                         (yyval.data) = empty_data;
                 ;}
     break;
 
-  case 72:
+  case 33:
 
-/* Line 1455 of yacc.c  */
-#line 430 "dtc-parser.y"
     {
                         (yyval.data) = data_append_byte((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].byte));
                 ;}
     break;
 
-  case 73:
+  case 34:
 
-/* Line 1455 of yacc.c  */
-#line 434 "dtc-parser.y"
     {
                         (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
                 ;}
     break;
 
-  case 74:
+  case 35:
 
-/* Line 1455 of yacc.c  */
-#line 441 "dtc-parser.y"
     {
                         (yyval.nodelist) = NULL;
                 ;}
     break;
 
-  case 75:
+  case 36:
 
-/* Line 1455 of yacc.c  */
-#line 445 "dtc-parser.y"
     {
                         (yyval.nodelist) = chain_node((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].nodelist));
                 ;}
     break;
 
-  case 76:
+  case 37:
 
-/* Line 1455 of yacc.c  */
-#line 449 "dtc-parser.y"
     {
                         print_error("syntax error: properties must precede subnodes");
                         YYERROR;
                 ;}
     break;
 
-  case 77:
+  case 38:
 
-/* Line 1455 of yacc.c  */
-#line 457 "dtc-parser.y"
     {
                         (yyval.node) = name_node((yyvsp[(2) - (2)].node), (yyvsp[(1) - (2)].propnodename));
                 ;}
     break;
 
-  case 78:
-
-/* Line 1455 of yacc.c  */
-#line 461 "dtc-parser.y"
-    {
-                        (yyval.node) = name_node(build_node_delete(), (yyvsp[(2) - (3)].propnodename));
-                ;}
-    break;
-
-  case 79:
+  case 39:
 
-/* Line 1455 of yacc.c  */
-#line 465 "dtc-parser.y"
     {
                         add_label(&(yyvsp[(2) - (2)].node)->labels, (yyvsp[(1) - (2)].labelref));
                         (yyval.node) = (yyvsp[(2) - (2)].node);
@@ -2119,8 +1700,6 @@ yyreduce:
 
 
 
-/* Line 1455 of yacc.c  */
-#line 2124 "dtc-parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2331,8 +1910,6 @@ yyreturn:
 
 
 
-/* Line 1675 of yacc.c  */
-#line 471 "dtc-parser.y"
 
 
 void print_error(char const *fmt, ...)
@@ -2357,12 +1934,9 @@ static unsigned long long eval_literal(const char *s, int base, int bits)
 
         errno = 0;
         val = strtoull(s, &e, base);
-        if (*e) {
-                size_t uls = strspn(e, "UL");
-                if (e[uls])
-                        print_error("bad characters in literal");
-        }
-        if ((errno == ERANGE)
+        if (*e)
+                print_error("bad characters in literal");
+        else if ((errno == ERANGE)
                  || ((bits < 64) && (val >= (1ULL << bits))))
                 print_error("literal out of range");
         else if (errno != 0)
@@ -2370,29 +1944,3 @@ static unsigned long long eval_literal(const char *s, int base, int bits)
         return val;
 }
 
-static unsigned char eval_char_literal(const char *s)
-{
-        int i = 1;
-        char c = s[0];
-
-        if (c == '\0')
-        {
-                print_error("empty character literal");
-                return 0;
-        }
-
-        /*
-         * If the first character in the character literal is a \ then process
-         * the remaining characters as an escape encoding. If the first
-         * character is neither an escape or a terminator it should be the only
-         * character in the literal and will be returned.
-         */
-        if (c == '\\')
-                c = get_escape_char(s, &i);
-
-        if (s[i] != '\0')
-                print_error("malformed character literal");
-
-        return c;
-}
-
diff --git a/scripts/dtc/dtc-parser.tab.h_shipped b/scripts/dtc/dtc-parser.tab.h_shipped
index 9d2dce41211..4ee682bb7d3 100644
--- a/scripts/dtc/dtc-parser.tab.h_shipped
+++ b/scripts/dtc/dtc-parser.tab.h_shipped
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 Free Software Foundation, Inc.
    
    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
@@ -41,26 +40,14 @@
    enum yytokentype {
      DT_V1 = 258,
      DT_MEMRESERVE = 259,
-     DT_LSHIFT = 260,
-     DT_RSHIFT = 261,
-     DT_LE = 262,
-     DT_GE = 263,
-     DT_EQ = 264,
-     DT_NE = 265,
-     DT_AND = 266,
-     DT_OR = 267,
-     DT_BITS = 268,
-     DT_DEL_PROP = 269,
-     DT_DEL_NODE = 270,
-     DT_PROPNODENAME = 271,
-     DT_LITERAL = 272,
-     DT_CHAR_LITERAL = 273,
-     DT_BASE = 274,
-     DT_BYTE = 275,
-     DT_STRING = 276,
-     DT_LABEL = 277,
-     DT_REF = 278,
-     DT_INCBIN = 279
+     DT_PROPNODENAME = 260,
+     DT_LITERAL = 261,
+     DT_BASE = 262,
+     DT_BYTE = 263,
+     DT_STRING = 264,
+     DT_LABEL = 265,
+     DT_REF = 266,
+     DT_INCBIN = 267
    };
 #endif
 
@@ -70,8 +57,6 @@
 typedef union YYSTYPE
 {
 
-/* Line 1676 of yacc.c  */
-#line 40 "dtc-parser.y"
 
         char *propnodename;
         char *literal;
@@ -80,22 +65,16 @@ typedef union YYSTYPE
         uint8_t byte;
         struct data data;
 
-        struct {
-                struct data     data;
-                int             bits;
-        } array;
-
+        uint64_t addr;
+        cell_t cell;
         struct property *prop;
         struct property *proplist;
         struct node *node;
         struct node *nodelist;
         struct reserve_info *re;
-        uint64_t integer;
 
 
 
-/* Line 1676 of yacc.c  */
-#line 99 "dtc-parser.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/scripts/dtc/dtc-parser.y b/scripts/dtc/dtc-parser.y
index f412460f94d..5e84a67fc1d 100644
--- a/scripts/dtc/dtc-parser.y
+++ b/scripts/dtc/dtc-parser.y
@@ -34,7 +34,6 @@ extern struct boot_info *the_boot_info;
 extern int treesource_error;
 
 static unsigned long long eval_literal(const char *s, int base, int bits);
-static unsigned char eval_char_literal(const char *s);
 %}
 
 %union {
@@ -45,28 +44,19 @@ static unsigned char eval_char_literal(const char *s);
         uint8_t byte;
         struct data data;
 
-        struct {
-                struct data     data;
-                int             bits;
-        } array;
-
+        uint64_t addr;
+        cell_t cell;
         struct property *prop;
         struct property *proplist;
         struct node *node;
         struct node *nodelist;
         struct reserve_info *re;
-        uint64_t integer;
 }
 
 %token DT_V1
 %token DT_MEMRESERVE
-%token DT_LSHIFT DT_RSHIFT DT_LE DT_GE DT_EQ DT_NE DT_AND DT_OR
-%token DT_BITS
-%token DT_DEL_PROP
-%token DT_DEL_NODE
 %token <propnodename> DT_PROPNODENAME
 %token <literal> DT_LITERAL
-%token <literal> DT_CHAR_LITERAL
 %token <cbase> DT_BASE
 %token <byte> DT_BYTE
 %token <data> DT_STRING
@@ -78,7 +68,9 @@ static unsigned char eval_char_literal(const char *s);
 %type <data> propdataprefix
 %type <re> memreserve
 %type <re> memreserves
-%type <array> arrayprefix
+%type <addr> addr
+%type <data> celllist
+%type <cell> cellval
 %type <data> bytestring
 %type <prop> propdef
 %type <proplist> proplist
@@ -88,21 +80,6 @@ static unsigned char eval_char_literal(const char *s);
 %type <node> subnode
 %type <nodelist> subnodes
 
-%type <integer> integer_prim
-%type <integer> integer_unary
-%type <integer> integer_mul
-%type <integer> integer_add
-%type <integer> integer_shift
-%type <integer> integer_rela
-%type <integer> integer_eq
-%type <integer> integer_bitand
-%type <integer> integer_bitxor
-%type <integer> integer_bitor
-%type <integer> integer_and
-%type <integer> integer_or
-%type <integer> integer_trinary
-%type <integer> integer_expr
-
 %%
 
 sourcefile:
@@ -125,7 +102,7 @@ memreserves:
         ;
 
 memreserve:
-          DT_MEMRESERVE integer_prim integer_prim ';'
+          DT_MEMRESERVE addr addr ';'
                 {
                         $$ = build_reserve_entry($2, $3);
                 }
@@ -136,6 +113,13 @@ memreserve:
                 }
         ;
 
+addr:
+          DT_LITERAL
+                {
+                        $$ = eval_literal($1, 0, 64);
+                }
+          ;
+
 devicetree:
           '/' nodedef
                 {
@@ -155,17 +139,6 @@ devicetree:
                                 print_error("label or path, '%s', not found", $2);
                         $$ = $1;
                 }
-        | devicetree DT_DEL_NODE DT_REF ';'
-                {
-                        struct node *target = get_node_by_ref($1, $3);
-
-                        if (!target)
-                                print_error("label or path, '%s', not found", $3);
-                        else
-                                delete_node(target);
-
-                        $$ = $1;
-                }
         ;
 
 nodedef:
@@ -195,10 +168,6 @@ propdef:
                 {
                         $$ = build_property($1, empty_data);
                 }
-        | DT_DEL_PROP DT_PROPNODENAME ';'
-                {
-                        $$ = build_property_delete($2);
-                }
         | DT_LABEL propdef
                 {
                         add_label(&$2->labels, $1);
@@ -211,9 +180,9 @@ propdata:
                 {
                         $$ = data_merge($1, $2);
                 }
-        | propdataprefix arrayprefix '>'
+        | propdataprefix '<' celllist '>'
                 {
-                        $$ = data_merge($1, $2.data);
+                        $$ = data_merge($1, $3);
                 }
         | propdataprefix '[' bytestring ']'
                 {
@@ -223,7 +192,7 @@ propdata:
                 {
                         $$ = data_add_marker($1, REF_PATH, $2);
                 }
-        | propdataprefix DT_INCBIN '(' DT_STRING ',' integer_prim ',' integer_prim ')'
+        | propdataprefix DT_INCBIN '(' DT_STRING ',' addr ',' addr ')'
                 {
                         FILE *f = srcfile_relative_open($4.val, NULL);
                         struct data d;
@@ -271,154 +240,31 @@ propdataprefix:
                 }
         ;
 
-arrayprefix:
-        DT_BITS DT_LITERAL '<'
-                {
-                        $$.data = empty_data;
-                        $$.bits = eval_literal($2, 0, 7);
-
-                        if (($$.bits !=  8) &&
-                            ($$.bits != 16) &&
-                            ($$.bits != 32) &&
-                            ($$.bits != 64))
-                        {
-                                print_error("Only 8, 16, 32 and 64-bit elements"
-                                            " are currently supported");
-                                $$.bits = 32;
-                        }
-                }
-        | '<'
-                {
-                        $$.data = empty_data;
-                        $$.bits = 32;
-                }
-        | arrayprefix integer_prim
-                {
-                        if ($1.bits < 64) {
-                                uint64_t mask = (1ULL << $1.bits) - 1;
-                                /*
-                                 * Bits above mask must either be all zero
-                                 * (positive within range of mask) or all one
-                                 * (negative and sign-extended). The second
-                                 * condition is true if when we set all bits
-                                 * within the mask to one (i.e. | in the
-                                 * mask), all bits are one.
-                                 */
-                                if (($2 > mask) && (($2 | mask) != -1ULL))
-                                        print_error(
-                                                "integer value out of range "
-                                                "%016lx (%d bits)", $1.bits);
-                        }
-
-                        $$.data = data_append_integer($1.data, $2, $1.bits);
-                }
-        | arrayprefix DT_REF
-                {
-                        uint64_t val = ~0ULL >> (64 - $1.bits);
-
-                        if ($1.bits == 32)
-                                $1.data = data_add_marker($1.data,
-                                                          REF_PHANDLE,
-                                                          $2);
-                        else
-                                print_error("References are only allowed in "
-                                            "arrays with 32-bit elements.");
-
-                        $$.data = data_append_integer($1.data, val, $1.bits);
-                }
-        | arrayprefix DT_LABEL
+celllist:
+          /* empty */
                 {
-                        $$.data = data_add_marker($1.data, LABEL, $2);
+                        $$ = empty_data;
                 }
-        ;
-
-integer_prim:
-          DT_LITERAL
+        | celllist cellval
                 {
-                        $$ = eval_literal($1, 0, 64);
+                        $$ = data_append_cell($1, $2);
                 }
-        | DT_CHAR_LITERAL
+        | celllist DT_REF
                 {
-                        $$ = eval_char_literal($1);
+                        $$ = data_append_cell(data_add_marker($1, REF_PHANDLE,
+                                                              $2), -1);
                 }
-        | '(' integer_expr ')'
+        | celllist DT_LABEL
                 {
-                        $$ = $2;
+                        $$ = data_add_marker($1, LABEL, $2);
                 }
         ;
 
-integer_expr:
-        integer_trinary
-        ;
-
-integer_trinary:
-          integer_or
-        | integer_or '?' integer_expr ':' integer_trinary { $$ = $1 ? $3 : $5; }
-        ;
-
-integer_or:
-          integer_and
-        | integer_or DT_OR integer_and { $$ = $1 || $3; }
-        ;
-
-integer_and:
-          integer_bitor
-        | integer_and DT_AND integer_bitor { $$ = $1 && $3; }
-        ;
-
-integer_bitor:
-          integer_bitxor
-        | integer_bitor '|' integer_bitxor { $$ = $1 | $3; }
-        ;
-
-integer_bitxor:
-          integer_bitand
-        | integer_bitxor '^' integer_bitand { $$ = $1 ^ $3; }
-        ;
-
-integer_bitand:
-          integer_eq
-        | integer_bitand '&' integer_eq { $$ = $1 & $3; }
-        ;
-
-integer_eq:
-          integer_rela
-        | integer_eq DT_EQ integer_rela { $$ = $1 == $3; }
-        | integer_eq DT_NE integer_rela { $$ = $1 != $3; }
-        ;
-
-integer_rela:
-          integer_shift
-        | integer_rela '<' integer_shift { $$ = $1 < $3; }
-        | integer_rela '>' integer_shift { $$ = $1 > $3; }
-        | integer_rela DT_LE integer_shift { $$ = $1 <= $3; }
-        | integer_rela DT_GE integer_shift { $$ = $1 >= $3; }
-        ;
-
-integer_shift:
-          integer_shift DT_LSHIFT integer_add { $$ = $1 << $3; }
-        | integer_shift DT_RSHIFT integer_add { $$ = $1 >> $3; }
-        | integer_add
-        ;
-
-integer_add:
-          integer_add '+' integer_mul { $$ = $1 + $3; }
-        | integer_add '-' integer_mul { $$ = $1 - $3; }
-        | integer_mul
-        ;
-
-integer_mul:
-          integer_mul '*' integer_unary { $$ = $1 * $3; }
-        | integer_mul '/' integer_unary { $$ = $1 / $3; }
-        | integer_mul '%' integer_unary { $$ = $1 % $3; }
-        | integer_unary
-        ;
-
-integer_unary:
-          integer_prim
-        | '-' integer_unary { $$ = -$2; }
-        | '~' integer_unary { $$ = ~$2; }
-        | '!' integer_unary { $$ = !$2; }
+cellval:
+          DT_LITERAL
+                {
+                        $$ = eval_literal($1, 0, 32);
+                }
         ;
 
 bytestring:
@@ -457,10 +303,6 @@ subnode:
                 {
                         $$ = name_node($2, $1);
                 }
-        | DT_DEL_NODE DT_PROPNODENAME ';'
-                {
-                        $$ = name_node(build_node_delete(), $2);
-                }
         | DT_LABEL subnode
                 {
                         add_label(&$2->labels, $1);
@@ -492,41 +334,12 @@ static unsigned long long eval_literal(const char *s, int base, int bits)
 
         errno = 0;
         val = strtoull(s, &e, base);
-        if (*e) {
-                size_t uls = strspn(e, "UL");
-                if (e[uls])
-                        print_error("bad characters in literal");
-        }
-        if ((errno == ERANGE)
+        if (*e)
+                print_error("bad characters in literal");
+        else if ((errno == ERANGE)
                  || ((bits < 64) && (val >= (1ULL << bits))))
                 print_error("literal out of range");
         else if (errno != 0)
                 print_error("bad literal");
         return val;
 }
-
-static unsigned char eval_char_literal(const char *s)
-{
-        int i = 1;
-        char c = s[0];
-
-        if (c == '\0')
-        {
-                print_error("empty character literal");
-                return 0;
-        }
-
-        /*
-         * If the first character in the character literal is a \ then process
-         * the remaining characters as an escape encoding. If the first
-         * character is neither an escape or a terminator it should be the only
-         * character in the literal and will be returned.
-         */
-        if (c == '\\')
-                c = get_escape_char(s, &i);
-
-        if (s[i] != '\0')
-                print_error("malformed character literal");
-
-        return c;
-}
diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c
index a375683c153..cbc0193098e 100644
--- a/scripts/dtc/dtc.c
+++ b/scripts/dtc/dtc.c
@@ -71,7 +71,6 @@ static void  __attribute__ ((noreturn)) usage(void)
         fprintf(stderr, "\t\t\tasm - assembler source\n");
         fprintf(stderr, "\t-V <output version>\n");
         fprintf(stderr, "\t\tBlob version to produce, defaults to %d (relevant for dtb\n\t\tand asm output only)\n", DEFAULT_FDT_VERSION);
-        fprintf(stderr, "\t-d <output dependency file>\n");
         fprintf(stderr, "\t-R <number>\n");
         fprintf(stderr, "\t\tMake space for <number> reserve map entries (relevant for \n\t\tdtb and asm output only)\n");
         fprintf(stderr, "\t-S <bytes>\n");
@@ -82,8 +81,6 @@ static void  __attribute__ ((noreturn)) usage(void)
         fprintf(stderr, "\t\tSet the physical boot cpu\n");
         fprintf(stderr, "\t-f\n");
         fprintf(stderr, "\t\tForce - try to produce output even if the input tree has errors\n");
-        fprintf(stderr, "\t-i\n");
-        fprintf(stderr, "\t\tAdd a path to search for include files\n");
         fprintf(stderr, "\t-s\n");
         fprintf(stderr, "\t\tSort nodes and properties before outputting (only useful for\n\t\tcomparing trees)\n");
         fprintf(stderr, "\t-v\n");
@@ -93,9 +90,6 @@ static void  __attribute__ ((noreturn)) usage(void)
         fprintf(stderr, "\t\t\tlegacy - \"linux,phandle\" properties only\n");
         fprintf(stderr, "\t\t\tepapr - \"phandle\" properties only\n");
         fprintf(stderr, "\t\t\tboth - Both \"linux,phandle\" and \"phandle\" properties\n");
-        fprintf(stderr, "\t-W [no-]<checkname>\n");
-        fprintf(stderr, "\t-E [no-]<checkname>\n");
-        fprintf(stderr, "\t\t\tenable or disable warnings and errors\n");
         exit(3);
 }
 
@@ -105,8 +99,7 @@ int main(int argc, char *argv[])
         const char *inform = "dts";
         const char *outform = "dts";
         const char *outname = "-";
-        const char *depname = NULL;
-        int force = 0, sort = 0;
+        int force = 0, check = 0, sort = 0;
         const char *arg;
         int opt;
         FILE *outf = NULL;
@@ -118,8 +111,7 @@ int main(int argc, char *argv[])
         minsize    = 0;
         padsize    = 0;
 
-        while ((opt = getopt(argc, argv, "hI:O:o:V:d:R:S:p:fqb:i:vH:sW:E:"))
-                        != EOF) {
+        while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:vH:s")) != EOF) {
                 switch (opt) {
                 case 'I':
                         inform = optarg;
@@ -133,9 +125,6 @@ int main(int argc, char *argv[])
                 case 'V':
                         outversion = strtol(optarg, NULL, 0);
                         break;
-                case 'd':
-                        depname = optarg;
-                        break;
                 case 'R':
                         reservenum = strtol(optarg, NULL, 0);
                         break;
@@ -148,15 +137,15 @@ int main(int argc, char *argv[])
                 case 'f':
                         force = 1;
                         break;
+                case 'c':
+                        check = 1;
+                        break;
                 case 'q':
                         quiet++;
                         break;
                 case 'b':
                         cmdline_boot_cpuid = strtoll(optarg, NULL, 0);
                         break;
-                case 'i':
-                        srcfile_add_search_path(optarg);
-                        break;
                 case 'v':
                         printf("Version: %s\n", DTC_VERSION);
                         exit(0);
@@ -176,14 +165,6 @@ int main(int argc, char *argv[])
                         sort = 1;
                         break;
 
-                case 'W':
-                        parse_checks_option(true, false, optarg);
-                        break;
-
-                case 'E':
-                        parse_checks_option(false, true, optarg);
-                        break;
-
                 case 'h':
                 default:
                         usage();
@@ -204,13 +185,8 @@ int main(int argc, char *argv[])
         if (minsize)
                 fprintf(stderr, "DTC: Use of \"-S\" is deprecated; it will be removed soon, use \"-p\" instead\n");
 
-        if (depname) {
-                depfile = fopen(depname, "w");
-                if (!depfile)
-                        die("Couldn't open dependency file %s: %s\n", depname,
-                            strerror(errno));
-                fprintf(depfile, "%s:", outname);
-        }
+        fprintf(stderr, "DTC: %s->%s  on file \"%s\"\n",
+                inform, outform, arg);
 
         if (streq(inform, "dts"))
                 bi = dt_from_source(arg);
@@ -221,11 +197,6 @@ int main(int argc, char *argv[])
         else
                 die("Unknown input format \"%s\"\n", inform);
 
-        if (depfile) {
-                fputc('\n', depfile);
-                fclose(depfile);
-        }
-
         if (cmdline_boot_cpuid != -1)
                 bi->boot_cpuid_phys = cmdline_boot_cpuid;
 
diff --git a/scripts/dtc/dtc.h b/scripts/dtc/dtc.h
index 3e42a071070..f37c97eb3df 100644
--- a/scripts/dtc/dtc.h
+++ b/scripts/dtc/dtc.h
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <stdbool.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <ctype.h>
@@ -110,7 +109,6 @@ struct data data_insert_at_marker(struct data d, struct marker *m,
                                   const void *p, int len);
 struct data data_merge(struct data d1, struct data d2);
 struct data data_append_cell(struct data d, cell_t word);
-struct data data_append_integer(struct data d, uint64_t word, int bits);
 struct data data_append_re(struct data d, const struct fdt_reserve_entry *re);
 struct data data_append_addr(struct data d, uint64_t addr);
 struct data data_append_byte(struct data d, uint8_t byte);
@@ -128,13 +126,11 @@ int data_is_one_string(struct data d);
 
 /* Live trees */
 struct label {
-        int deleted;
         char *label;
         struct label *next;
 };
 
 struct property {
-        int deleted;
         char *name;
         struct data val;
 
@@ -144,7 +140,6 @@ struct property {
 };
 
 struct node {
-        int deleted;
         char *name;
         struct property *proplist;
         struct node *children;
@@ -161,47 +156,28 @@ struct node {
         struct label *labels;
 };
 
-#define for_each_label_withdel(l0, l) \
-        for ((l) = (l0); (l); (l) = (l)->next)
-
 #define for_each_label(l0, l) \
-        for_each_label_withdel(l0, l) \
-                if (!(l)->deleted)
-
-#define for_each_property_withdel(n, p) \
-        for ((p) = (n)->proplist; (p); (p) = (p)->next)
+        for ((l) = (l0); (l); (l) = (l)->next)
 
 #define for_each_property(n, p) \
-        for_each_property_withdel(n, p) \
-                if (!(p)->deleted)
+        for ((p) = (n)->proplist; (p); (p) = (p)->next)
 
-#define for_each_child_withdel(n, c) \
+#define for_each_child(n, c)    \
         for ((c) = (n)->children; (c); (c) = (c)->next_sibling)
 
-#define for_each_child(n, c) \
-        for_each_child_withdel(n, c) \
-                if (!(c)->deleted)
-
 void add_label(struct label **labels, char *label);
-void delete_labels(struct label **labels);
 
 struct property *build_property(char *name, struct data val);
-struct property *build_property_delete(char *name);
 struct property *chain_property(struct property *first, struct property *list);
 struct property *reverse_properties(struct property *first);
 
 struct node *build_node(struct property *proplist, struct node *children);
-struct node *build_node_delete(void);
 struct node *name_node(struct node *node, char *name);
 struct node *chain_node(struct node *first, struct node *list);
 struct node *merge_nodes(struct node *old_node, struct node *new_node);
 
 void add_property(struct node *node, struct property *prop);
-void delete_property_by_name(struct node *node, char *name);
-void delete_property(struct property *prop);
 void add_child(struct node *parent, struct node *child);
-void delete_node_by_name(struct node *parent, char *name);
-void delete_node(struct node *node);
 
 const char *get_unitname(struct node *node);
 struct property *get_property(struct node *node, const char *propname);
@@ -248,7 +224,6 @@ void sort_tree(struct boot_info *bi);
 
 /* Checks */
 
-void parse_checks_option(bool warn, bool error, const char *optarg);
 void process_checks(int force, struct boot_info *bi);
 
 /* Flattened trees */
diff --git a/scripts/dtc/fdtdump.c b/scripts/dtc/fdtdump.c
deleted file mode 100644
index 207a46d6486..00000000000
--- a/scripts/dtc/fdtdump.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * fdtdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com>
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <fdt.h>
-#include <libfdt_env.h>
-
-#include "util.h"
-
-#define ALIGN(x, a)     (((x) + ((a) - 1)) & ~((a) - 1))
-#define PALIGN(p, a)    ((void *)(ALIGN((unsigned long)(p), (a))))
-#define GET_CELL(p)     (p += 4, *((const uint32_t *)(p-4)))
-
-static void print_data(const char *data, int len)
-{
-        int i;
-        const char *p = data;
-
-        /* no data, don't print */
-        if (len == 0)
-                return;
-
-        if (util_is_printable_string(data, len)) {
-                printf(" = \"%s\"", (const char *)data);
-        } else if ((len % 4) == 0) {
-                printf(" = <");
-                for (i = 0; i < len; i += 4)
-                        printf("0x%08x%s", fdt32_to_cpu(GET_CELL(p)),
-                               i < (len - 4) ? " " : "");
-                printf(">");
-        } else {
-                printf(" = [");
-                for (i = 0; i < len; i++)
-                        printf("%02x%s", *p++, i < len - 1 ? " " : "");
-                printf("]");
-        }
-}
-
-static void dump_blob(void *blob)
-{
-        struct fdt_header *bph = blob;
-        uint32_t off_mem_rsvmap = fdt32_to_cpu(bph->off_mem_rsvmap);
-        uint32_t off_dt = fdt32_to_cpu(bph->off_dt_struct);
-        uint32_t off_str = fdt32_to_cpu(bph->off_dt_strings);
-        struct fdt_reserve_entry *p_rsvmap =
-                (struct fdt_reserve_entry *)((char *)blob + off_mem_rsvmap);
-        const char *p_struct = (const char *)blob + off_dt;
-        const char *p_strings = (const char *)blob + off_str;
-        uint32_t version = fdt32_to_cpu(bph->version);
-        uint32_t totalsize = fdt32_to_cpu(bph->totalsize);
-        uint32_t tag;
-        const char *p, *s, *t;
-        int depth, sz, shift;
-        int i;
-        uint64_t addr, size;
-
-        depth = 0;
-        shift = 4;
-
-        printf("/dts-v1/;\n");
-        printf("// magic:\t\t0x%x\n", fdt32_to_cpu(bph->magic));
-        printf("// totalsize:\t\t0x%x (%d)\n", totalsize, totalsize);
-        printf("// off_dt_struct:\t0x%x\n", off_dt);
-        printf("// off_dt_strings:\t0x%x\n", off_str);
-        printf("// off_mem_rsvmap:\t0x%x\n", off_mem_rsvmap);
-        printf("// version:\t\t%d\n", version);
-        printf("// last_comp_version:\t%d\n",
-               fdt32_to_cpu(bph->last_comp_version));
-        if (version >= 2)
-                printf("// boot_cpuid_phys:\t0x%x\n",
-                       fdt32_to_cpu(bph->boot_cpuid_phys));
-
-        if (version >= 3)
-                printf("// size_dt_strings:\t0x%x\n",
-                       fdt32_to_cpu(bph->size_dt_strings));
-        if (version >= 17)
-                printf("// size_dt_struct:\t0x%x\n",
-                       fdt32_to_cpu(bph->size_dt_struct));
-        printf("\n");
-
-        for (i = 0; ; i++) {
-                addr = fdt64_to_cpu(p_rsvmap[i].address);
-                size = fdt64_to_cpu(p_rsvmap[i].size);
-                if (addr == 0 && size == 0)
-                        break;
-
-                printf("/memreserve/ %llx %llx;\n",
-                       (unsigned long long)addr, (unsigned long long)size);
-        }
-
-        p = p_struct;
-        while ((tag = fdt32_to_cpu(GET_CELL(p))) != FDT_END) {
-
-                /* printf("tag: 0x%08x (%d)\n", tag, p - p_struct); */
-
-                if (tag == FDT_BEGIN_NODE) {
-                        s = p;
-                        p = PALIGN(p + strlen(s) + 1, 4);
-
-                        if (*s == '\0')
-                                s = "/";
-
-                        printf("%*s%s {\n", depth * shift, "", s);
-
-                        depth++;
-                        continue;
-                }
-
-                if (tag == FDT_END_NODE) {
-                        depth--;
-
-                        printf("%*s};\n", depth * shift, "");
-                        continue;
-                }
-
-                if (tag == FDT_NOP) {
-                        printf("%*s// [NOP]\n", depth * shift, "");
-                        continue;
-                }
-
-                if (tag != FDT_PROP) {
-                        fprintf(stderr, "%*s ** Unknown tag 0x%08x\n", depth * shift, "", tag);
-                        break;
-                }
-                sz = fdt32_to_cpu(GET_CELL(p));
-                s = p_strings + fdt32_to_cpu(GET_CELL(p));
-                if (version < 16 && sz >= 8)
-                        p = PALIGN(p, 8);
-                t = p;
-
-                p = PALIGN(p + sz, 4);
-
-                printf("%*s%s", depth * shift, "", s);
-                print_data(t, sz);
-                printf(";\n");
-        }
-}
-
-
-int main(int argc, char *argv[])
-{
-        char *buf;
-
-        if (argc < 2) {
-                fprintf(stderr, "supply input filename\n");
-                return 5;
-        }
-
-        buf = utilfdt_read(argv[1]);
-        if (buf)
-                dump_blob(buf);
-        else
-                return 10;
-
-        return 0;
-}
diff --git a/scripts/dtc/fdtget.c b/scripts/dtc/fdtget.c
deleted file mode 100644
index c2fbab2a547..00000000000
--- a/scripts/dtc/fdtget.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- *
- * Portions from U-Boot cmd_fdt.c (C) Copyright 2007
- * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
- * Based on code written by:
- *   Pantelis Antoniou <pantelis.antoniou@gmail.com> and
- *   Matthew McClintock <msm@freescale.com>
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <assert.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libfdt.h>
-
-#include "util.h"
-
-enum display_mode {
-        MODE_SHOW_VALUE,        /* show values for node properties */
-        MODE_LIST_PROPS,        /* list the properties for a node */
-        MODE_LIST_SUBNODES,     /* list the subnodes of a node */
-};
-
-/* Holds information which controls our output and options */
-struct display_info {
-        int type;               /* data type (s/i/u/x or 0 for default) */
-        int size;               /* data size (1/2/4) */
-        enum display_mode mode; /* display mode that we are using */
-        const char *default_val; /* default value if node/property not found */
-};
-
-static void report_error(const char *where, int err)
-{
-        fprintf(stderr, "Error at '%s': %s\n", where, fdt_strerror(err));
-}
-
-/**
- * Displays data of a given length according to selected options
- *
- * If a specific data type is provided in disp, then this is used. Otherwise
- * we try to guess the data type / size from the contents.
- *
- * @param disp          Display information / options
- * @param data          Data to display
- * @param len           Maximum length of buffer
- * @return 0 if ok, -1 if data does not match format
- */
-static int show_data(struct display_info *disp, const char *data, int len)
-{
-        int i, size;
-        const uint8_t *p = (const uint8_t *)data;
-        const char *s;
-        int value;
-        int is_string;
-        char fmt[3];
-
-        /* no data, don't print */
-        if (len == 0)
-                return 0;
-
-        is_string = (disp->type) == 's' ||
-                (!disp->type && util_is_printable_string(data, len));
-        if (is_string) {
-                if (data[len - 1] != '\0') {
-                        fprintf(stderr, "Unterminated string\n");
-                        return -1;
-                }
-                for (s = data; s - data < len; s += strlen(s) + 1) {
-                        if (s != data)
-                                printf(" ");
-                        printf("%s", (const char *)s);
-                }
-                return 0;
-        }
-        size = disp->size;
-        if (size == -1) {
-                size = (len % 4) == 0 ? 4 : 1;
-        } else if (len % size) {
-                fprintf(stderr, "Property length must be a multiple of "
-                                "selected data size\n");
-                return -1;
-        }
-        fmt[0] = '%';
-        fmt[1] = disp->type ? disp->type : 'd';
-        fmt[2] = '\0';
-        for (i = 0; i < len; i += size, p += size) {
-                if (i)
-                        printf(" ");
-                value = size == 4 ? fdt32_to_cpu(*(const uint32_t *)p) :
-                        size == 2 ? (*p << 8) | p[1] : *p;
-                printf(fmt, value);
-        }
-        return 0;
-}
-
-/**
- * List all properties in a node, one per line.
- *
- * @param blob          FDT blob
- * @param node          Node to display
- * @return 0 if ok, or FDT_ERR... if not.
- */
-static int list_properties(const void *blob, int node)
-{
-        const struct fdt_property *data;
-        const char *name;
-        int prop;
-
-        prop = fdt_first_property_offset(blob, node);
-        do {
-                /* Stop silently when there are no more properties */
-                if (prop < 0)
-                        return prop == -FDT_ERR_NOTFOUND ? 0 : prop;
-                data = fdt_get_property_by_offset(blob, prop, NULL);
-                name = fdt_string(blob, fdt32_to_cpu(data->nameoff));
-                if (name)
-                        puts(name);
-                prop = fdt_next_property_offset(blob, prop);
-        } while (1);
-}
-
-#define MAX_LEVEL       32              /* how deeply nested we will go */
-
-/**
- * List all subnodes in a node, one per line
- *
- * @param blob          FDT blob
- * @param node          Node to display
- * @return 0 if ok, or FDT_ERR... if not.
- */
-static int list_subnodes(const void *blob, int node)
-{
-        int nextoffset;         /* next node offset from libfdt */
-        uint32_t tag;           /* current tag */
-        int level = 0;          /* keep track of nesting level */
-        const char *pathp;
-        int depth = 1;          /* the assumed depth of this node */
-
-        while (level >= 0) {
-                tag = fdt_next_tag(blob, node, &nextoffset);
-                switch (tag) {
-                case FDT_BEGIN_NODE:
-                        pathp = fdt_get_name(blob, node, NULL);
-                        if (level <= depth) {
-                                if (pathp == NULL)
-                                        pathp = "/* NULL pointer error */";
-                                if (*pathp == '\0')
-                                        pathp = "/";    /* root is nameless */
-                                if (level == 1)
-                                        puts(pathp);
-                        }
-                        level++;
-                        if (level >= MAX_LEVEL) {
-                                printf("Nested too deep, aborting.\n");
-                                return 1;
-                        }
-                        break;
-                case FDT_END_NODE:
-                        level--;
-                        if (level == 0)
-                                level = -1;             /* exit the loop */
-                        break;
-                case FDT_END:
-                        return 1;
-                case FDT_PROP:
-                        break;
-                default:
-                        if (level <= depth)
-                                printf("Unknown tag 0x%08X\n", tag);
-                        return 1;
-                }
-                node = nextoffset;
-        }
-        return 0;
-}
-
-/**
- * Show the data for a given node (and perhaps property) according to the
- * display option provided.
- *
- * @param blob          FDT blob
- * @param disp          Display information / options
- * @param node          Node to display
- * @param property      Name of property to display, or NULL if none
- * @return 0 if ok, -ve on error
- */
-static int show_data_for_item(const void *blob, struct display_info *disp,
-                int node, const char *property)
-{
-        const void *value = NULL;
-        int len, err = 0;
-
-        switch (disp->mode) {
-        case MODE_LIST_PROPS:
-                err = list_properties(blob, node);
-                break;
-
-        case MODE_LIST_SUBNODES:
-                err = list_subnodes(blob, node);
-                break;
-
-        default:
-                assert(property);
-                value = fdt_getprop(blob, node, property, &len);
-                if (value) {
-                        if (show_data(disp, value, len))
-                                err = -1;
-                        else
-                                printf("\n");
-                } else if (disp->default_val) {
-                        puts(disp->default_val);
-                } else {
-                        report_error(property, len);
-                        err = -1;
-                }
-                break;
-        }
-
-        return err;
-}
-
-/**
- * Run the main fdtget operation, given a filename and valid arguments
- *
- * @param disp          Display information / options
- * @param filename      Filename of blob file
- * @param arg           List of arguments to process
- * @param arg_count     Number of arguments
- * @param return 0 if ok, -ve on error
- */
-static int do_fdtget(struct display_info *disp, const char *filename,
-                     char **arg, int arg_count, int args_per_step)
-{
-        char *blob;
-        const char *prop;
-        int i, node;
-
-        blob = utilfdt_read(filename);
-        if (!blob)
-                return -1;
-
-        for (i = 0; i + args_per_step <= arg_count; i += args_per_step) {
-                node = fdt_path_offset(blob, arg[i]);
-                if (node < 0) {
-                        if (disp->default_val) {
-                                puts(disp->default_val);
-                                continue;
-                        } else {
-                                report_error(arg[i], node);
-                                return -1;
-                        }
-                }
-                prop = args_per_step == 1 ? NULL : arg[i + 1];
-
-                if (show_data_for_item(blob, disp, node, prop))
-                        return -1;
-        }
-        return 0;
-}
-
-static const char *usage_msg =
-        "fdtget - read values from device tree\n"
-        "\n"
-        "Each value is printed on a new line.\n\n"
-        "Usage:\n"
-        "       fdtget <options> <dt file> [<node> <property>]...\n"
-        "       fdtget -p <options> <dt file> [<node> ]...\n"
-        "Options:\n"
-        "\t-t <type>\tType of data\n"
-        "\t-p\t\tList properties for each node\n"
-        "\t-l\t\tList subnodes for each node\n"
-        "\t-d\t\tDefault value to display when the property is "
-                        "missing\n"
-        "\t-h\t\tPrint this help\n\n"
-        USAGE_TYPE_MSG;
-
-static void usage(const char *msg)
-{
-        if (msg)
-                fprintf(stderr, "Error: %s\n\n", msg);
-
-        fprintf(stderr, "%s", usage_msg);
-        exit(2);
-}
-
-int main(int argc, char *argv[])
-{
-        char *filename = NULL;
-        struct display_info disp;
-        int args_per_step = 2;
-
-        /* set defaults */
-        memset(&disp, '\0', sizeof(disp));
-        disp.size = -1;
-        disp.mode = MODE_SHOW_VALUE;
-        for (;;) {
-                int c = getopt(argc, argv, "d:hlpt:");
-                if (c == -1)
-                        break;
-
-                switch (c) {
-                case 'h':
-                case '?':
-                        usage(NULL);
-
-                case 't':
-                        if (utilfdt_decode_type(optarg, &disp.type,
-                                        &disp.size))
-                                usage("Invalid type string");
-                        break;
-
-                case 'p':
-                        disp.mode = MODE_LIST_PROPS;
-                        args_per_step = 1;
-                        break;
-
-                case 'l':
-                        disp.mode = MODE_LIST_SUBNODES;
-                        args_per_step = 1;
-                        break;
-
-                case 'd':
-                        disp.default_val = optarg;
-                        break;
-                }
-        }
-
-        if (optind < argc)
-                filename = argv[optind++];
-        if (!filename)
-                usage("Missing filename");
-
-        argv += optind;
-        argc -= optind;
-
-        /* Allow no arguments, and silently succeed */
-        if (!argc)
-                return 0;
-
-        /* Check for node, property arguments */
-        if (args_per_step == 2 && (argc % 2))
-                usage("Must have an even number of arguments");
-
-        if (do_fdtget(&disp, filename, argv, argc, args_per_step))
-                return 1;
-        return 0;
-}
diff --git a/scripts/dtc/fdtput.c b/scripts/dtc/fdtput.c
deleted file mode 100644
index f2197f51930..00000000000
--- a/scripts/dtc/fdtput.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <assert.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libfdt.h>
-
-#include "util.h"
-
-/* These are the operations we support */
-enum oper_type {
-        OPER_WRITE_PROP,                /* Write a property in a node */
-        OPER_CREATE_NODE,               /* Create a new node */
-};
-
-struct display_info {
-        enum oper_type oper;    /* operation to perform */
-        int type;               /* data type (s/i/u/x or 0 for default) */
-        int size;               /* data size (1/2/4) */
-        int verbose;            /* verbose output */
-        int auto_path;          /* automatically create all path components */
-};
-
-
-/**
- * Report an error with a particular node.
- *
- * @param name          Node name to report error on
- * @param namelen       Length of node name, or -1 to use entire string
- * @param err           Error number to report (-FDT_ERR_...)
- */
-static void report_error(const char *name, int namelen, int err)
-{
-        if (namelen == -1)
-                namelen = strlen(name);
-        fprintf(stderr, "Error at '%1.*s': %s\n", namelen, name,
-                fdt_strerror(err));
-}
-
-/**
- * Encode a series of arguments in a property value.
- *
- * @param disp          Display information / options
- * @param arg           List of arguments from command line
- * @param arg_count     Number of arguments (may be 0)
- * @param valuep        Returns buffer containing value
- * @param *value_len    Returns length of value encoded
- */
-static int encode_value(struct display_info *disp, char **arg, int arg_count,
-                        char **valuep, int *value_len)
-{
-        char *value = NULL;     /* holding area for value */
-        int value_size = 0;     /* size of holding area */
-        char *ptr;              /* pointer to current value position */
-        int len;                /* length of this cell/string/byte */
-        int ival;
-        int upto;       /* the number of bytes we have written to buf */
-        char fmt[3];
-
-        upto = 0;
-
-        if (disp->verbose)
-                fprintf(stderr, "Decoding value:\n");
-
-        fmt[0] = '%';
-        fmt[1] = disp->type ? disp->type : 'd';
-        fmt[2] = '\0';
-        for (; arg_count > 0; arg++, arg_count--, upto += len) {
-                /* assume integer unless told otherwise */
-                if (disp->type == 's')
-                        len = strlen(*arg) + 1;
-                else
-                        len = disp->size == -1 ? 4 : disp->size;
-
-                /* enlarge our value buffer by a suitable margin if needed */
-                if (upto + len > value_size) {
-                        value_size = (upto + len) + 500;
-                        value = realloc(value, value_size);
-                        if (!value) {
-                                fprintf(stderr, "Out of mmory: cannot alloc "
-                                        "%d bytes\n", value_size);
-                                return -1;
-                        }
-                }
-
-                ptr = value + upto;
-                if (disp->type == 's') {
-                        memcpy(ptr, *arg, len);
-                        if (disp->verbose)
-                                fprintf(stderr, "\tstring: '%s'\n", ptr);
-                } else {
-                        int *iptr = (int *)ptr;
-                        sscanf(*arg, fmt, &ival);
-                        if (len == 4)
-                                *iptr = cpu_to_fdt32(ival);
-                        else
-                                *ptr = (uint8_t)ival;
-                        if (disp->verbose) {
-                                fprintf(stderr, "\t%s: %d\n",
-                                        disp->size == 1 ? "byte" :
-                                        disp->size == 2 ? "short" : "int",
-                                        ival);
-                        }
-                }
-        }
-        *value_len = upto;
-        *valuep = value;
-        if (disp->verbose)
-                fprintf(stderr, "Value size %d\n", upto);
-        return 0;
-}
-
-static int store_key_value(void *blob, const char *node_name,
-                const char *property, const char *buf, int len)
-{
-        int node;
-        int err;
-
-        node = fdt_path_offset(blob, node_name);
-        if (node < 0) {
-                report_error(node_name, -1, node);
-                return -1;
-        }
-
-        err = fdt_setprop(blob, node, property, buf, len);
-        if (err) {
-                report_error(property, -1, err);
-                return -1;
-        }
-        return 0;
-}
-
-/**
- * Create paths as needed for all components of a path
- *
- * Any components of the path that do not exist are created. Errors are
- * reported.
- *
- * @param blob          FDT blob to write into
- * @param in_path       Path to process
- * @return 0 if ok, -1 on error
- */
-static int create_paths(void *blob, const char *in_path)
-{
-        const char *path = in_path;
-        const char *sep;
-        int node, offset = 0;
-
-        /* skip leading '/' */
-        while (*path == '/')
-                path++;
-
-        for (sep = path; *sep; path = sep + 1, offset = node) {
-                /* equivalent to strchrnul(), but it requires _GNU_SOURCE */
-                sep = strchr(path, '/');
-                if (!sep)
-                        sep = path + strlen(path);
-
-                node = fdt_subnode_offset_namelen(blob, offset, path,
-                                sep - path);
-                if (node == -FDT_ERR_NOTFOUND) {
-                        node = fdt_add_subnode_namelen(blob, offset, path,
-                                                       sep - path);
-                }
-                if (node < 0) {
-                        report_error(path, sep - path, node);
-                        return -1;
-                }
-        }
-
-        return 0;
-}
-
-/**
- * Create a new node in the fdt.
- *
- * This will overwrite the node_name string. Any error is reported.
- *
- * TODO: Perhaps create fdt_path_offset_namelen() so we don't need to do this.
- *
- * @param blob          FDT blob to write into
- * @param node_name     Name of node to create
- * @return new node offset if found, or -1 on failure
- */
-static int create_node(void *blob, const char *node_name)
-{
-        int node = 0;
-        char *p;
-
-        p = strrchr(node_name, '/');
-        if (!p) {
-                report_error(node_name, -1, -FDT_ERR_BADPATH);
-                return -1;
-        }
-        *p = '\0';
-
-        if (p > node_name) {
-                node = fdt_path_offset(blob, node_name);
-                if (node < 0) {
-                        report_error(node_name, -1, node);
-                        return -1;
-                }
-        }
-
-        node = fdt_add_subnode(blob, node, p + 1);
-        if (node < 0) {
-                report_error(p + 1, -1, node);
-                return -1;
-        }
-
-        return 0;
-}
-
-static int do_fdtput(struct display_info *disp, const char *filename,
-                    char **arg, int arg_count)
-{
-        char *value;
-        char *blob;
-        int len, ret = 0;
-
-        blob = utilfdt_read(filename);
-        if (!blob)
-                return -1;
-
-        switch (disp->oper) {
-        case OPER_WRITE_PROP:
-                /*
-                 * Convert the arguments into a single binary value, then
-                 * store them into the property.
-                 */
-                assert(arg_count >= 2);
-                if (disp->auto_path && create_paths(blob, *arg))
-                        return -1;
-                if (encode_value(disp, arg + 2, arg_count - 2, &value, &len) ||
-                        store_key_value(blob, *arg, arg[1], value, len))
-                        ret = -1;
-                break;
-        case OPER_CREATE_NODE:
-                for (; ret >= 0 && arg_count--; arg++) {
-                        if (disp->auto_path)
-                                ret = create_paths(blob, *arg);
-                        else
-                                ret = create_node(blob, *arg);
-                }
-                break;
-        }
-        if (ret >= 0)
-                ret = utilfdt_write(filename, blob);
-
-        free(blob);
-        return ret;
-}
-
-static const char *usage_msg =
-        "fdtput - write a property value to a device tree\n"
-        "\n"
-        "The command line arguments are joined together into a single value.\n"
-        "\n"
-        "Usage:\n"
-        "       fdtput <options> <dt file> <node> <property> [<value>...]\n"
-        "       fdtput -c <options> <dt file> [<node>...]\n"
-        "Options:\n"
-        "\t-c\t\tCreate nodes if they don't already exist\n"
-        "\t-p\t\tAutomatically create nodes as needed for the node path\n"
-        "\t-t <type>\tType of data\n"
-        "\t-v\t\tVerbose: display each value decoded from command line\n"
-        "\t-h\t\tPrint this help\n\n"
-        USAGE_TYPE_MSG;
-
-static void usage(const char *msg)
-{
-        if (msg)
-                fprintf(stderr, "Error: %s\n\n", msg);
-
-        fprintf(stderr, "%s", usage_msg);
-        exit(2);
-}
-
-int main(int argc, char *argv[])
-{
-        struct display_info disp;
-        char *filename = NULL;
-
-        memset(&disp, '\0', sizeof(disp));
-        disp.size = -1;
-        disp.oper = OPER_WRITE_PROP;
-        for (;;) {
-                int c = getopt(argc, argv, "chpt:v");
-                if (c == -1)
-                        break;
-
-                /*
-                 * TODO: add options to:
-                 * - delete property
-                 * - delete node (optionally recursively)
-                 * - rename node
-                 * - pack fdt before writing
-                 * - set amount of free space when writing
-                 * - expand fdt if value doesn't fit
-                 */
-                switch (c) {
-                case 'c':
-                        disp.oper = OPER_CREATE_NODE;
-                        break;
-                case 'h':
-                case '?':
-                        usage(NULL);
-                case 'p':
-                        disp.auto_path = 1;
-                        break;
-                case 't':
-                        if (utilfdt_decode_type(optarg, &disp.type,
-                                        &disp.size))
-                                usage("Invalid type string");
-                        break;
-
-                case 'v':
-                        disp.verbose = 1;
-                        break;
-                }
-        }
-
-        if (optind < argc)
-                filename = argv[optind++];
-        if (!filename)
-                usage("Missing filename");
-
-        argv += optind;
-        argc -= optind;
-
-        if (disp.oper == OPER_WRITE_PROP) {
-                if (argc < 1)
-                        usage("Missing node");
-                if (argc < 2)
-                        usage("Missing property");
-        }
-
-        if (do_fdtput(&disp, filename, argv, argc))
-                return 1;
-        return 0;
-}
diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c
index 665dad7bb46..ead0332c87e 100644
--- a/scripts/dtc/flattree.c
+++ b/scripts/dtc/flattree.c
@@ -263,9 +263,6 @@ static void flatten_tree(struct node *tree, struct emitter *emit,
         struct node *child;
         int seen_name_prop = 0;
 
-        if (tree->deleted)
-                return;
-
         emit->beginnode(etarget, tree->labels);
 
         if (vi->flags & FTF_FULLPATH)
@@ -700,6 +697,7 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
 {
         struct reserve_info *reservelist = NULL;
         struct reserve_info *new;
+        const char *p;
         struct fdt_reserve_entry re;
 
         /*
@@ -708,6 +706,7 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
          *
          * First pass, count entries.
          */
+        p = inb->ptr;
         while (1) {
                 flat_read_chunk(inb, &re, sizeof(re));
                 re.address  = fdt64_to_cpu(re.address);
diff --git a/scripts/dtc/libfdt/Makefile.libfdt b/scripts/dtc/libfdt/Makefile.libfdt
index 91126c000a1..6c42acfa21e 100644
--- a/scripts/dtc/libfdt/Makefile.libfdt
+++ b/scripts/dtc/libfdt/Makefile.libfdt
@@ -3,8 +3,6 @@
 # This is not a complete Makefile of itself.  Instead, it is designed to
 # be easily embeddable into other systems of Makefiles.
 #
-LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1
-LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h
-LIBFDT_VERSION = version.lds
-LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c
+LIBFDT_INCLUDES = fdt.h libfdt.h
+LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
 LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)
diff --git a/scripts/dtc/libfdt/fdt.c b/scripts/dtc/libfdt/fdt.c
index e56833ae9b6..2acaec5923a 100644
--- a/scripts/dtc/libfdt/fdt.c
+++ b/scripts/dtc/libfdt/fdt.c
@@ -74,7 +74,7 @@ int fdt_check_header(const void *fdt)
         return 0;
 }
 
-const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)
+const void *fdt_offset_ptr(const void *fdt, int offset, int len)
 {
         const char *p;
 
@@ -90,53 +90,42 @@ const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)
         return p;
 }
 
-uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)
+uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset)
 {
         const uint32_t *tagp, *lenp;
         uint32_t tag;
-        int offset = startoffset;
         const char *p;
 
-        *nextoffset = -FDT_ERR_TRUNCATED;
+        if (offset % FDT_TAGSIZE)
+                return -1;
+
         tagp = fdt_offset_ptr(fdt, offset, FDT_TAGSIZE);
-        if (!tagp)
+        if (! tagp)
                 return FDT_END; /* premature end */
         tag = fdt32_to_cpu(*tagp);
         offset += FDT_TAGSIZE;
 
-        *nextoffset = -FDT_ERR_BADSTRUCTURE;
         switch (tag) {
         case FDT_BEGIN_NODE:
                 /* skip name */
                 do {
                         p = fdt_offset_ptr(fdt, offset++, 1);
                 } while (p && (*p != '\0'));
-                if (!p)
-                        return FDT_END; /* premature end */
+                if (! p)
+                        return FDT_END;
                 break;
-
         case FDT_PROP:
                 lenp = fdt_offset_ptr(fdt, offset, sizeof(*lenp));
-                if (!lenp)
-                        return FDT_END; /* premature end */
-                /* skip-name offset, length and value */
-                offset += sizeof(struct fdt_property) - FDT_TAGSIZE
-                        + fdt32_to_cpu(*lenp);
-                break;
-
-        case FDT_END:
-        case FDT_END_NODE:
-        case FDT_NOP:
+                if (! lenp)
+                        return FDT_END;
+                /* skip name offset, length and value */
+                offset += 2*FDT_TAGSIZE + fdt32_to_cpu(*lenp);
                 break;
-
-        default:
-                return FDT_END;
         }
 
-        if (!fdt_offset_ptr(fdt, startoffset, offset - startoffset))
-                return FDT_END; /* premature end */
+        if (nextoffset)
+                *nextoffset = FDT_TAGALIGN(offset);
 
-        *nextoffset = FDT_TAGALIGN(offset);
         return tag;
 }
 
@@ -149,15 +138,6 @@ int _fdt_check_node_offset(const void *fdt, int offset)
         return offset;
 }
 
-int _fdt_check_prop_offset(const void *fdt, int offset)
-{
-        if ((offset < 0) || (offset % FDT_TAGSIZE)
-            || (fdt_next_tag(fdt, offset, &offset) != FDT_PROP))
-                return -FDT_ERR_BADOFFSET;
-
-        return offset;
-}
-
 int fdt_next_node(const void *fdt, int offset, int *depth)
 {
         int nextoffset = 0;
@@ -182,16 +162,15 @@ int fdt_next_node(const void *fdt, int offset, int *depth)
                         break;
 
                 case FDT_END_NODE:
-                        if (depth && ((--(*depth)) < 0))
-                                return nextoffset;
+                        if (depth)
+                                (*depth)--;
                         break;
 
                 case FDT_END:
-                        if ((nextoffset >= 0)
-                            || ((nextoffset == -FDT_ERR_TRUNCATED) && !depth))
-                                return -FDT_ERR_NOTFOUND;
-                        else
-                                return nextoffset;
+                        return -FDT_ERR_NOTFOUND;
+
+                default:
+                        return -FDT_ERR_BADSTRUCTURE;
                 }
         } while (tag != FDT_BEGIN_NODE);
 
diff --git a/scripts/dtc/libfdt/fdt_empty_tree.c b/scripts/dtc/libfdt/fdt_empty_tree.c
deleted file mode 100644
index f72d13b1d19..00000000000
--- a/scripts/dtc/libfdt/fdt_empty_tree.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * libfdt - Flat Device Tree manipulation
- * Copyright (C) 2012 David Gibson, IBM Corporation.
- *
- * libfdt is dual licensed: you can use it either under the terms of
- * the GPL, or the BSD license, at your option.
- *
- *  a) This library 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 library 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 library; if not, write to the Free
- *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- *     MA 02110-1301 USA
- *
- * Alternatively,
- *
- *  b) Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *     2. Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "libfdt_env.h"
-
-#include <fdt.h>
-#include <libfdt.h>
-
-#include "libfdt_internal.h"
-
-int fdt_create_empty_tree(void *buf, int bufsize)
-{
-        int err;
-
-        err = fdt_create(buf, bufsize);
-        if (err)
-                return err;
-
-        err = fdt_finish_reservemap(buf);
-        if (err)
-                return err;
-
-        err = fdt_begin_node(buf, "");
-        if (err)
-                return err;
-
-        err =  fdt_end_node(buf);
-        if (err)
-                return err;
-
-        err = fdt_finish(buf);
-        if (err)
-                return err;
-
-        return fdt_open_into(buf, buf, bufsize);
-}
-
diff --git a/scripts/dtc/libfdt/fdt_ro.c b/scripts/dtc/libfdt/fdt_ro.c
index 02b6d687537..22e692919ff 100644
--- a/scripts/dtc/libfdt/fdt_ro.c
+++ b/scripts/dtc/libfdt/fdt_ro.c
@@ -80,14 +80,6 @@ const char *fdt_string(const void *fdt, int stroffset)
         return (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset;
 }
 
-static int _fdt_string_eq(const void *fdt, int stroffset,
-                          const char *s, int len)
-{
-        const char *p = fdt_string(fdt, stroffset);
-
-        return (strlen(p) == len) && (memcmp(p, s, len) == 0);
-}
-
 int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size)
 {
         FDT_CHECK_HEADER(fdt);
@@ -105,30 +97,6 @@ int fdt_num_mem_rsv(const void *fdt)
         return i;
 }
 
-static int _nextprop(const void *fdt, int offset)
-{
-        uint32_t tag;
-        int nextoffset;
-
-        do {
-                tag = fdt_next_tag(fdt, offset, &nextoffset);
-
-                switch (tag) {
-                case FDT_END:
-                        if (nextoffset >= 0)
-                                return -FDT_ERR_BADSTRUCTURE;
-                        else
-                                return nextoffset;
-
-                case FDT_PROP:
-                        return offset;
-                }
-                offset = nextoffset;
-        } while (tag == FDT_NOP);
-
-        return -FDT_ERR_NOTFOUND;
-}
-
 int fdt_subnode_offset_namelen(const void *fdt, int offset,
                                const char *name, int namelen)
 {
@@ -136,16 +104,20 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset,
 
         FDT_CHECK_HEADER(fdt);
 
-        for (depth = 0;
-             (offset >= 0) && (depth >= 0);
-             offset = fdt_next_node(fdt, offset, &depth))
-                if ((depth == 1)
-                    && _fdt_nodename_eq(fdt, offset, name, namelen))
+        for (depth = 0, offset = fdt_next_node(fdt, offset, &depth);
+             (offset >= 0) && (depth > 0);
+             offset = fdt_next_node(fdt, offset, &depth)) {
+                if (depth < 0)
+                        return -FDT_ERR_NOTFOUND;
+                else if ((depth == 1)
+                         && _fdt_nodename_eq(fdt, offset, name, namelen))
                         return offset;
+        }
 
-        if (depth < 0)
+        if (offset < 0)
+                return offset; /* error */
+        else
                 return -FDT_ERR_NOTFOUND;
-        return offset; /* error */
 }
 
 int fdt_subnode_offset(const void *fdt, int parentoffset,
@@ -162,20 +134,8 @@ int fdt_path_offset(const void *fdt, const char *path)
 
         FDT_CHECK_HEADER(fdt);
 
-        /* see if we have an alias */
-        if (*path != '/') {
-                const char *q = strchr(path, '/');
-
-                if (!q)
-                        q = end;
-
-                p = fdt_get_alias_namelen(fdt, p, q - p);
-                if (!p)
-                        return -FDT_ERR_BADPATH;
-                offset = fdt_path_offset(fdt, p);
-
-                p = q;
-        }
+        if (*path != '/')
+                return -FDT_ERR_BADPATH;
 
         while (*p) {
                 const char *q;
@@ -218,142 +178,93 @@ const char *fdt_get_name(const void *fdt, int nodeoffset, int *len)
         return NULL;
 }
 
-int fdt_first_property_offset(const void *fdt, int nodeoffset)
-{
-        int offset;
-
-        if ((offset = _fdt_check_node_offset(fdt, nodeoffset)) < 0)
-                return offset;
-
-        return _nextprop(fdt, offset);
-}
-
-int fdt_next_property_offset(const void *fdt, int offset)
-{
-        if ((offset = _fdt_check_prop_offset(fdt, offset)) < 0)
-                return offset;
-
-        return _nextprop(fdt, offset);
-}
-
-const struct fdt_property *fdt_get_property_by_offset(const void *fdt,
-                                                      int offset,
-                                                      int *lenp)
+const struct fdt_property *fdt_get_property(const void *fdt,
+                                            int nodeoffset,
+                                            const char *name, int *lenp)
 {
-        int err;
+        uint32_t tag;
         const struct fdt_property *prop;
+        int namestroff;
+        int offset, nextoffset;
+        int err;
 
-        if ((err = _fdt_check_prop_offset(fdt, offset)) < 0) {
-                if (lenp)
-                        *lenp = err;
-                return NULL;
-        }
-
-        prop = _fdt_offset_ptr(fdt, offset);
+        if (((err = fdt_check_header(fdt)) != 0)
+            || ((err = _fdt_check_node_offset(fdt, nodeoffset)) < 0))
+                        goto fail;
 
-        if (lenp)
-                *lenp = fdt32_to_cpu(prop->len);
+        nextoffset = err;
+        do {
+                offset = nextoffset;
 
-        return prop;
-}
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+                switch (tag) {
+                case FDT_END:
+                        err = -FDT_ERR_TRUNCATED;
+                        goto fail;
 
-const struct fdt_property *fdt_get_property_namelen(const void *fdt,
-                                                    int offset,
-                                                    const char *name,
-                                                    int namelen, int *lenp)
-{
-        for (offset = fdt_first_property_offset(fdt, offset);
-             (offset >= 0);
-             (offset = fdt_next_property_offset(fdt, offset))) {
-                const struct fdt_property *prop;
+                case FDT_BEGIN_NODE:
+                case FDT_END_NODE:
+                case FDT_NOP:
+                        break;
 
-                if (!(prop = fdt_get_property_by_offset(fdt, offset, lenp))) {
-                        offset = -FDT_ERR_INTERNAL;
+                case FDT_PROP:
+                        err = -FDT_ERR_BADSTRUCTURE;
+                        prop = fdt_offset_ptr(fdt, offset, sizeof(*prop));
+                        if (! prop)
+                                goto fail;
+                        namestroff = fdt32_to_cpu(prop->nameoff);
+                        if (strcmp(fdt_string(fdt, namestroff), name) == 0) {
+                                /* Found it! */
+                                int len = fdt32_to_cpu(prop->len);
+                                prop = fdt_offset_ptr(fdt, offset,
+                                                      sizeof(*prop)+len);
+                                if (! prop)
+                                        goto fail;
+
+                                if (lenp)
+                                        *lenp = len;
+
+                                return prop;
+                        }
                         break;
+
+                default:
+                        err = -FDT_ERR_BADSTRUCTURE;
+                        goto fail;
                 }
-                if (_fdt_string_eq(fdt, fdt32_to_cpu(prop->nameoff),
-                                   name, namelen))
-                        return prop;
-        }
+        } while ((tag != FDT_BEGIN_NODE) && (tag != FDT_END_NODE));
 
+        err = -FDT_ERR_NOTFOUND;
+ fail:
         if (lenp)
-                *lenp = offset;
+                *lenp = err;
         return NULL;
 }
 
-const struct fdt_property *fdt_get_property(const void *fdt,
-                                            int nodeoffset,
-                                            const char *name, int *lenp)
-{
-        return fdt_get_property_namelen(fdt, nodeoffset, name,
-                                        strlen(name), lenp);
-}
-
-const void *fdt_getprop_namelen(const void *fdt, int nodeoffset,
-                                const char *name, int namelen, int *lenp)
+const void *fdt_getprop(const void *fdt, int nodeoffset,
+                  const char *name, int *lenp)
 {
         const struct fdt_property *prop;
 
-        prop = fdt_get_property_namelen(fdt, nodeoffset, name, namelen, lenp);
+        prop = fdt_get_property(fdt, nodeoffset, name, lenp);
         if (! prop)
                 return NULL;
 
         return prop->data;
 }
 
-const void *fdt_getprop_by_offset(const void *fdt, int offset,
-                                  const char **namep, int *lenp)
-{
-        const struct fdt_property *prop;
-
-        prop = fdt_get_property_by_offset(fdt, offset, lenp);
-        if (!prop)
-                return NULL;
-        if (namep)
-                *namep = fdt_string(fdt, fdt32_to_cpu(prop->nameoff));
-        return prop->data;
-}
-
-const void *fdt_getprop(const void *fdt, int nodeoffset,
-                        const char *name, int *lenp)
-{
-        return fdt_getprop_namelen(fdt, nodeoffset, name, strlen(name), lenp);
-}
-
 uint32_t fdt_get_phandle(const void *fdt, int nodeoffset)
 {
         const uint32_t *php;
         int len;
 
-        /* FIXME: This is a bit sub-optimal, since we potentially scan
-         * over all the properties twice. */
-        php = fdt_getprop(fdt, nodeoffset, "phandle", &len);
-        if (!php || (len != sizeof(*php))) {
-                php = fdt_getprop(fdt, nodeoffset, "linux,phandle", &len);
-                if (!php || (len != sizeof(*php)))
-                        return 0;
-        }
+        php = fdt_getprop(fdt, nodeoffset, "linux,phandle", &len);
+        if (!php || (len != sizeof(*php)))
+                return 0;
 
         return fdt32_to_cpu(*php);
 }
 
-const char *fdt_get_alias_namelen(const void *fdt,
-                                  const char *name, int namelen)
-{
-        int aliasoffset;
-
-        aliasoffset = fdt_path_offset(fdt, "/aliases");
-        if (aliasoffset < 0)
-                return NULL;
-
-        return fdt_getprop_namelen(fdt, aliasoffset, name, namelen, NULL);
-}
-
-const char *fdt_get_alias(const void *fdt, const char *name)
-{
-        return fdt_get_alias_namelen(fdt, name, strlen(name));
-}
-
 int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
 {
         int pdepth = 0, p = 0;
@@ -368,6 +279,9 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
         for (offset = 0, depth = 0;
              (offset >= 0) && (offset <= nodeoffset);
              offset = fdt_next_node(fdt, offset, &depth)) {
+                if (pdepth < depth)
+                        continue; /* overflowed buffer */
+
                 while (pdepth > depth) {
                         do {
                                 p--;
@@ -375,16 +289,14 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
                         pdepth--;
                 }
 
-                if (pdepth >= depth) {
-                        name = fdt_get_name(fdt, offset, &namelen);
-                        if (!name)
-                                return namelen;
-                        if ((p + namelen + 1) <= buflen) {
-                                memcpy(buf + p, name, namelen);
-                                p += namelen;
-                                buf[p++] = '/';
-                                pdepth++;
-                        }
+                name = fdt_get_name(fdt, offset, &namelen);
+                if (!name)
+                        return namelen;
+                if ((p + namelen + 1) <= buflen) {
+                        memcpy(buf + p, name, namelen);
+                        p += namelen;
+                        buf[p++] = '/';
+                        pdepth++;
                 }
 
                 if (offset == nodeoffset) {
@@ -394,7 +306,7 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
                         if (p > 1) /* special case so that root path is "/", not "" */
                                 p--;
                         buf[p] = '\0';
-                        return 0;
+                        return p;
                 }
         }
 
@@ -492,31 +404,14 @@ int fdt_node_offset_by_prop_value(const void *fdt, int startoffset,
 
 int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)
 {
-        int offset;
-
         if ((phandle == 0) || (phandle == -1))
                 return -FDT_ERR_BADPHANDLE;
-
-        FDT_CHECK_HEADER(fdt);
-
-        /* FIXME: The algorithm here is pretty horrible: we
-         * potentially scan each property of a node in
-         * fdt_get_phandle(), then if that didn't find what
-         * we want, we scan over them again making our way to the next
-         * node.  Still it's the easiest to implement approach;
-         * performance can come later. */
-        for (offset = fdt_next_node(fdt, -1, NULL);
-             offset >= 0;
-             offset = fdt_next_node(fdt, offset, NULL)) {
-                if (fdt_get_phandle(fdt, offset) == phandle)
-                        return offset;
-        }
-
-        return offset; /* error from fdt_next_node() */
+        phandle = cpu_to_fdt32(phandle);
+        return fdt_node_offset_by_prop_value(fdt, -1, "linux,phandle",
+                                             &phandle, sizeof(phandle));
 }
 
-static int _fdt_stringlist_contains(const char *strlist, int listlen,
-                                    const char *str)
+static int _stringlist_contains(const char *strlist, int listlen, const char *str)
 {
         int len = strlen(str);
         const char *p;
@@ -542,7 +437,7 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset,
         prop = fdt_getprop(fdt, nodeoffset, "compatible", &len);
         if (!prop)
                 return len;
-        if (_fdt_stringlist_contains(prop, len, compatible))
+        if (_stringlist_contains(prop, len, compatible))
                 return 0;
         else
                 return 1;
diff --git a/scripts/dtc/libfdt/fdt_rw.c b/scripts/dtc/libfdt/fdt_rw.c
index 24437dfc32b..8e7ec4cb7bc 100644
--- a/scripts/dtc/libfdt/fdt_rw.c
+++ b/scripts/dtc/libfdt/fdt_rw.c
@@ -289,33 +289,6 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name,
         return 0;
 }
 
-int fdt_appendprop(void *fdt, int nodeoffset, const char *name,
-                   const void *val, int len)
-{
-        struct fdt_property *prop;
-        int err, oldlen, newlen;
-
-        FDT_RW_CHECK_HEADER(fdt);
-
-        prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen);
-        if (prop) {
-                newlen = len + oldlen;
-                err = _fdt_splice_struct(fdt, prop->data,
-                                         FDT_TAGALIGN(oldlen),
-                                         FDT_TAGALIGN(newlen));
-                if (err)
-                        return err;
-                prop->len = cpu_to_fdt32(newlen);
-                memcpy(prop->data + oldlen, val, len);
-        } else {
-                err = _fdt_add_property(fdt, nodeoffset, name, len, &prop);
-                if (err)
-                        return err;
-                memcpy(prop->data, val, len);
-        }
-        return 0;
-}
-
 int fdt_delprop(void *fdt, int nodeoffset, const char *name)
 {
         struct fdt_property *prop;
@@ -433,8 +406,6 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
                 struct_size = 0;
                 while (fdt_next_tag(fdt, struct_size, &struct_size) != FDT_END)
                         ;
-                if (struct_size < 0)
-                        return struct_size;
         }
 
         if (!_fdt_blocks_misordered(fdt, mem_rsv_size, struct_size)) {
diff --git a/scripts/dtc/libfdt/fdt_sw.c b/scripts/dtc/libfdt/fdt_sw.c
index 55ebebf1eb2..698329e0cca 100644
--- a/scripts/dtc/libfdt/fdt_sw.c
+++ b/scripts/dtc/libfdt/fdt_sw.c
@@ -70,7 +70,7 @@ static int _fdt_sw_check_header(void *fdt)
                         return err; \
         }
 
-static void *_fdt_grab_space(void *fdt, size_t len)
+static void *_fdt_grab_space(void *fdt, int len)
 {
         int offset = fdt_size_dt_struct(fdt);
         int spaceleft;
@@ -82,7 +82,7 @@ static void *_fdt_grab_space(void *fdt, size_t len)
                 return NULL;
 
         fdt_set_size_dt_struct(fdt, offset + len);
-        return _fdt_offset_ptr_w(fdt, offset);
+        return fdt_offset_ptr_w(fdt, offset, len);
 }
 
 int fdt_create(void *buf, int bufsize)
@@ -237,17 +237,18 @@ int fdt_finish(void *fdt)
         while ((tag = fdt_next_tag(fdt, offset, &nextoffset)) != FDT_END) {
                 if (tag == FDT_PROP) {
                         struct fdt_property *prop =
-                                _fdt_offset_ptr_w(fdt, offset);
+                                fdt_offset_ptr_w(fdt, offset, sizeof(*prop));
                         int nameoff;
 
+                        if (! prop)
+                                return -FDT_ERR_BADSTRUCTURE;
+
                         nameoff = fdt32_to_cpu(prop->nameoff);
                         nameoff += fdt_size_dt_strings(fdt);
                         prop->nameoff = cpu_to_fdt32(nameoff);
                 }
                 offset = nextoffset;
         }
-        if (nextoffset < 0)
-                return nextoffset;
 
         /* Finally, adjust the header */
         fdt_set_totalsize(fdt, newstroffset + fdt_size_dt_strings(fdt));
diff --git a/scripts/dtc/libfdt/fdt_wip.c b/scripts/dtc/libfdt/fdt_wip.c
index 6025fa1fe8f..a4652c6e787 100644
--- a/scripts/dtc/libfdt/fdt_wip.c
+++ b/scripts/dtc/libfdt/fdt_wip.c
@@ -94,14 +94,41 @@ int fdt_nop_property(void *fdt, int nodeoffset, const char *name)
         return 0;
 }
 
-int _fdt_node_end_offset(void *fdt, int offset)
+int _fdt_node_end_offset(void *fdt, int nodeoffset)
 {
-        int depth = 0;
-
-        while ((offset >= 0) && (depth >= 0))
-                offset = fdt_next_node(fdt, offset, &depth);
-
-        return offset;
+        int level = 0;
+        uint32_t tag;
+        int offset, nextoffset;
+
+        tag = fdt_next_tag(fdt, nodeoffset, &nextoffset);
+        if (tag != FDT_BEGIN_NODE)
+                return -FDT_ERR_BADOFFSET;
+        do {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+
+                switch (tag) {
+                case FDT_END:
+                        return offset;
+
+                case FDT_BEGIN_NODE:
+                        level++;
+                        break;
+
+                case FDT_END_NODE:
+                        level--;
+                        break;
+
+                case FDT_PROP:
+                case FDT_NOP:
+                        break;
+
+                default:
+                        return -FDT_ERR_BADSTRUCTURE;
+                }
+        } while (level >= 0);
+
+        return nextoffset;
 }
 
 int fdt_nop_node(void *fdt, int nodeoffset)
diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h
index 73f49759a5e..ff6246f000c 100644
--- a/scripts/dtc/libfdt/libfdt.h
+++ b/scripts/dtc/libfdt/libfdt.h
@@ -61,7 +61,7 @@
 #define FDT_ERR_NOTFOUND        1
         /* FDT_ERR_NOTFOUND: The requested node or property does not exist */
 #define FDT_ERR_EXISTS          2
-        /* FDT_ERR_EXISTS: Attemped to create a node or property which
+        /* FDT_ERR_EXISTS: Attempted to create a node or property which
          * already exists */
 #define FDT_ERR_NOSPACE         3
         /* FDT_ERR_NOSPACE: Operation needed to expand the device
@@ -122,7 +122,7 @@
 /* Low-level functions (you probably don't need these)                */
 /**********************************************************************/
 
-const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int checklen);
+const void *fdt_offset_ptr(const void *fdt, int offset, int checklen);
 static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)
 {
         return (void *)(uintptr_t)fdt_offset_ptr(fdt, offset, checklen);
@@ -156,7 +156,7 @@ int fdt_next_node(const void *fdt, int offset, int *depth);
 #define __fdt_set_hdr(name) \
         static inline void fdt_set_##name(void *fdt, uint32_t val) \
         { \
-                struct fdt_header *fdth = (struct fdt_header*)fdt; \
+                struct fdt_header *fdth = fdt; \
                 fdth->name = cpu_to_fdt32(val); \
         }
 __fdt_set_hdr(magic);
@@ -343,91 +343,6 @@ int fdt_path_offset(const void *fdt, const char *path);
 const char *fdt_get_name(const void *fdt, int nodeoffset, int *lenp);
 
 /**
- * fdt_first_property_offset - find the offset of a node's first property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: structure block offset of a node
- *
- * fdt_first_property_offset() finds the first property of the node at
- * the given structure block offset.
- *
- * returns:
- *      structure block offset of the property (>=0), on success
- *      -FDT_ERR_NOTFOUND, if the requested node has no properties
- *      -FDT_ERR_BADOFFSET, if nodeoffset did not point to an FDT_BEGIN_NODE tag
- *      -FDT_ERR_BADMAGIC,
- *      -FDT_ERR_BADVERSION,
- *      -FDT_ERR_BADSTATE,
- *      -FDT_ERR_BADSTRUCTURE,
- *      -FDT_ERR_TRUNCATED, standard meanings.
- */
-int fdt_first_property_offset(const void *fdt, int nodeoffset);
-
-/**
- * fdt_next_property_offset - step through a node's properties
- * @fdt: pointer to the device tree blob
- * @offset: structure block offset of a property
- *
- * fdt_next_property_offset() finds the property immediately after the
- * one at the given structure block offset.  This will be a property
- * of the same node as the given property.
- *
- * returns:
- *      structure block offset of the next property (>=0), on success
- *      -FDT_ERR_NOTFOUND, if the given property is the last in its node
- *      -FDT_ERR_BADOFFSET, if nodeoffset did not point to an FDT_PROP tag
- *      -FDT_ERR_BADMAGIC,
- *      -FDT_ERR_BADVERSION,
- *      -FDT_ERR_BADSTATE,
- *      -FDT_ERR_BADSTRUCTURE,
- *      -FDT_ERR_TRUNCATED, standard meanings.
- */
-int fdt_next_property_offset(const void *fdt, int offset);
-
-/**
- * fdt_get_property_by_offset - retrieve the property at a given offset
- * @fdt: pointer to the device tree blob
- * @offset: offset of the property to retrieve
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * fdt_get_property_by_offset() retrieves a pointer to the
- * fdt_property structure within the device tree blob at the given
- * offset.  If lenp is non-NULL, the length of the property value is
- * also returned, in the integer pointed to by lenp.
- *
- * returns:
- *      pointer to the structure representing the property
- *              if lenp is non-NULL, *lenp contains the length of the property
- *              value (>=0)
- *      NULL, on error
- *              if lenp is non-NULL, *lenp contains an error code (<0):
- *              -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_PROP tag
- *              -FDT_ERR_BADMAGIC,
- *              -FDT_ERR_BADVERSION,
- *              -FDT_ERR_BADSTATE,
- *              -FDT_ERR_BADSTRUCTURE,
- *              -FDT_ERR_TRUNCATED, standard meanings
- */
-const struct fdt_property *fdt_get_property_by_offset(const void *fdt,
-                                                      int offset,
-                                                      int *lenp);
-
-/**
- * fdt_get_property_namelen - find a property based on substring
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to find
- * @name: name of the property to find
- * @namelen: number of characters of name to consider
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * Identical to fdt_get_property_namelen(), but only examine the first
- * namelen characters of name for matching the property name.
- */
-const struct fdt_property *fdt_get_property_namelen(const void *fdt,
-                                                    int nodeoffset,
-                                                    const char *name,
-                                                    int namelen, int *lenp);
-
-/**
  * fdt_get_property - find a given property in a given node
  * @fdt: pointer to the device tree blob
  * @nodeoffset: offset of the node whose property to find
@@ -465,54 +380,6 @@ static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset,
 }
 
 /**
- * fdt_getprop_by_offset - retrieve the value of a property at a given offset
- * @fdt: pointer to the device tree blob
- * @ffset: offset of the property to read
- * @namep: pointer to a string variable (will be overwritten) or NULL
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * fdt_getprop_by_offset() retrieves a pointer to the value of the
- * property at structure block offset 'offset' (this will be a pointer
- * to within the device blob itself, not a copy of the value).  If
- * lenp is non-NULL, the length of the property value is also
- * returned, in the integer pointed to by lenp.  If namep is non-NULL,
- * the property's namne will also be returned in the char * pointed to
- * by namep (this will be a pointer to within the device tree's string
- * block, not a new copy of the name).
- *
- * returns:
- *      pointer to the property's value
- *              if lenp is non-NULL, *lenp contains the length of the property
- *              value (>=0)
- *              if namep is non-NULL *namep contiains a pointer to the property
- *              name.
- *      NULL, on error
- *              if lenp is non-NULL, *lenp contains an error code (<0):
- *              -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_PROP tag
- *              -FDT_ERR_BADMAGIC,
- *              -FDT_ERR_BADVERSION,
- *              -FDT_ERR_BADSTATE,
- *              -FDT_ERR_BADSTRUCTURE,
- *              -FDT_ERR_TRUNCATED, standard meanings
- */
-const void *fdt_getprop_by_offset(const void *fdt, int offset,
-                                  const char **namep, int *lenp);
-
-/**
- * fdt_getprop_namelen - get property value based on substring
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to find
- * @name: name of the property to find
- * @namelen: number of characters of name to consider
- * @lenp: pointer to an integer variable (will be overwritten) or NULL
- *
- * Identical to fdt_getprop(), but only examine the first namelen
- * characters of name for matching the property name.
- */
-const void *fdt_getprop_namelen(const void *fdt, int nodeoffset,
-                                const char *name, int namelen, int *lenp);
-
-/**
  * fdt_getprop - retrieve the value of a given property
  * @fdt: pointer to the device tree blob
  * @nodeoffset: offset of the node whose property to find
@@ -562,32 +429,6 @@ static inline void *fdt_getprop_w(void *fdt, int nodeoffset,
 uint32_t fdt_get_phandle(const void *fdt, int nodeoffset);
 
 /**
- * fdt_get_alias_namelen - get alias based on substring
- * @fdt: pointer to the device tree blob
- * @name: name of the alias th look up
- * @namelen: number of characters of name to consider
- *
- * Identical to fdt_get_alias(), but only examine the first namelen
- * characters of name for matching the alias name.
- */
-const char *fdt_get_alias_namelen(const void *fdt,
-                                  const char *name, int namelen);
-
-/**
- * fdt_get_alias - retreive the path referenced by a given alias
- * @fdt: pointer to the device tree blob
- * @name: name of the alias th look up
- *
- * fdt_get_alias() retrieves the value of a given alias.  That is, the
- * value of the property named 'name' in the node /aliases.
- *
- * returns:
- *      a pointer to the expansion of the alias named 'name', of it exists
- *      NULL, if the given alias or the /aliases node does not exist
- */
-const char *fdt_get_alias(const void *fdt, const char *name);
-
-/**
  * fdt_get_path - determine the full path of a node
  * @fdt: pointer to the device tree blob
  * @nodeoffset: offset of the node whose path to find
@@ -852,17 +693,17 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
                         const void *val, int len);
 
 /**
- * fdt_setprop_inplace_u32 - change the value of a 32-bit integer property
+ * fdt_setprop_inplace_cell - change the value of a single-cell property
  * @fdt: pointer to the device tree blob
  * @nodeoffset: offset of the node whose property to change
  * @name: name of the property to change
- * @val: 32-bit integer value to replace the property with
+ * @val: cell (32-bit integer) value to replace the property with
  *
- * fdt_setprop_inplace_u32() replaces the value of a given property
- * with the 32-bit integer value in val, converting val to big-endian
- * if necessary.  This function cannot change the size of a property,
- * and so will only work if the property already exists and has length
- * 4.
+ * fdt_setprop_inplace_cell() replaces the value of a given property
+ * with the 32-bit integer cell value in val, converting val to
+ * big-endian if necessary.  This function cannot change the size of a
+ * property, and so will only work if the property already exists and
+ * has length 4.
  *
  * This function will alter only the bytes in the blob which contain
  * the given property value, and will not alter or move any other part
@@ -871,42 +712,7 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
  * returns:
  *      0, on success
  *      -FDT_ERR_NOSPACE, if the property's length is not equal to 4
- *      -FDT_ERR_NOTFOUND, node does not have the named property
- *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *      -FDT_ERR_BADMAGIC,
- *      -FDT_ERR_BADVERSION,
- *      -FDT_ERR_BADSTATE,
- *      -FDT_ERR_BADSTRUCTURE,
- *      -FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_setprop_inplace_u32(void *fdt, int nodeoffset,
-                                          const char *name, uint32_t val)
-{
-        val = cpu_to_fdt32(val);
-        return fdt_setprop_inplace(fdt, nodeoffset, name, &val, sizeof(val));
-}
-
-/**
- * fdt_setprop_inplace_u64 - change the value of a 64-bit integer property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 64-bit integer value to replace the property with
- *
- * fdt_setprop_inplace_u64() replaces the value of a given property
- * with the 64-bit integer value in val, converting val to big-endian
- * if necessary.  This function cannot change the size of a property,
- * and so will only work if the property already exists and has length
- * 8.
- *
- * This function will alter only the bytes in the blob which contain
- * the given property value, and will not alter or move any other part
- * of the tree.
- *
- * returns:
- *      0, on success
- *      -FDT_ERR_NOSPACE, if the property's length is not equal to 8
- *      -FDT_ERR_NOTFOUND, node does not have the named property
+  *     -FDT_ERR_NOTFOUND, node does not have the named property
  *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
  *      -FDT_ERR_BADMAGIC,
  *      -FDT_ERR_BADVERSION,
@@ -914,22 +720,11 @@ static inline int fdt_setprop_inplace_u32(void *fdt, int nodeoffset,
  *      -FDT_ERR_BADSTRUCTURE,
  *      -FDT_ERR_TRUNCATED, standard meanings
  */
-static inline int fdt_setprop_inplace_u64(void *fdt, int nodeoffset,
-                                          const char *name, uint64_t val)
-{
-        val = cpu_to_fdt64(val);
-        return fdt_setprop_inplace(fdt, nodeoffset, name, &val, sizeof(val));
-}
-
-/**
- * fdt_setprop_inplace_cell - change the value of a single-cell property
- *
- * This is an alternative name for fdt_setprop_inplace_u32()
- */
 static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,
                                            const char *name, uint32_t val)
 {
-        return fdt_setprop_inplace_u32(fdt, nodeoffset, name, val);
+        val = cpu_to_fdt32(val);
+        return fdt_setprop_inplace(fdt, nodeoffset, name, &val, sizeof(val));
 }
 
 /**
@@ -991,20 +786,11 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size);
 int fdt_finish_reservemap(void *fdt);
 int fdt_begin_node(void *fdt, const char *name);
 int fdt_property(void *fdt, const char *name, const void *val, int len);
-static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val)
+static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)
 {
         val = cpu_to_fdt32(val);
         return fdt_property(fdt, name, &val, sizeof(val));
 }
-static inline int fdt_property_u64(void *fdt, const char *name, uint64_t val)
-{
-        val = cpu_to_fdt64(val);
-        return fdt_property(fdt, name, &val, sizeof(val));
-}
-static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)
-{
-        return fdt_property_u32(fdt, name, val);
-}
 #define fdt_property_string(fdt, name, str) \
         fdt_property(fdt, name, str, strlen(str)+1)
 int fdt_end_node(void *fdt);
@@ -1014,7 +800,6 @@ int fdt_finish(void *fdt);
 /* Read-write functions                                               */
 /**********************************************************************/
 
-int fdt_create_empty_tree(void *buf, int bufsize);
 int fdt_open_into(const void *fdt, void *buf, int bufsize);
 int fdt_pack(void *fdt);
 
@@ -1124,14 +909,14 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name,
                 const void *val, int len);
 
 /**
- * fdt_setprop_u32 - set a property to a 32-bit integer
+ * fdt_setprop_cell - set a property to a single cell value
  * @fdt: pointer to the device tree blob
  * @nodeoffset: offset of the node whose property to change
  * @name: name of the property to change
  * @val: 32-bit integer value for the property (native endian)
  *
- * fdt_setprop_u32() sets the value of the named property in the given
- * node to the given 32-bit integer value (converting to big-endian if
+ * fdt_setprop_cell() sets the value of the named property in the
+ * given node to the given cell value (converting to big-endian if
  * necessary), or creates a new property with that value if it does
  * not already exist.
  *
@@ -1151,57 +936,11 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name,
  *      -FDT_ERR_BADLAYOUT,
  *      -FDT_ERR_TRUNCATED, standard meanings
  */
-static inline int fdt_setprop_u32(void *fdt, int nodeoffset, const char *name,
-                                  uint32_t val)
-{
-        val = cpu_to_fdt32(val);
-        return fdt_setprop(fdt, nodeoffset, name, &val, sizeof(val));
-}
-
-/**
- * fdt_setprop_u64 - set a property to a 64-bit integer
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 64-bit integer value for the property (native endian)
- *
- * fdt_setprop_u64() sets the value of the named property in the given
- * node to the given 64-bit integer value (converting to big-endian if
- * necessary), or creates a new property with that value if it does
- * not already exist.
- *
- * This function may insert or delete data from the blob, and will
- * therefore change the offsets of some existing nodes.
- *
- * returns:
- *      0, on success
- *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *              contain the new property value
- *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_BADMAGIC,
- *      -FDT_ERR_BADVERSION,
- *      -FDT_ERR_BADSTATE,
- *      -FDT_ERR_BADSTRUCTURE,
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_setprop_u64(void *fdt, int nodeoffset, const char *name,
-                                  uint64_t val)
-{
-        val = cpu_to_fdt64(val);
-        return fdt_setprop(fdt, nodeoffset, name, &val, sizeof(val));
-}
-
-/**
- * fdt_setprop_cell - set a property to a single cell value
- *
- * This is an alternative name for fdt_setprop_u32()
- */
 static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name,
                                    uint32_t val)
 {
-        return fdt_setprop_u32(fdt, nodeoffset, name, val);
+        val = cpu_to_fdt32(val);
+        return fdt_setprop(fdt, nodeoffset, name, &val, sizeof(val));
 }
 
 /**
@@ -1236,147 +975,6 @@ static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name,
         fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
 
 /**
- * fdt_appendprop - append to or create a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to append to
- * @val: pointer to data to append to the property value
- * @len: length of the data to append to the property value
- *
- * fdt_appendprop() appends the value to the named property in the
- * given node, creating the property if it does not already exist.
- *
- * This function may insert data into the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *      0, on success
- *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *              contain the new property value
- *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_BADMAGIC,
- *      -FDT_ERR_BADVERSION,
- *      -FDT_ERR_BADSTATE,
- *      -FDT_ERR_BADSTRUCTURE,
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_TRUNCATED, standard meanings
- */
-int fdt_appendprop(void *fdt, int nodeoffset, const char *name,
-                   const void *val, int len);
-
-/**
- * fdt_appendprop_u32 - append a 32-bit integer value to a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 32-bit integer value to append to the property (native endian)
- *
- * fdt_appendprop_u32() appends the given 32-bit integer value
- * (converting to big-endian if necessary) to the value of the named
- * property in the given node, or creates a new property with that
- * value if it does not already exist.
- *
- * This function may insert data into the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *      0, on success
- *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *              contain the new property value
- *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_BADMAGIC,
- *      -FDT_ERR_BADVERSION,
- *      -FDT_ERR_BADSTATE,
- *      -FDT_ERR_BADSTRUCTURE,
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_appendprop_u32(void *fdt, int nodeoffset,
-                                     const char *name, uint32_t val)
-{
-        val = cpu_to_fdt32(val);
-        return fdt_appendprop(fdt, nodeoffset, name, &val, sizeof(val));
-}
-
-/**
- * fdt_appendprop_u64 - append a 64-bit integer value to a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @val: 64-bit integer value to append to the property (native endian)
- *
- * fdt_appendprop_u64() appends the given 64-bit integer value
- * (converting to big-endian if necessary) to the value of the named
- * property in the given node, or creates a new property with that
- * value if it does not already exist.
- *
- * This function may insert data into the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *      0, on success
- *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *              contain the new property value
- *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_BADMAGIC,
- *      -FDT_ERR_BADVERSION,
- *      -FDT_ERR_BADSTATE,
- *      -FDT_ERR_BADSTRUCTURE,
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_TRUNCATED, standard meanings
- */
-static inline int fdt_appendprop_u64(void *fdt, int nodeoffset,
-                                     const char *name, uint64_t val)
-{
-        val = cpu_to_fdt64(val);
-        return fdt_appendprop(fdt, nodeoffset, name, &val, sizeof(val));
-}
-
-/**
- * fdt_appendprop_cell - append a single cell value to a property
- *
- * This is an alternative name for fdt_appendprop_u32()
- */
-static inline int fdt_appendprop_cell(void *fdt, int nodeoffset,
-                                      const char *name, uint32_t val)
-{
-        return fdt_appendprop_u32(fdt, nodeoffset, name, val);
-}
-
-/**
- * fdt_appendprop_string - append a string to a property
- * @fdt: pointer to the device tree blob
- * @nodeoffset: offset of the node whose property to change
- * @name: name of the property to change
- * @str: string value to append to the property
- *
- * fdt_appendprop_string() appends the given string to the value of
- * the named property in the given node, or creates a new property
- * with that value if it does not already exist.
- *
- * This function may insert data into the blob, and will therefore
- * change the offsets of some existing nodes.
- *
- * returns:
- *      0, on success
- *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob to
- *              contain the new property value
- *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_BADMAGIC,
- *      -FDT_ERR_BADVERSION,
- *      -FDT_ERR_BADSTATE,
- *      -FDT_ERR_BADSTRUCTURE,
- *      -FDT_ERR_BADLAYOUT,
- *      -FDT_ERR_TRUNCATED, standard meanings
- */
-#define fdt_appendprop_string(fdt, nodeoffset, name, str) \
-        fdt_appendprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
-
-/**
  * fdt_delprop - delete a property
  * @fdt: pointer to the device tree blob
  * @nodeoffset: offset of the node whose property to nop
diff --git a/scripts/dtc/libfdt/libfdt_env.h b/scripts/dtc/libfdt/libfdt_env.h
index 213d7fb81c4..449bf602daf 100644
--- a/scripts/dtc/libfdt/libfdt_env.h
+++ b/scripts/dtc/libfdt/libfdt_env.h
@@ -5,25 +5,19 @@
 #include <stdint.h>
 #include <string.h>
 
-#define EXTRACT_BYTE(n) ((unsigned long long)((uint8_t *)&x)[n])
-static inline uint16_t fdt16_to_cpu(uint16_t x)
-{
-        return (EXTRACT_BYTE(0) << 8) | EXTRACT_BYTE(1);
-}
-#define cpu_to_fdt16(x) fdt16_to_cpu(x)
-
+#define _B(n)   ((unsigned long long)((uint8_t *)&x)[n])
 static inline uint32_t fdt32_to_cpu(uint32_t x)
 {
-        return (EXTRACT_BYTE(0) << 24) | (EXTRACT_BYTE(1) << 16) | (EXTRACT_BYTE(2) << 8) | EXTRACT_BYTE(3);
+        return (_B(0) << 24) | (_B(1) << 16) | (_B(2) << 8) | _B(3);
 }
 #define cpu_to_fdt32(x) fdt32_to_cpu(x)
 
 static inline uint64_t fdt64_to_cpu(uint64_t x)
 {
-        return (EXTRACT_BYTE(0) << 56) | (EXTRACT_BYTE(1) << 48) | (EXTRACT_BYTE(2) << 40) | (EXTRACT_BYTE(3) << 32)
-                | (EXTRACT_BYTE(4) << 24) | (EXTRACT_BYTE(5) << 16) | (EXTRACT_BYTE(6) << 8) | EXTRACT_BYTE(7);
+        return (_B(0) << 56) | (_B(1) << 48) | (_B(2) << 40) | (_B(3) << 32)
+                | (_B(4) << 24) | (_B(5) << 16) | (_B(6) << 8) | _B(7);
 }
 #define cpu_to_fdt64(x) fdt64_to_cpu(x)
-#undef EXTRACT_BYTE
+#undef _B
 
 #endif /* _LIBFDT_ENV_H */
diff --git a/scripts/dtc/libfdt/libfdt_internal.h b/scripts/dtc/libfdt/libfdt_internal.h
index 381133ba81d..46eb93e4af5 100644
--- a/scripts/dtc/libfdt/libfdt_internal.h
+++ b/scripts/dtc/libfdt/libfdt_internal.h
@@ -62,8 +62,8 @@
                         return err; \
         }
 
+uint32_t _fdt_next_tag(const void *fdt, int startoffset, int *nextoffset);
 int _fdt_check_node_offset(const void *fdt, int offset);
-int _fdt_check_prop_offset(const void *fdt, int offset);
 const char *_fdt_find_string(const char *strtab, int tabsize, const char *s);
 int _fdt_node_end_offset(void *fdt, int nodeoffset);
 
diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c
index b61465fb2f3..26d0e1e60c0 100644
--- a/scripts/dtc/livetree.c
+++ b/scripts/dtc/livetree.c
@@ -29,27 +29,16 @@ void add_label(struct label **labels, char *label)
         struct label *new;
 
         /* Make sure the label isn't already there */
-        for_each_label_withdel(*labels, new)
-                if (streq(new->label, label)) {
-                        new->deleted = 0;
+        for_each_label(*labels, new)
+                if (streq(new->label, label))
                         return;
-                }
 
         new = xmalloc(sizeof(*new));
-        memset(new, 0, sizeof(*new));
         new->label = label;
         new->next = *labels;
         *labels = new;
 }
 
-void delete_labels(struct label **labels)
-{
-        struct label *label;
-
-        for_each_label(*labels, label)
-                label->deleted = 1;
-}
-
 struct property *build_property(char *name, struct data val)
 {
         struct property *new = xmalloc(sizeof(*new));
@@ -62,18 +51,6 @@ struct property *build_property(char *name, struct data val)
         return new;
 }
 
-struct property *build_property_delete(char *name)
-{
-        struct property *new = xmalloc(sizeof(*new));
-
-        memset(new, 0, sizeof(*new));
-
-        new->name = name;
-        new->deleted = 1;
-
-        return new;
-}
-
 struct property *chain_property(struct property *first, struct property *list)
 {
         assert(first->next == NULL);
@@ -114,17 +91,6 @@ struct node *build_node(struct property *proplist, struct node *children)
         return new;
 }
 
-struct node *build_node_delete(void)
-{
-        struct node *new = xmalloc(sizeof(*new));
-
-        memset(new, 0, sizeof(*new));
-
-        new->deleted = 1;
-
-        return new;
-}
-
 struct node *name_node(struct node *node, char *name)
 {
         assert(node->name == NULL);
@@ -140,10 +106,8 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
         struct node *new_child, *old_child;
         struct label *l;
 
-        old_node->deleted = 0;
-
         /* Add new node labels to old node */
-        for_each_label_withdel(new_node->labels, l)
+        for_each_label(new_node->labels, l)
                 add_label(&old_node->labels, l->label);
 
         /* Move properties from the new node to the old node.  If there
@@ -154,21 +118,14 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
                 new_node->proplist = new_prop->next;
                 new_prop->next = NULL;
 
-                if (new_prop->deleted) {
-                        delete_property_by_name(old_node, new_prop->name);
-                        free(new_prop);
-                        continue;
-                }
-
                 /* Look for a collision, set new value if there is */
-                for_each_property_withdel(old_node, old_prop) {
+                for_each_property(old_node, old_prop) {
                         if (streq(old_prop->name, new_prop->name)) {
                                 /* Add new labels to old property */
-                                for_each_label_withdel(new_prop->labels, l)
+                                for_each_label(new_prop->labels, l)
                                         add_label(&old_prop->labels, l->label);
 
                                 old_prop->val = new_prop->val;
-                                old_prop->deleted = 0;
                                 free(new_prop);
                                 new_prop = NULL;
                                 break;
@@ -189,14 +146,8 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
                 new_child->parent = NULL;
                 new_child->next_sibling = NULL;
 
-                if (new_child->deleted) {
-                        delete_node_by_name(old_node, new_child->name);
-                        free(new_child);
-                        continue;
-                }
-
                 /* Search for a collision.  Merge if there is */
-                for_each_child_withdel(old_node, old_child) {
+                for_each_child(old_node, old_child) {
                         if (streq(old_child->name, new_child->name)) {
                                 merge_nodes(old_child, new_child);
                                 new_child = NULL;
@@ -204,7 +155,7 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
                         }
                 }
 
-                /* if no collision occured, add child to the old node. */
+                /* if no collision occurred, add child to the old node. */
                 if (new_child)
                         add_child(old_node, new_child);
         }
@@ -237,25 +188,6 @@ void add_property(struct node *node, struct property *prop)
         *p = prop;
 }
 
-void delete_property_by_name(struct node *node, char *name)
-{
-        struct property *prop = node->proplist;
-
-        while (prop) {
-                if (!strcmp(prop->name, name)) {
-                        delete_property(prop);
-                        return;
-                }
-                prop = prop->next;
-        }
-}
-
-void delete_property(struct property *prop)
-{
-        prop->deleted = 1;
-        delete_labels(&prop->labels);
-}
-
 void add_child(struct node *parent, struct node *child)
 {
         struct node **p;
@@ -270,32 +202,6 @@ void add_child(struct node *parent, struct node *child)
         *p = child;
 }
 
-void delete_node_by_name(struct node *parent, char *name)
-{
-        struct node *node = parent->children;
-
-        while (node) {
-                if (!strcmp(node->name, name)) {
-                        delete_node(node);
-                        return;
-                }
-                node = node->next_sibling;
-        }
-}
-
-void delete_node(struct node *node)
-{
-        struct property *prop;
-        struct node *child;
-
-        node->deleted = 1;
-        for_each_child(node, child)
-                delete_node(child);
-        for_each_property(node, prop)
-                delete_property(prop);
-        delete_labels(&node->labels);
-}
-
 struct reserve_info *build_reserve_entry(uint64_t address, uint64_t size)
 {
         struct reserve_info *new = xmalloc(sizeof(*new));
@@ -447,11 +353,8 @@ struct node *get_node_by_path(struct node *tree, const char *path)
         const char *p;
         struct node *child;
 
-        if (!path || ! (*path)) {
-                if (tree->deleted)
-                        return NULL;
+        if (!path || ! (*path))
                 return tree;
-        }
 
         while (path[0] == '/')
                 path++;
@@ -494,11 +397,8 @@ struct node *get_node_by_phandle(struct node *tree, cell_t phandle)
 
         assert((phandle != 0) && (phandle != -1));
 
-        if (tree->phandle == phandle) {
-                if (tree->deleted)
-                        return NULL;
+        if (tree->phandle == phandle)
                 return tree;
-        }
 
         for_each_child(tree, child) {
                 node = get_node_by_phandle(child, phandle);
@@ -635,7 +535,7 @@ static void sort_properties(struct node *node)
         int n = 0, i = 0;
         struct property *prop, **tbl;
 
-        for_each_property_withdel(node, prop)
+        for_each_property(node, prop)
                 n++;
 
         if (n == 0)
@@ -643,7 +543,7 @@ static void sort_properties(struct node *node)
 
         tbl = xmalloc(n * sizeof(*tbl));
 
-        for_each_property_withdel(node, prop)
+        for_each_property(node, prop)
                 tbl[i++] = prop;
 
         qsort(tbl, n, sizeof(*tbl), cmp_prop);
@@ -671,7 +571,7 @@ static void sort_subnodes(struct node *node)
         int n = 0, i = 0;
         struct node *subnode, **tbl;
 
-        for_each_child_withdel(node, subnode)
+        for_each_child(node, subnode)
                 n++;
 
         if (n == 0)
@@ -679,7 +579,7 @@ static void sort_subnodes(struct node *node)
 
         tbl = xmalloc(n * sizeof(*tbl));
 
-        for_each_child_withdel(node, subnode)
+        for_each_child(node, subnode)
                 tbl[i++] = subnode;
 
         qsort(tbl, n, sizeof(*tbl), cmp_subnode);
@@ -698,7 +598,7 @@ static void sort_node(struct node *node)
 
         sort_properties(node);
         sort_subnodes(node);
-        for_each_child_withdel(node, c)
+        for_each_child(node, c)
                 sort_node(c);
 }
 
diff --git a/scripts/dtc/srcpos.c b/scripts/dtc/srcpos.c
index 246ab4bc0d9..2dbc874288c 100644
--- a/scripts/dtc/srcpos.c
+++ b/scripts/dtc/srcpos.c
@@ -24,15 +24,6 @@
 #include "dtc.h"
 #include "srcpos.h"
 
-/* A node in our list of directories to search for source/include files */
-struct search_path {
-        struct search_path *next;       /* next node in list, NULL for end */
-        const char *dirname;            /* name of directory to search */
-};
-
-/* This is the list of directories that we search for source files */
-static struct search_path *search_path_head, **search_path_tail;
-
 
 static char *dirname(const char *path)
 {
@@ -49,71 +40,12 @@ static char *dirname(const char *path)
         return NULL;
 }
 
-FILE *depfile; /* = NULL */
 struct srcfile_state *current_srcfile; /* = NULL */
 
 /* Detect infinite include recursion. */
 #define MAX_SRCFILE_DEPTH     (100)
 static int srcfile_depth; /* = 0 */
 
-
-/**
- * Try to open a file in a given directory.
- *
- * If the filename is an absolute path, then dirname is ignored. If it is a
- * relative path, then we look in that directory for the file.
- *
- * @param dirname       Directory to look in, or NULL for none
- * @param fname         Filename to look for
- * @param fp            Set to NULL if file did not open
- * @return allocated filename on success (caller must free), NULL on failure
- */
-static char *try_open(const char *dirname, const char *fname, FILE **fp)
-{
-        char *fullname;
-
-        if (!dirname || fname[0] == '/')
-                fullname = xstrdup(fname);
-        else
-                fullname = join_path(dirname, fname);
-
-        *fp = fopen(fullname, "r");
-        if (!*fp) {
-                free(fullname);
-                fullname = NULL;
-        }
-
-        return fullname;
-}
-
-/**
- * Open a file for read access
- *
- * If it is a relative filename, we search the full search path for it.
- *
- * @param fname Filename to open
- * @param fp    Returns pointer to opened FILE, or NULL on failure
- * @return pointer to allocated filename, which caller must free
- */
-static char *fopen_any_on_path(const char *fname, FILE **fp)
-{
-        const char *cur_dir = NULL;
-        struct search_path *node;
-        char *fullname;
-
-        /* Try current directory first */
-        assert(fp);
-        if (current_srcfile)
-                cur_dir = current_srcfile->dir;
-        fullname = try_open(cur_dir, fname, fp);
-
-        /* Failing that, try each search path in turn */
-        for (node = search_path_head; !*fp && node; node = node->next)
-                fullname = try_open(node->dirname, fname, fp);
-
-        return fullname;
-}
-
 FILE *srcfile_relative_open(const char *fname, char **fullnamep)
 {
         FILE *f;
@@ -123,15 +55,18 @@ FILE *srcfile_relative_open(const char *fname, char **fullnamep)
                 f = stdin;
                 fullname = xstrdup("<stdin>");
         } else {
-                fullname = fopen_any_on_path(fname, &f);
+                if (!current_srcfile || !current_srcfile->dir
+                    || (fname[0] == '/'))
+                        fullname = xstrdup(fname);
+                else
+                        fullname = join_path(current_srcfile->dir, fname);
+
+                f = fopen(fullname, "r");
                 if (!f)
                         die("Couldn't open \"%s\": %s\n", fname,
                             strerror(errno));
         }
 
-        if (depfile)
-                fprintf(depfile, " %s", fullname);
-
         if (fullnamep)
                 *fullnamep = fullname;
         else
@@ -180,23 +115,6 @@ int srcfile_pop(void)
         return current_srcfile ? 1 : 0;
 }
 
-void srcfile_add_search_path(const char *dirname)
-{
-        struct search_path *node;
-
-        /* Create the node */
-        node = xmalloc(sizeof(*node));
-        node->next = NULL;
-        node->dirname = xstrdup(dirname);
-
-        /* Add to the end of our list */
-        if (search_path_tail)
-                *search_path_tail = node;
-        else
-                search_path_head = node;
-        search_path_tail = &node->next;
-}
-
 /*
  * The empty source position.
  */
@@ -328,9 +246,3 @@ srcpos_warn(struct srcpos *pos, char const *fmt, ...)
 
         va_end(va);
 }
-
-void srcpos_set_line(char *f, int l)
-{
-        current_srcfile->name = f;
-        current_srcfile->lineno = l;
-}
diff --git a/scripts/dtc/srcpos.h b/scripts/dtc/srcpos.h
index 93a27123c2e..bd7966e56a5 100644
--- a/scripts/dtc/srcpos.h
+++ b/scripts/dtc/srcpos.h
@@ -30,42 +30,12 @@ struct srcfile_state {
         struct srcfile_state *prev;
 };
 
-extern FILE *depfile; /* = NULL */
 extern struct srcfile_state *current_srcfile; /* = NULL */
 
-/**
- * Open a source file.
- *
- * If the source file is a relative pathname, then it is searched for in the
- * current directory (the directory of the last source file read) and after
- * that in the search path.
- *
- * We work through the search path in order from the first path specified to
- * the last.
- *
- * If the file is not found, then this function does not return, but calls
- * die().
- *
- * @param fname         Filename to search
- * @param fullnamep     If non-NULL, it is set to the allocated filename of the
- *                      file that was opened. The caller is then responsible
- *                      for freeing the pointer.
- * @return pointer to opened FILE
- */
 FILE *srcfile_relative_open(const char *fname, char **fullnamep);
-
 void srcfile_push(const char *fname);
 int srcfile_pop(void);
 
-/**
- * Add a new directory to the search path for input files
- *
- * The new path is added at the end of the list.
- *
- * @param dirname       Directory to add
- */
-void srcfile_add_search_path(const char *dirname);
-
 struct srcpos {
     int first_line;
     int first_column;
@@ -113,6 +83,4 @@ extern void srcpos_error(struct srcpos *pos, char const *, ...)
 extern void srcpos_warn(struct srcpos *pos, char const *, ...)
      __attribute__((format(printf, 2, 3)));
 
-extern void srcpos_set_line(char *f, int l);
-
 #endif /* _SRCPOS_H_ */
diff --git a/scripts/dtc/treesource.c b/scripts/dtc/treesource.c
index 33eeba55fb4..c09aafade31 100644
--- a/scripts/dtc/treesource.c
+++ b/scripts/dtc/treesource.c
@@ -23,7 +23,6 @@
 
 extern FILE *yyin;
 extern int yyparse(void);
-extern YYLTYPE yylloc;
 
 struct boot_info *the_boot_info;
 int treesource_error;
@@ -35,7 +34,6 @@ struct boot_info *dt_from_source(const char *fname)
 
         srcfile_push(fname);
         yyin = current_srcfile->f;
-        yylloc.file = current_srcfile;
 
         if (yyparse() != 0)
                 die("Unable to parse input tree\n");
diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c
index 2422c34e11d..d7ac27d2ae1 100644
--- a/scripts/dtc/util.c
+++ b/scripts/dtc/util.c
@@ -1,10 +1,6 @@
 /*
- * Copyright 2011 The Chromium Authors, All Rights Reserved.
  * Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
  *
- * util_is_printable_string contributed by
- *      Pantelis Antoniou <pantelis.antoniou AT gmail.com>
- *
  * 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
@@ -21,18 +17,11 @@
  *                                                                   USA
  */
 
-#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <assert.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
 
-#include "libfdt.h"
 #include "util.h"
 
 char *xstrdup(const char *s)
@@ -68,264 +57,3 @@ char *join_path(const char *path, const char *name)
         memcpy(str+lenp, name, lenn+1);
         return str;
 }
-
-int util_is_printable_string(const void *data, int len)
-{
-        const char *s = data;
-        const char *ss;
-
-        /* zero length is not */
-        if (len == 0)
-                return 0;
-
-        /* must terminate with zero */
-        if (s[len - 1] != '\0')
-                return 0;
-
-        ss = s;
-        while (*s && isprint(*s))
-                s++;
-
-        /* not zero, or not done yet */
-        if (*s != '\0' || (s + 1 - ss) < len)
-                return 0;
-
-        return 1;
-}
-
-/*
- * Parse a octal encoded character starting at index i in string s.  The
- * resulting character will be returned and the index i will be updated to
- * point at the character directly after the end of the encoding, this may be
- * the '\0' terminator of the string.
- */
-static char get_oct_char(const char *s, int *i)
-{
-        char x[4];
-        char *endx;
-        long val;
-
-        x[3] = '\0';
-        strncpy(x, s + *i, 3);
-
-        val = strtol(x, &endx, 8);
-
-        assert(endx > x);
-
-        (*i) += endx - x;
-        return val;
-}
-
-/*
- * Parse a hexadecimal encoded character starting at index i in string s.  The
- * resulting character will be returned and the index i will be updated to
- * point at the character directly after the end of the encoding, this may be
- * the '\0' terminator of the string.
- */
-static char get_hex_char(const char *s, int *i)
-{
-        char x[3];
-        char *endx;
-        long val;
-
-        x[2] = '\0';
-        strncpy(x, s + *i, 2);
-
-        val = strtol(x, &endx, 16);
-        if (!(endx  > x))
-                die("\\x used with no following hex digits\n");
-
-        (*i) += endx - x;
-        return val;
-}
-
-char get_escape_char(const char *s, int *i)
-{
-        char    c = s[*i];
-        int     j = *i + 1;
-        char    val;
-
-        assert(c);
-        switch (c) {
-        case 'a':
-                val = '\a';
-                break;
-        case 'b':
-                val = '\b';
-                break;
-        case 't':
-                val = '\t';
-                break;
-        case 'n':
-                val = '\n';
-                break;
-        case 'v':
-                val = '\v';
-                break;
-        case 'f':
-                val = '\f';
-                break;
-        case 'r':
-                val = '\r';
-                break;
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-                j--; /* need to re-read the first digit as
-                      * part of the octal value */
-                val = get_oct_char(s, &j);
-                break;
-        case 'x':
-                val = get_hex_char(s, &j);
-                break;
-        default:
-                val = c;
-        }
-
-        (*i) = j;
-        return val;
-}
-
-int utilfdt_read_err(const char *filename, char **buffp)
-{
-        int fd = 0;     /* assume stdin */
-        char *buf = NULL;
-        off_t bufsize = 1024, offset = 0;
-        int ret = 0;
-
-        *buffp = NULL;
-        if (strcmp(filename, "-") != 0) {
-                fd = open(filename, O_RDONLY);
-                if (fd < 0)
-                        return errno;
-        }
-
-        /* Loop until we have read everything */
-        buf = malloc(bufsize);
-        do {
-                /* Expand the buffer to hold the next chunk */
-                if (offset == bufsize) {
-                        bufsize *= 2;
-                        buf = realloc(buf, bufsize);
-                        if (!buf) {
-                                ret = ENOMEM;
-                                break;
-                        }
-                }
-
-                ret = read(fd, &buf[offset], bufsize - offset);
-                if (ret < 0) {
-                        ret = errno;
-                        break;
-                }
-                offset += ret;
-        } while (ret != 0);
-
-        /* Clean up, including closing stdin; return errno on error */
-        close(fd);
-        if (ret)
-                free(buf);
-        else
-                *buffp = buf;
-        return ret;
-}
-
-char *utilfdt_read(const char *filename)
-{
-        char *buff;
-        int ret = utilfdt_read_err(filename, &buff);
-
-        if (ret) {
-                fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename,
-                        strerror(ret));
-                return NULL;
-        }
-        /* Successful read */
-        return buff;
-}
-
-int utilfdt_write_err(const char *filename, const void *blob)
-{
-        int fd = 1;     /* assume stdout */
-        int totalsize;
-        int offset;
-        int ret = 0;
-        const char *ptr = blob;
-
-        if (strcmp(filename, "-") != 0) {
-                fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-                if (fd < 0)
-                        return errno;
-        }
-
-        totalsize = fdt_totalsize(blob);
-        offset = 0;
-
-        while (offset < totalsize) {
-                ret = write(fd, ptr + offset, totalsize - offset);
-                if (ret < 0) {
-                        ret = -errno;
-                        break;
-                }
-                offset += ret;
-        }
-        /* Close the file/stdin; return errno on error */
-        if (fd != 1)
-                close(fd);
-        return ret < 0 ? -ret : 0;
-}
-
-
-int utilfdt_write(const char *filename, const void *blob)
-{
-        int ret = utilfdt_write_err(filename, blob);
-
-        if (ret) {
-                fprintf(stderr, "Couldn't write blob to '%s': %s\n", filename,
-                        strerror(ret));
-        }
-        return ret ? -1 : 0;
-}
-
-int utilfdt_decode_type(const char *fmt, int *type, int *size)
-{
-        int qualifier = 0;
-
-        if (!*fmt)
-                return -1;
-
-        /* get the conversion qualifier */
-        *size = -1;
-        if (strchr("hlLb", *fmt)) {
-                qualifier = *fmt++;
-                if (qualifier == *fmt) {
-                        switch (*fmt++) {
-/* TODO:                case 'l': qualifier = 'L'; break;*/
-                        case 'h':
-                                qualifier = 'b';
-                                break;
-                        }
-                }
-        }
-
-        /* we should now have a type */
-        if ((*fmt == '\0') || !strchr("iuxs", *fmt))
-                return -1;
-
-        /* convert qualifier (bhL) to byte size */
-        if (*fmt != 's')
-                *size = qualifier == 'b' ? 1 :
-                                qualifier == 'h' ? 2 :
-                                qualifier == 'l' ? 4 : -1;
-        *type = *fmt++;
-
-        /* that should be it! */
-        if (*fmt)
-                return -1;
-        return 0;
-}
diff --git a/scripts/dtc/util.h b/scripts/dtc/util.h
index c8eb45d9f04..9cead842c11 100644
--- a/scripts/dtc/util.h
+++ b/scripts/dtc/util.h
@@ -1,10 +1,7 @@
 #ifndef _UTIL_H
 #define _UTIL_H
 
-#include <stdarg.h>
-
 /*
- * Copyright 2011 The Chromium Authors, All Rights Reserved.
  * Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute it and/or
@@ -56,98 +53,4 @@ static inline void *xrealloc(void *p, size_t len)
 extern char *xstrdup(const char *s);
 extern char *join_path(const char *path, const char *name);
 
-/**
- * Check a string of a given length to see if it is all printable and
- * has a valid terminator.
- *
- * @param data  The string to check
- * @param len   The string length including terminator
- * @return 1 if a valid printable string, 0 if not */
-int util_is_printable_string(const void *data, int len);
-
-/*
- * Parse an escaped character starting at index i in string s.  The resulting
- * character will be returned and the index i will be updated to point at the
- * character directly after the end of the encoding, this may be the '\0'
- * terminator of the string.
- */
-char get_escape_char(const char *s, int *i);
-
-/**
- * Read a device tree file into a buffer. This will report any errors on
- * stderr.
- *
- * @param filename      The filename to read, or - for stdin
- * @return Pointer to allocated buffer containing fdt, or NULL on error
- */
-char *utilfdt_read(const char *filename);
-
-/**
- * Read a device tree file into a buffer. Does not report errors, but only
- * returns them. The value returned can be passed to strerror() to obtain
- * an error message for the user.
- *
- * @param filename      The filename to read, or - for stdin
- * @param buffp         Returns pointer to buffer containing fdt
- * @return 0 if ok, else an errno value representing the error
- */
-int utilfdt_read_err(const char *filename, char **buffp);
-
-
-/**
- * Write a device tree buffer to a file. This will report any errors on
- * stderr.
- *
- * @param filename      The filename to write, or - for stdout
- * @param blob          Poiner to buffer containing fdt
- * @return 0 if ok, -1 on error
- */
-int utilfdt_write(const char *filename, const void *blob);
-
-/**
- * Write a device tree buffer to a file. Does not report errors, but only
- * returns them. The value returned can be passed to strerror() to obtain
- * an error message for the user.
- *
- * @param filename      The filename to write, or - for stdout
- * @param blob          Poiner to buffer containing fdt
- * @return 0 if ok, else an errno value representing the error
- */
-int utilfdt_write_err(const char *filename, const void *blob);
-
-/**
- * Decode a data type string. The purpose of this string
- *
- * The string consists of an optional character followed by the type:
- *      Modifier characters:
- *              hh or b 1 byte
- *              h       2 byte
- *              l       4 byte, default
- *
- *      Type character:
- *              s       string
- *              i       signed integer
- *              u       unsigned integer
- *              x       hex
- *
- * TODO: Implement ll modifier (8 bytes)
- * TODO: Implement o type (octal)
- *
- * @param fmt           Format string to process
- * @param type          Returns type found(s/d/u/x), or 0 if none
- * @param size          Returns size found(1,2,4,8) or 4 if none
- * @return 0 if ok, -1 on error (no type given, or other invalid format)
- */
-int utilfdt_decode_type(const char *fmt, int *type, int *size);
-
-/*
- * This is a usage message fragment for the -t option. It is the format
- * supported by utilfdt_decode_type.
- */
-
-#define USAGE_TYPE_MSG \
-        "<type>\ts=string, i=int, u=unsigned, x=hex\n" \
-        "\tOptional modifier prefix:\n" \
-        "\t\thh or b=byte, h=2 byte, l=4 byte (default)\n";
-
 #endif /* _UTIL_H */
diff --git a/scripts/extract-vmlinux b/scripts/extract-vmlinux
deleted file mode 100755
index 5061abcc254..00000000000
--- a/scripts/extract-vmlinux
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------
-# extract-vmlinux - Extract uncompressed vmlinux from a kernel image
-#
-# Inspired from extract-ikconfig
-# (c) 2009,2010 Dick Streefland <dick@streefland.net>
-#
-# (c) 2011      Corentin Chary <corentin.chary@gmail.com>
-#
-# Licensed under the GNU General Public License, version 2 (GPLv2).
-# ----------------------------------------------------------------------
-
-check_vmlinux()
-{
-        # Use readelf to check if it's a valid ELF
-        # TODO: find a better to way to check that it's really vmlinux
-        #       and not just an elf
-        readelf -h $1 > /dev/null 2>&1 || return 1
-
-        cat $1
-        exit 0
-}
-
-try_decompress()
-{
-        # The obscure use of the "tr" filter is to work around older versions of
-        # "grep" that report the byte offset of the line instead of the pattern.
-
-        # Try to find the header ($1) and decompress from here
-        for     pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"`
-        do
-                pos=${pos%%:*}
-                tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
-                check_vmlinux $tmp
-        done
-}
-
-# Check invocation:
-me=${0##*/}
-img=$1
-if      [ $# -ne 1 -o ! -s "$img" ]
-then
-        echo "Usage: $me <kernel-image>" >&2
-        exit 2
-fi
-
-# Prepare temp files:
-tmp=$(mktemp /tmp/vmlinux-XXX)
-trap "rm -f $tmp" 0
-
-# Initial attempt for uncompressed images or objects:
-check_vmlinux $img
-
-# That didn't work, so retry after decompression.
-try_decompress '\037\213\010' xy    gunzip
-try_decompress '\3757zXZ\000' abcde unxz
-try_decompress 'BZh'          xy    bunzip2
-try_decompress '\135\0\0\0'   xxx   unlzma
-try_decompress '\211\114\132' xy    'lzop -d'
-
-# Bail out:
-echo "$me: Cannot find vmlinux." >&2
diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh
index a2af2e88daf..98cffcb941e 100644
--- a/scripts/gcc-goto.sh
+++ b/scripts/gcc-goto.sh
@@ -2,20 +2,4 @@
 # Test for gcc 'asm goto' support
 # Copyright (C) 2010, Jason Baron <jbaron@redhat.com>
 
-cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
-int main(void)
-{
-#ifdef __arm__
-        /*
-         * Not related to asm goto, but used by jump label
-         * and broken on some ARM GCC versions (see GCC Bug 48637).
-         */
-        static struct { int dummy; int state; } tp;
-        asm (".long %c0" :: "i" (&tp.state));
-#endif
-
-entry:
-        asm goto ("" :::: entry);
-        return 0;
-}
-END
+echo "int main(void) { entry: asm goto (\"\"::::entry); return 0; }" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
diff --git a/scripts/gcc-version.sh b/scripts/gcc-version.sh
index 7f2126df91f..debecb5561c 100644
--- a/scripts/gcc-version.sh
+++ b/scripts/gcc-version.sh
@@ -22,10 +22,10 @@ if [ ${#compiler} -eq 0 ]; then
         exit 1
 fi
 
-MAJOR=$(echo __GNUC__ | $compiler -E -x c - | tail -n 1)
-MINOR=$(echo __GNUC_MINOR__ | $compiler -E -x c - | tail -n 1)
+MAJOR=$(echo __GNUC__ | $compiler -E -xc - | tail -n 1)
+MINOR=$(echo __GNUC_MINOR__ | $compiler -E -xc - | tail -n 1)
 if [ "x$with_patchlevel" != "x" ] ; then
-        PATCHLEVEL=$(echo __GNUC_PATCHLEVEL__ | $compiler -E -x c - | tail -n 1)
+        PATCHLEVEL=$(echo __GNUC_PATCHLEVEL__ | $compiler -E -xc - | tail -n 1)
         printf "%02d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
 else
         printf "%02d%02d\\n" $MAJOR $MINOR
diff --git a/scripts/gcc-x86_32-has-stack-protector.sh b/scripts/gcc-x86_32-has-stack-protector.sh
index 12dbd0b11ea..29493dc4528 100644
--- a/scripts/gcc-x86_32-has-stack-protector.sh
+++ b/scripts/gcc-x86_32-has-stack-protector.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -xc -c -O0 -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
 if [ "$?" -eq "0" ] ; then
         echo y
 else
diff --git a/scripts/gcc-x86_64-has-stack-protector.sh b/scripts/gcc-x86_64-has-stack-protector.sh
index 973e8c14156..afaec618b39 100644
--- a/scripts/gcc-x86_64-has-stack-protector.sh
+++ b/scripts/gcc-x86_64-has-stack-protector.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -xc -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
 if [ "$?" -eq "0" ] ; then
         echo y
 else
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 8b673dd4627..4594f334105 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -83,8 +83,6 @@ push(@signature_tags, "Signed-off-by:");
 push(@signature_tags, "Reviewed-by:");
 push(@signature_tags, "Acked-by:");
 
-my $signature_pattern = "\(" . join("|", @signature_tags) . "\)";
-
 # rfc822 email address - preloaded methods go here.
 my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])";
 my $rfc822_char = '[\\000-\\377]';
@@ -97,7 +95,7 @@ my %VCS_cmds_git = (
     "execute_cmd" => \&git_execute_cmd,
     "available" => '(which("git") ne "") && (-d ".git")',
     "find_signers_cmd" =>
-        "git log --no-color --follow --since=\$email_git_since " .
+        "git log --no-color --since=\$email_git_since " .
             '--format="GitCommit: %H%n' .
                       'GitAuthor: %an <%ae>%n' .
                       'GitDate: %aD%n' .
@@ -475,6 +473,7 @@ my @subsystem = ();
 my @status = ();
 my %deduplicate_name_hash = ();
 my %deduplicate_address_hash = ();
+my $signature_pattern;
 
 my @maintainers = get_maintainers();
 
@@ -932,7 +931,7 @@ sub get_maintainer_role {
     my $start = find_starting_index($index);
     my $end = find_ending_index($index);
 
-    my $role = "unknown";
+    my $role;
     my $subsystem = $typevalue[$start];
     if (length($subsystem) > 20) {
         $subsystem = substr($subsystem, 0, 17);
@@ -1028,13 +1027,8 @@ sub add_categories {
                     if ($email_list) {
                         if (!$hash_list_to{lc($list_address)}) {
                             $hash_list_to{lc($list_address)} = 1;
-                            if ($list_additional =~ m/moderated/) {
-                                push(@list_to, [$list_address,
-                                                "moderated list${list_role}"]);
-                            } else {
-                                push(@list_to, [$list_address,
-                                                "open list${list_role}"]);
-                            }
+                            push(@list_to, [$list_address,
+                                            "open list${list_role}"]);
                         }
                     }
                 }
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index 64ac2380e4d..7957e7a5166 100644
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -19,7 +19,6 @@
 # 3) Check for leaked CONFIG_ symbols
 
 use strict;
-use File::Basename;
 
 my ($dir, $arch, @files) = @ARGV;
 
@@ -100,39 +99,6 @@ sub check_asm_types
 }
 
 my $linux_types;
-my %import_stack = ();
-sub check_include_typesh
-{
-        my $path = $_[0];
-        my $import_path;
-
-        my $fh;
-        my @file_paths = ($path, $dir . "/" .  $path, dirname($filename) . "/" . $path);
-        for my $possible ( @file_paths ) {
-            if (not $import_stack{$possible} and open($fh, '<', $possible)) {
-                $import_path = $possible;
-                $import_stack{$import_path} = 1;
-                last;
-            }
-        }
-        if (eof $fh) {
-            return;
-        }
-
-        my $line;
-        while ($line = <$fh>) {
-                if ($line =~ m/^\s*#\s*include\s+<linux\/types.h>/) {
-                        $linux_types = 1;
-                        last;
-                }
-                if (my $included = ($line =~ /^\s*#\s*include\s+[<"](\S+)[>"]/)[0]) {
-                        check_include_typesh($included);
-                }
-        }
-        close $fh;
-        delete $import_stack{$import_path};
-}
-
 sub check_sizetypes
 {
         if ($filename =~ /types.h|int-l64.h|int-ll64.h/o) {
@@ -147,9 +113,6 @@ sub check_sizetypes
                 $linux_types = 1;
                 return;
         }
-        if (my $included = ($line =~ /^\s*#\s*include\s+[<"](\S+)[>"]/)[0]) {
-                check_include_typesh($included);
-        }
         if ($line =~ m/__[us](8|16|32|64)\b/) {
                 printf STDERR "$filename:$lineno: " .
                               "found __[us]{8,16,32,64} type " .
@@ -159,3 +122,4 @@ sub check_sizetypes
                 #$ret = 1;
         }
 }
+
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index 581ca99c96f..48462be328b 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -4,7 +4,8 @@
 # user space and copy the files to their destination.
 #
 # Usage: headers_install.pl readdir installdir arch [files...]
-# installdir: dir to install the files to
+# readdir:    dir to open files
+# installdir: dir to install the files
 # arch:       current architecture
 #             arch is used to force a reinstallation when the arch
 #             changes because kbuild then detect a command line change.
@@ -17,18 +18,15 @@
 
 use strict;
 
-my ($installdir, $arch, @files) = @ARGV;
+my ($readdir, $installdir, $arch, @files) = @ARGV;
 
 my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__";
 
-foreach my $filename (@files) {
-        my $file = $filename;
-        $file =~ s!^.*/!!;
-
+foreach my $file (@files) {
         my $tmpfile = "$installdir/$file.tmp";
 
-        open(my $in, '<', $filename)
-            or die "$filename: $!\n";
+        open(my $in, '<', "$readdir/$file")
+            or die "$readdir/$file: $!\n";
         open(my $out, '>', $tmpfile)
             or die "$tmpfile: $!\n";
         while (my $line = <$in>) {
@@ -42,9 +40,6 @@ foreach my $filename (@files) {
                 $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
                 $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
                 $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
-                $line =~ s/#ifndef\s+_UAPI/#ifndef /;
-                $line =~ s/#define\s+_UAPI/#define /;
-                $line =~ s!#endif\s+/[*]\s*_UAPI!#endif /* !;
                 printf {$out} "%s", $line;
         }
         close $out;
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 3091794e935..82d2eb285b7 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -33,9 +33,17 @@ silentoldconfig: $(obj)/conf
         $(Q)mkdir -p include/generated
         $< --$@ $(Kconfig)
 
-localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+# if no path is given, then use src directory to find file
+ifdef LSMOD
+LSMOD_F := $(LSMOD)
+ifeq ($(findstring /,$(LSMOD)),)
+  LSMOD_F := $(objtree)/$(LSMOD)
+endif
+endif
+
+localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
         $(Q)mkdir -p include/generated
-        $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
+        $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
         $(Q)if [ -f .config ]; then                                     \
                         cmp -s .tmp.config .config ||                   \
                         (mv -f .config .config.old.1;                   \
@@ -48,10 +56,27 @@ localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
         fi
         $(Q)rm -f .tmp.config
 
+localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
+        $(Q)mkdir -p include/generated
+        $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
+        $(Q)sed -i s/=m/=y/ .tmp.config
+        $(Q)if [ -f .config ]; then                                     \
+                        cmp -s .tmp.config .config ||                   \
+                        (mv -f .config .config.old.1;                   \
+                         mv -f .tmp.config .config;                     \
+                         $(obj)/conf --silentoldconfig $(Kconfig);      \
+                         mv -f .config.old.1 .config.old)               \
+        else                                                            \
+                        mv -f .tmp.config .config;                      \
+                        $(obj)/conf --silentoldconfig $(Kconfig);       \
+        fi
+        $(Q)rm -f .tmp.config
+
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
+# The symlink is used to repair a deficiency in arch/um
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
-        $(Q)echo "  GEN     config.pot"
+        $(Q)echo "  GEN config"
         $(Q)xgettext --default-domain=linux                         \
             --add-comments --keyword=_ --keyword=N_                 \
             --from-code=UTF-8                                       \
@@ -59,16 +84,16 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
             --directory=$(srctree) --directory=$(objtree)           \
             --output $(obj)/config.pot
         $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-        $(Q)(for i in `ls $(srctree)/arch/*/Kconfig      \
-            $(srctree)/arch/*/um/Kconfig`;               \
+        $(Q)ln -fs Kconfig.x86 arch/um/Kconfig
+        $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
             do                                           \
-                echo "  GEN     $$i";                    \
+                echo "  GEN $$i";                        \
                 $(obj)/kxgettext $$i                     \
                      >> $(obj)/config.pot;               \
             done )
-        $(Q)echo "  GEN     linux.pot"
         $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
             --output $(obj)/linux.pot
+        $(Q)rm -f $(srctree)/arch/um/Kconfig
         $(Q)rm -f $(obj)/config.pot
 
 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -76,17 +101,11 @@ PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
 allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
         $< --$@ $(Kconfig)
 
-PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
+PHONY += listnewconfig oldnoconfig savedefconfig defconfig
 
-listnewconfig olddefconfig: $(obj)/conf
+listnewconfig oldnoconfig: $(obj)/conf
         $< --$@ $(Kconfig)
 
-# oldnoconfig is an alias of olddefconfig, because people already are dependent
-# on its behavior(sets new symbols to their default value but not 'n') with the
-# counter-intuitive name.
-oldnoconfig: $(obj)/conf
-        $< --olddefconfig $(Kconfig)
-
 savedefconfig: $(obj)/conf
         $< --$@=defconfig $(Kconfig)
 
@@ -120,7 +139,7 @@ help:
         @echo  '  alldefconfig    - New config with all symbols set to default'
         @echo  '  randconfig      - New config with random answer to all options'
         @echo  '  listnewconfig   - List new options'
-        @echo  '  olddefconfig    - Same as silentoldconfig but sets new symbols to their default value'
+        @echo  '  oldnoconfig     - Same as silentoldconfig but set new symbols to n (unset)'
 
 # lxdialog stuff
 check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
@@ -240,12 +259,12 @@ $(obj)/.tmp_qtcheck:
                 if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
               done; \
               if [ -z "$$dir" ]; then \
-                echo >&2 "*"; \
-                echo >&2 "* Unable to find any QT installation. Please make sure that"; \
-                echo >&2 "* the QT4 or QT3 development package is correctly installed and"; \
-                echo >&2 "* either qmake can be found or install pkg-config or set"; \
-                echo >&2 "* the QTDIR environment variable to the correct location."; \
-                echo >&2 "*"; \
+                echo "*"; \
+                echo "* Unable to find any QT installation. Please make sure that"; \
+                echo "* the QT4 or QT3 development package is correctly installed and"; \
+                echo "* either qmake can be found or install pkg-config or set"; \
+                echo "* the QTDIR environment variable to the correct location."; \
+                echo "*"; \
                 false; \
               fi; \
               libpath=$$dir/lib; lib=qt; osdir=""; \
@@ -266,8 +285,8 @@ $(obj)/.tmp_qtcheck:
         else \
           cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
           libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
-          moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
-          [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \
+          binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \
+          moc="$$binpath/bin/moc"; \
         fi; \
         echo "KC_QT_CFLAGS=$$cflags" > $@; \
         echo "KC_QT_LIBS=$$libs" >> $@; \
@@ -285,17 +304,17 @@ $(obj)/.tmp_gtkcheck:
                 if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then                  \
                         touch $@;                                                               \
                 else                                                                    \
-                        echo >&2 "*";                                                   \
-                        echo >&2 "* GTK+ is present but version >= 2.0.0 is required."; \
-                        echo >&2 "*";                                                   \
+                        echo "*";                                                       \
+                        echo "* GTK+ is present but version >= 2.0.0 is required.";     \
+                        echo "*";                                                       \
                         false;                                                          \
                 fi                                                                      \
         else                                                                            \
-                echo >&2 "*";                                                           \
-                echo >&2 "* Unable to find the GTK+ installation. Please make sure that";       \
-                echo >&2 "* the GTK+ 2.0 development package is correctly installed...";        \
-                echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0.";             \
-                echo >&2 "*";                                                           \
+                echo "*";                                                               \
+                echo "* Unable to find the GTK+ installation. Please make sure that";   \
+                echo "* the GTK+ 2.0 development package is correctly installed...";    \
+                echo "* You need gtk+-2.0, glib-2.0 and libglade-2.0.";                 \
+                echo "*";                                                               \
                 false;                                                                  \
         fi
 endif
@@ -304,11 +323,8 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c
 
 $(obj)/qconf.o: $(obj)/qconf.moc
 
-quiet_cmd_moc = MOC     $@
-      cmd_moc = $(KC_QT_MOC) -i $< -o $@
-
-$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
-        $(call cmd,moc)
+$(obj)/%.moc: $(src)/%.h
+        $(KC_QT_MOC) -i $< -o $@
 
 # Extract gconf menu items for I18N support
 $(obj)/gconf.glade.h: $(obj)/gconf.glade
diff --git a/scripts/kconfig/check.sh b/scripts/kconfig/check.sh
index 854d9c7c675..fa59cbf9d62 100755
--- a/scripts/kconfig/check.sh
+++ b/scripts/kconfig/check.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Needed for systems without gettext
-$* -x c -o /dev/null - > /dev/null 2>&1 << EOF
+$* -xc -o /dev/null - > /dev/null 2>&1 << EOF
 #include <libintl.h>
 int main()
 {
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 4da3b4adfad..f208f900ed3 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -32,7 +32,7 @@ enum input_mode {
         defconfig,
         savedefconfig,
         listnewconfig,
-        olddefconfig,
+        oldnoconfig,
 } input_mode = oldaskconfig;
 
 static int indent = 1;
@@ -365,7 +365,7 @@ static void conf(struct menu *menu)
                 case P_MENU:
                         if ((input_mode == silentoldconfig ||
                              input_mode == listnewconfig ||
-                             input_mode == olddefconfig) &&
+                             input_mode == oldnoconfig) &&
                             rootEntry != menu) {
                                 check_conf(menu);
                                 return;
@@ -429,7 +429,7 @@ static void check_conf(struct menu *menu)
                                 if (sym->name && !sym_is_choice_value(sym)) {
                                         printf("%s%s\n", CONFIG_, sym->name);
                                 }
-                        } else if (input_mode != olddefconfig) {
+                        } else if (input_mode != oldnoconfig) {
                                 if (!conf_cnt++)
                                         printf(_("*\n* Restart config...\n*\n"));
                                 rootEntry = menu_get_parent_menu(menu);
@@ -454,13 +454,7 @@ static struct option long_opts[] = {
         {"alldefconfig",    no_argument,       NULL, alldefconfig},
         {"randconfig",      no_argument,       NULL, randconfig},
         {"listnewconfig",   no_argument,       NULL, listnewconfig},
-        {"olddefconfig",    no_argument,       NULL, olddefconfig},
-        /*
-         * oldnoconfig is an alias of olddefconfig, because people already
-         * are dependent on its behavior(sets new symbols to their default
-         * value but not 'n') with the counter-intuitive name.
-         */
-        {"oldnoconfig",     no_argument,       NULL, olddefconfig},
+        {"oldnoconfig",     no_argument,       NULL, oldnoconfig},
         {NULL, 0, NULL, 0}
 };
 
@@ -473,8 +467,7 @@ static void conf_usage(const char *progname)
         printf("  --oldaskconfig          Start a new configuration using a line-oriented program\n");
         printf("  --oldconfig             Update a configuration using a provided .config as base\n");
         printf("  --silentoldconfig       Same as oldconfig, but quietly, additionally update deps\n");
-        printf("  --olddefconfig          Same as silentoldconfig but sets new symbols to their default value\n");
-        printf("  --oldnoconfig           An alias of olddefconfig\n");
+        printf("  --oldnoconfig           Same as silentoldconfig but set new symbols to no\n");
         printf("  --defconfig <file>      New config with default defined in <file>\n");
         printf("  --savedefconfig <file>  Save the minimal current configuration to <file>\n");
         printf("  --allnoconfig           New config where all options are answered with no\n");
@@ -527,7 +520,7 @@ int main(int ac, char **av)
                 case allmodconfig:
                 case alldefconfig:
                 case listnewconfig:
-                case olddefconfig:
+                case oldnoconfig:
                         break;
                 case '?':
                         conf_usage(progname);
@@ -572,7 +565,7 @@ int main(int ac, char **av)
         case oldaskconfig:
         case oldconfig:
         case listnewconfig:
-        case olddefconfig:
+        case oldnoconfig:
                 conf_read(NULL);
                 break;
         case allnoconfig:
@@ -581,15 +574,8 @@ int main(int ac, char **av)
         case alldefconfig:
         case randconfig:
                 name = getenv("KCONFIG_ALLCONFIG");
-                if (!name)
-                        break;
-                if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
-                        if (conf_read_simple(name, S_DEF_USER)) {
-                                fprintf(stderr,
-                                        _("*** Can't read seed configuration \"%s\"!\n"),
-                                        name);
-                                exit(1);
-                        }
+                if (name && !stat(name, &tmpstat)) {
+                        conf_read_simple(name, S_DEF_USER);
                         break;
                 }
                 switch (input_mode) {
@@ -600,13 +586,10 @@ int main(int ac, char **av)
                 case randconfig:        name = "allrandom.config"; break;
                 default: break;
                 }
-                if (conf_read_simple(name, S_DEF_USER) &&
-                    conf_read_simple("all.config", S_DEF_USER)) {
-                        fprintf(stderr,
-                                _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
-                                name);
-                        exit(1);
-                }
+                if (!stat(name, &tmpstat))
+                        conf_read_simple(name, S_DEF_USER);
+                else if (!stat("all.config", &tmpstat))
+                        conf_read_simple("all.config", S_DEF_USER);
                 break;
         default:
                 break;
@@ -652,7 +635,7 @@ int main(int ac, char **av)
                 /* fall through */
         case oldconfig:
         case listnewconfig:
-        case olddefconfig:
+        case oldnoconfig:
         case silentoldconfig:
                 /* Update until a loop caused no more changes */
                 do {
@@ -660,7 +643,7 @@ int main(int ac, char **av)
                         check_conf(&rootmenu);
                 } while (conf_cnt &&
                          (input_mode != listnewconfig &&
-                          input_mode != olddefconfig));
+                          input_mode != oldnoconfig));
                 break;
         }
 
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 13ddf1126c2..59b667cae5f 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -182,66 +182,10 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
         return 0;
 }
 
-#define LINE_GROWTH 16
-static int add_byte(int c, char **lineptr, size_t slen, size_t *n)
-{
-        char *nline;
-        size_t new_size = slen + 1;
-        if (new_size > *n) {
-                new_size += LINE_GROWTH - 1;
-                new_size *= 2;
-                nline = realloc(*lineptr, new_size);
-                if (!nline)
-                        return -1;
-
-                *lineptr = nline;
-                *n = new_size;
-        }
-
-        (*lineptr)[slen] = c;
-
-        return 0;
-}
-
-static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream)
-{
-        char *line = *lineptr;
-        size_t slen = 0;
-
-        for (;;) {
-                int c = getc(stream);
-
-                switch (c) {
-                case '\n':
-                        if (add_byte(c, &line, slen, n) < 0)
-                                goto e_out;
-                        slen++;
-                        /* fall through */
-                case EOF:
-                        if (add_byte('\0', &line, slen, n) < 0)
-                                goto e_out;
-                        *lineptr = line;
-                        if (slen == 0)
-                                return -1;
-                        return slen;
-                default:
-                        if (add_byte(c, &line, slen, n) < 0)
-                                goto e_out;
-                        slen++;
-                }
-        }
-
-e_out:
-        line[slen-1] = '\0';
-        *lineptr = line;
-        return -1;
-}
-
 int conf_read_simple(const char *name, int def)
 {
         FILE *in = NULL;
-        char   *line = NULL;
-        size_t  line_asize = 0;
+        char line[1024];
         char *p, *p2;
         struct symbol *sym;
         int i, def_flags;
@@ -303,7 +247,7 @@ load:
                 }
         }
 
-        while (compat_getline(&line, &line_asize, in) != -1) {
+        while (fgets(line, sizeof(line), in)) {
                 conf_lineno++;
                 sym = NULL;
                 if (line[0] == '#') {
@@ -391,7 +335,6 @@ setsym:
                         cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
                 }
         }
-        free(line);
         fclose(in);
 
         if (modules_sym)
@@ -401,8 +344,10 @@ setsym:
 
 int conf_read(const char *name)
 {
-        struct symbol *sym;
-        int i;
+        struct symbol *sym, *choice_sym;
+        struct property *prop;
+        struct expr *e;
+        int i, flags;
 
         sym_set_change_count(0);
 
@@ -412,7 +357,7 @@ int conf_read(const char *name)
         for_all_symbols(i, sym) {
                 sym_calc_value(sym);
                 if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO))
-                        continue;
+                        goto sym_ok;
                 if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) {
                         /* check that calculated value agrees with saved value */
                         switch (sym->type) {
@@ -421,18 +366,30 @@ int conf_read(const char *name)
                                 if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym))
                                         break;
                                 if (!sym_is_choice(sym))
-                                        continue;
+                                        goto sym_ok;
                                 /* fall through */
                         default:
                                 if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
-                                        continue;
+                                        goto sym_ok;
                                 break;
                         }
                 } else if (!sym_has_value(sym) && !(sym->flags & SYMBOL_WRITE))
                         /* no previous value and not saved */
-                        continue;
+                        goto sym_ok;
                 conf_unsaved++;
                 /* maybe print value in verbose mode... */
+        sym_ok:
+                if (!sym_is_choice(sym))
+                        continue;
+                /* The choice symbol only has a set value (and thus is not new)
+                 * if all its visible childs have values.
+                 */
+                prop = sym_get_choice_prop(sym);
+                flags = sym->flags;
+                expr_list_for_each_sym(prop->expr, e, choice_sym)
+                        if (choice_sym->visible != no)
+                                flags &= choice_sym->flags;
+                sym->flags &= flags | ~SYMBOL_DEF_USER;
         }
 
         for_all_symbols(i, sym) {
@@ -507,7 +464,7 @@ kconfig_print_comment(FILE *fp, const char *value, void *arg)
                 fprintf(fp, "#");
                 if (l) {
                         fprintf(fp, " ");
-                        xfwrite(p, l, 1, fp);
+                        fwrite(p, l, 1, fp);
                         p += l;
                 }
                 fprintf(fp, "\n");
@@ -546,6 +503,17 @@ header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
                         fprintf(fp, "#define %s%s%s 1\n",
                             CONFIG_, sym->name, suffix);
                 }
+                /*
+                 * Generate the __enabled_CONFIG_* and
+                 * __enabled_CONFIG_*_MODULE macros for use by the
+                 * IS_{ENABLED,BUILTIN,MODULE} macros. The _MODULE variant is
+                 * generated even for booleans so that the IS_ENABLED() macro
+                 * works.
+                 */
+                fprintf(fp, "#define __enabled_" CONFIG_ "%s %d\n",
+                                sym->name, (*value == 'y'));
+                fprintf(fp, "#define __enabled_" CONFIG_ "%s_MODULE %d\n",
+                                sym->name, (*value == 'm'));
                 break;
         }
         case S_HEX: {
@@ -580,7 +548,7 @@ header_print_comment(FILE *fp, const char *value, void *arg)
                 fprintf(fp, " *");
                 if (l) {
                         fprintf(fp, " ");
-                        xfwrite(p, l, 1, fp);
+                        fwrite(p, l, 1, fp);
                         p += l;
                 }
                 fprintf(fp, "\n");
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index cdd48600e02..80fce57080c 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -10,9 +10,7 @@
 extern "C" {
 #endif
 
-#include <assert.h>
 #include <stdio.h>
-#include "list.h"
 #ifndef __cplusplus
 #include <stdbool.h>
 #endif
@@ -174,15 +172,6 @@ struct menu {
 #define MENU_CHANGED            0x0001
 #define MENU_ROOT               0x0002
 
-struct jump_key {
-        struct list_head entries;
-        size_t offset;
-        struct menu *target;
-        int index;
-};
-
-#define JUMP_NB                 9
-
 extern struct file *file_list;
 extern struct file *current_file;
 struct file *lookup_file(const char *name);
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index adc230638c5..9f4438027df 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -683,7 +683,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
         dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                         GTK_MESSAGE_INFO,
-                                        GTK_BUTTONS_CLOSE, "%s", intro_text);
+                                        GTK_BUTTONS_CLOSE, intro_text);
         g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
                                  G_CALLBACK(gtk_widget_destroy),
                                  GTK_OBJECT(dialog));
@@ -701,7 +701,7 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data)
         dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                         GTK_MESSAGE_INFO,
-                                        GTK_BUTTONS_CLOSE, "%s", about_text);
+                                        GTK_BUTTONS_CLOSE, about_text);
         g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
                                  G_CALLBACK(gtk_widget_destroy),
                                  GTK_OBJECT(dialog));
@@ -720,7 +720,7 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data)
         dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                         GTK_MESSAGE_INFO,
-                                        GTK_BUTTONS_CLOSE, "%s", license_text);
+                                        GTK_BUTTONS_CLOSE, license_text);
         g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
                                  G_CALLBACK(gtk_widget_destroy),
                                  GTK_OBJECT(dialog));
@@ -830,7 +830,7 @@ static void renderer_edited(GtkCellRendererText * cell,
 static void change_sym_value(struct menu *menu, gint col)
 {
         struct symbol *sym = menu->sym;
-        tristate newval;
+        tristate oldval, newval;
 
         if (!sym)
                 return;
@@ -847,6 +847,7 @@ static void change_sym_value(struct menu *menu, gint col)
         switch (sym_get_type(sym)) {
         case S_BOOLEAN:
         case S_TRISTATE:
+                oldval = sym_get_tristate_value(sym);
                 if (!sym_tristate_within_range(sym, newval))
                         newval = yes;
                 sym_set_tristate_value(sym, newval);
@@ -1277,6 +1278,7 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
         gboolean valid;
         GtkTreeIter *sibling;
         struct symbol *sym;
+        struct property *prop;
         struct menu *menu1, *menu2;
 
         if (src == &rootmenu)
@@ -1285,6 +1287,7 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
         valid = gtk_tree_model_iter_children(model2, child2, dst);
         for (child1 = src->list; child1; child1 = child1->next) {
 
+                prop = child1->prompt;
                 sym = child1->sym;
 
               reparse:
diff --git a/scripts/kconfig/list.h b/scripts/kconfig/list.h
deleted file mode 100644
index 0ae730be5f4..00000000000
--- a/scripts/kconfig/list.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef LIST_H
-#define LIST_H
-
-/*
- * Copied from include/linux/...
- */
-
-#undef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-
-/**
- * container_of - cast a member of a structure out to the containing structure
- * @ptr:        the pointer to the member.
- * @type:       the type of the container struct this is embedded in.
- * @member:     the name of the member within the struct.
- *
- */
-#define container_of(ptr, type, member) ({                      \
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
-        (type *)( (char *)__mptr - offsetof(type,member) );})
-
-
-struct list_head {
-        struct list_head *next, *prev;
-};
-
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
-        struct list_head name = LIST_HEAD_INIT(name)
-
-/**
- * list_entry - get the struct for this entry
- * @ptr:        the &struct list_head pointer.
- * @type:       the type of the struct this is embedded in.
- * @member:     the name of the list_struct within the struct.
- */
-#define list_entry(ptr, type, member) \
-        container_of(ptr, type, member)
-
-/**
- * list_for_each_entry  -       iterate over list of given type
- * @pos:        the type * to use as a loop cursor.
- * @head:       the head for your list.
- * @member:     the name of the list_struct within the struct.
- */
-#define list_for_each_entry(pos, head, member)                          \
-        for (pos = list_entry((head)->next, typeof(*pos), member);      \
-             &pos->member != (head);    \
-             pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_empty - tests whether a list is empty
- * @head: the list to test.
- */
-static inline int list_empty(const struct list_head *head)
-{
-        return head->next == head;
-}
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_add(struct list_head *_new,
-                              struct list_head *prev,
-                              struct list_head *next)
-{
-        next->prev = _new;
-        _new->next = next;
-        _new->prev = prev;
-        prev->next = _new;
-}
-
-/**
- * list_add_tail - add a new entry
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- */
-static inline void list_add_tail(struct list_head *_new, struct list_head *head)
-{
-        __list_add(_new, head->prev, head);
-}
-
-#endif
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index c18f2bd9c09..b633bdb9f3d 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -90,10 +90,8 @@ struct conf_printer {
 /* confdata.c and expr.c */
 static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
 {
-        assert(len != 0);
-
-        if (fwrite(str, len, count, out) != count)
-                fprintf(stderr, "Error in writing or end of file.\n");
+        if (fwrite(str, len, count, out) < count)
+                fprintf(stderr, "\nError in writing or end of file.\n");
 }
 
 /* menu.c */
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index ef1a7381f95..47fe9c340f9 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -21,10 +21,8 @@ P(menu_get_root_menu,struct menu *,(struct menu *menu));
 P(menu_get_parent_menu,struct menu *,(struct menu *menu));
 P(menu_has_help,bool,(struct menu *menu));
 P(menu_get_help,const char *,(struct menu *menu));
-P(get_symbol_str, void, (struct gstr *r, struct symbol *sym, struct list_head
-                         *head));
-P(get_relations_str, struct gstr, (struct symbol **sym_arr, struct list_head
-                                   *head));
+P(get_symbol_str, void, (struct gstr *r, struct symbol *sym));
+P(get_relations_str, struct gstr, (struct symbol **sym_arr));
 P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
 
 /* symbol.c */
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 53975cf8760..820d2b6800f 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -15,7 +15,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <signal.h>
 #include <unistd.h>
 #include <locale.h>
 
@@ -105,10 +104,10 @@ static const char mconf_readme[] = N_(
 "Text Box    (Help Window)\n"
 "--------\n"
 "o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
-"   keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for \n"
-"   those who are familiar with less and lynx.\n"
+"   keys h,j,k,l function here as do <SPACE BAR> and <B> for those\n"
+"   who are familiar with less and lynx.\n"
 "\n"
-"o  Press <E>, <X>, <q>, <Enter> or <Esc><Esc> to exit.\n"
+"o  Press <E>, <X>, <Enter> or <Esc><Esc> to exit.\n"
 "\n"
 "\n"
 "Alternate Configuration Files\n"
@@ -236,19 +235,16 @@ search_help[] = N_(
         "Result:\n"
         "-----------------------------------------------------------------\n"
         "Symbol: FOO [=m]\n"
-        "Type  : tristate\n"
         "Prompt: Foo bus is used to drive the bar HW\n"
-        "  Defined at drivers/pci/Kconfig:47\n"
-        "  Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
-        "  Location:\n"
-        "    -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
-        "      -> PCI support (PCI [=y])\n"
-        "(1)     -> PCI access mode (<choice> [=y])\n"
-        "  Selects: LIBCRC32\n"
-        "  Selected by: BAR\n"
+        "Defined at drivers/pci/Kconfig:47\n"
+        "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
+        "Location:\n"
+        "  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
+        "    -> PCI support (PCI [=y])\n"
+        "      -> PCI access mode (<choice> [=y])\n"
+        "Selects: LIBCRC32\n"
+        "Selected by: BAR\n"
         "-----------------------------------------------------------------\n"
-        "o The line 'Type:' shows the type of the configuration option for\n"
-        "  this symbol (boolean, tristate, string, ...)\n"
         "o The line 'Prompt:' shows the text used in the menu structure for\n"
         "  this symbol\n"
         "o The 'Defined at' line tell at what file / line number the symbol\n"
@@ -257,12 +253,8 @@ search_help[] = N_(
         "  this symbol to be visible in the menu (selectable)\n"
         "o The 'Location:' lines tell where in the menu structure this symbol\n"
         "  is located\n"
-        "    A location followed by a [=y] indicates that this is a\n"
-        "    selectable menu item - and the current value is displayed inside\n"
-        "    brackets.\n"
-        "    Press the key in the (#) prefix to jump directly to that\n"
-        "    location. You will be returned to the current search results\n"
-        "    after exiting this new menu.\n"
+        "    A location followed by a [=y] indicate that this is a selectable\n"
+        "    menu item - and current value is displayed inside brackets.\n"
         "o The 'Selects:' line tell what symbol will be automatically\n"
         "  selected if this symbol is selected (y or m)\n"
         "o The 'Selected by' line tell what symbol has selected this symbol\n"
@@ -281,14 +273,11 @@ static int child_count;
 static int single_menu_mode;
 static int show_all_options;
 
-static void conf(struct menu *menu, struct menu *active_menu);
+static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
 static void conf_string(struct menu *menu);
 static void conf_load(void);
 static void conf_save(void);
-static int show_textbox_ext(const char *title, char *text, int r, int c,
-                            int *keys, int *vscroll, int *hscroll,
-                            update_text_fn update_text, void *data);
 static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
@@ -311,47 +300,12 @@ static void set_config_filename(const char *config_filename)
 }
 
 
-struct search_data {
-        struct list_head *head;
-        struct menu **targets;
-        int *keys;
-};
-
-static void update_text(char *buf, size_t start, size_t end, void *_data)
-{
-        struct search_data *data = _data;
-        struct jump_key *pos;
-        int k = 0;
-
-        list_for_each_entry(pos, data->head, entries) {
-                if (pos->offset >= start && pos->offset < end) {
-                        char header[4];
-
-                        if (k < JUMP_NB) {
-                                int key = '0' + (pos->index % JUMP_NB) + 1;
-
-                                sprintf(header, "(%c)", key);
-                                data->keys[k] = key;
-                                data->targets[k] = pos->target;
-                                k++;
-                        } else {
-                                sprintf(header, "   ");
-                        }
-
-                        memcpy(buf + pos->offset, header, sizeof(header) - 1);
-                }
-        }
-        data->keys[k] = 0;
-}
-
 static void search_conf(void)
 {
         struct symbol **sym_arr;
         struct gstr res;
         char *dialog_input;
-        int dres, vscroll = 0, hscroll = 0;
-        bool again;
-
+        int dres;
 again:
         dialog_clear();
         dres = dialog_inputbox(_("Search Configuration Parameter"),
@@ -374,30 +328,10 @@ again:
                 dialog_input += strlen(CONFIG_);
 
         sym_arr = sym_re_search(dialog_input);
-        do {
-                LIST_HEAD(head);
-                struct menu *targets[JUMP_NB];
-                int keys[JUMP_NB + 1], i;
-                struct search_data data = {
-                        .head = &head,
-                        .targets = targets,
-                        .keys = keys,
-                };
-
-                res = get_relations_str(sym_arr, &head);
-                dres = show_textbox_ext(_("Search Results"), (char *)
-                                        str_get(&res), 0, 0, keys, &vscroll,
-                                        &hscroll, &update_text, (void *)
-                                        &data);
-                again = false;
-                for (i = 0; i < JUMP_NB && keys[i]; i++)
-                        if (dres == keys[i]) {
-                                conf(targets[i]->parent, targets[i]);
-                                again = true;
-                        }
-                str_free(&res);
-        } while (again);
+        res = get_relations_str(sym_arr);
         free(sym_arr);
+        show_textbox(_("Search Results"), str_get(&res), 0, 0);
+        str_free(&res);
 }
 
 static void build_conf(struct menu *menu)
@@ -578,11 +512,12 @@ conf_childs:
         indent -= doint;
 }
 
-static void conf(struct menu *menu, struct menu *active_menu)
+static void conf(struct menu *menu)
 {
         struct menu *submenu;
         const char *prompt = menu_get_prompt(menu);
         struct symbol *sym;
+        struct menu *active_menu = NULL;
         int res;
         int s_scroll = 0;
 
@@ -625,13 +560,13 @@ static void conf(struct menu *menu, struct menu *active_menu)
                                 if (single_menu_mode)
                                         submenu->data = (void *) (long) !submenu->data;
                                 else
-                                        conf(submenu, NULL);
+                                        conf(submenu);
                                 break;
                         case 't':
                                 if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)
                                         conf_choice(submenu);
                                 else if (submenu->prompt->type == P_MENU)
-                                        conf(submenu, NULL);
+                                        conf(submenu);
                                 break;
                         case 's':
                                 conf_string(submenu);
@@ -670,7 +605,7 @@ static void conf(struct menu *menu, struct menu *active_menu)
                         if (item_is_tag('t'))
                                 sym_toggle_tristate_value(sym);
                         else if (item_is_tag('m'))
-                                conf(submenu, NULL);
+                                conf(submenu);
                         break;
                 case 7:
                         search_conf();
@@ -682,19 +617,10 @@ static void conf(struct menu *menu, struct menu *active_menu)
         }
 }
 
-static int show_textbox_ext(const char *title, char *text, int r, int c, int
-                            *keys, int *vscroll, int *hscroll, update_text_fn
-                            update_text, void *data)
-{
-        dialog_clear();
-        return dialog_textbox(title, text, r, c, keys, vscroll, hscroll,
-                              update_text, data);
-}
-
 static void show_textbox(const char *title, const char *text, int r, int c)
 {
-        show_textbox_ext(title, (char *) text, r, c, (int []) {0}, NULL, NULL,
-                         NULL, NULL);
+        dialog_clear();
+        dialog_textbox(title, text, r, c);
 }
 
 static void show_helptext(const char *title, const char *text)
@@ -866,56 +792,9 @@ static void conf_save(void)
         }
 }
 
-static int handle_exit(void)
-{
-        int res;
-
-        dialog_clear();
-        if (conf_get_changed())
-                res = dialog_yesno(NULL,
-                                   _("Do you wish to save your new configuration ?\n"
-                                     "<ESC><ESC> to continue."),
-                                   6, 60);
-        else
-                res = -1;
-
-        end_dialog(saved_x, saved_y);
-
-        switch (res) {
-        case 0:
-                if (conf_write(filename)) {
-                        fprintf(stderr, _("\n\n"
-                                          "Error while writing of the configuration.\n"
-                                          "Your configuration changes were NOT saved."
-                                          "\n\n"));
-                        return 1;
-                }
-                /* fall through */
-        case -1:
-                printf(_("\n\n"
-                         "*** End of the configuration.\n"
-                         "*** Execute 'make' to start the build or try 'make help'."
-                         "\n\n"));
-                res = 0;
-                break;
-        default:
-                fprintf(stderr, _("\n\n"
-                                  "Your configuration changes were NOT saved."
-                                  "\n\n"));
-                if (res != KEY_ESC)
-                        res = 0;
-        }
-
-        return res;
-}
-
-static void sig_handler(int signo)
-{
-        exit(handle_exit());
-}
-
 int main(int ac, char **av)
 {
+        int saved_x, saved_y;
         char *mode;
         int res;
 
@@ -923,8 +802,6 @@ int main(int ac, char **av)
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
-        signal(SIGINT, sig_handler);
-
         conf_parse(av[1]);
         conf_read(NULL);
 
@@ -934,6 +811,9 @@ int main(int ac, char **av)
                         single_menu_mode = 1;
         }
 
+        initscr();
+
+        getyx(stdscr, saved_y, saved_x);
         if (init_dialog(NULL)) {
                 fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
                 fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
@@ -942,10 +822,41 @@ int main(int ac, char **av)
 
         set_config_filename(conf_get_configname());
         do {
-                conf(&rootmenu, NULL);
-                res = handle_exit();
+                conf(&rootmenu);
+                dialog_clear();
+                if (conf_get_changed())
+                        res = dialog_yesno(NULL,
+                                           _("Do you wish to save your "
+                                             "new configuration?\n"
+                                             "<ESC><ESC> to continue."),
+                                           6, 60);
+                else
+                        res = -1;
         } while (res == KEY_ESC);
+        end_dialog(saved_x, saved_y);
+
+        switch (res) {
+        case 0:
+                if (conf_write(filename)) {
+                        fprintf(stderr, _("\n\n"
+                                "Error while writing of the configuration.\n"
+                                "Your configuration changes were NOT saved."
+                                "\n\n"));
+                        return 1;
+                }
+                /* fall through */
+        case -1:
+                printf(_("\n\n"
+                        "*** End of the configuration.\n"
+                        "*** Execute 'make' to start the build or try 'make help'."
+                        "\n\n"));
+                break;
+        default:
+                fprintf(stderr, _("\n\n"
+                        "Your configuration changes were NOT saved."
+                        "\n\n"));
+        }
 
-        return res;
+        return 0;
 }
 
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index e98a05c8e50..beeb92e75f8 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -10,7 +10,8 @@
 
 #include "lkc.h"
 
-static const char nohelp_text[] = "There is no help available for this option.";
+static const char nohelp_text[] = N_(
+        "There is no help available for this option.\n");
 
 struct menu rootmenu;
 static struct menu **last_entry_ptr;
@@ -507,12 +508,10 @@ const char *menu_get_help(struct menu *menu)
                 return "";
 }
 
-static void get_prompt_str(struct gstr *r, struct property *prop,
-                           struct list_head *head)
+static void get_prompt_str(struct gstr *r, struct property *prop)
 {
         int i, j;
-        struct menu *submenu[8], *menu, *location = NULL;
-        struct jump_key *jump;
+        struct menu *submenu[8], *menu;
 
         str_printf(r, _("Prompt: %s\n"), _(prop->text));
         str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
@@ -523,44 +522,13 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
                 str_append(r, "\n");
         }
         menu = prop->menu->parent;
-        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) {
-                bool accessible = menu_is_visible(menu);
-
+        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
                 submenu[i++] = menu;
-                if (location == NULL && accessible)
-                        location = menu;
-        }
-        if (head && location) {
-                jump = malloc(sizeof(struct jump_key));
-
-                if (menu_is_visible(prop->menu)) {
-                        /*
-                         * There is not enough room to put the hint at the
-                         * beginning of the "Prompt" line. Put the hint on the
-                         * last "Location" line even when it would belong on
-                         * the former.
-                         */
-                        jump->target = prop->menu;
-                } else
-                        jump->target = location;
-
-                if (list_empty(head))
-                        jump->index = 0;
-                else
-                        jump->index = list_entry(head->prev, struct jump_key,
-                                                 entries)->index + 1;
-
-                list_add_tail(&jump->entries, head);
-        }
-
         if (i > 0) {
                 str_printf(r, _("  Location:\n"));
                 for (j = 4; --i >= 0; j += 2) {
                         menu = submenu[i];
-                        if (head && location && menu == location)
-                                jump->offset = r->len - 1;
-                        str_printf(r, "%*c-> %s", j, ' ',
-                                   _(menu_get_prompt(menu)));
+                        str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu)));
                         if (menu->sym) {
                                 str_printf(r, " (%s [=%s])", menu->sym->name ?
                                         menu->sym->name : _("<choice>"),
@@ -571,11 +539,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
         }
 }
 
-/*
- * head is optional and may be NULL
- */
-void get_symbol_str(struct gstr *r, struct symbol *sym,
-                    struct list_head *head)
+void get_symbol_str(struct gstr *r, struct symbol *sym)
 {
         bool hit;
         struct property *prop;
@@ -594,7 +558,7 @@ void get_symbol_str(struct gstr *r, struct symbol *sym,
                 }
         }
         for_all_prompts(sym, prop)
-                get_prompt_str(r, prop, head);
+                get_prompt_str(r, prop);
         hit = false;
         for_all_properties(sym, prop, P_SELECT) {
                 if (!hit) {
@@ -614,14 +578,14 @@ void get_symbol_str(struct gstr *r, struct symbol *sym,
         str_append(r, "\n\n");
 }
 
-struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head)
+struct gstr get_relations_str(struct symbol **sym_arr)
 {
         struct symbol *sym;
         struct gstr res = str_new();
         int i;
 
         for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
-                get_symbol_str(&res, sym, head);
+                get_symbol_str(&res, sym);
         if (!i)
                 str_append(&res, _("No matches found.\n"));
         return res;
@@ -631,14 +595,15 @@ struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head)
 void menu_get_ext_help(struct menu *menu, struct gstr *help)
 {
         struct symbol *sym = menu->sym;
-        const char *help_text = nohelp_text;
 
         if (menu_has_help(menu)) {
                 if (sym->name)
                         str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
-                help_text = menu_get_help(menu);
+                str_append(help, _(menu_get_help(menu)));
+                str_append(help, "\n");
+        } else {
+                str_append(help, nohelp_text);
         }
-        str_printf(help, "%s\n", _(help_text));
         if (sym)
-                get_symbol_str(help, sym, NULL);
+                get_symbol_str(help, sym);
 }
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
deleted file mode 100755
index 974d5cb7e30..00000000000
--- a/scripts/kconfig/merge_config.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-#  merge_config.sh - Takes a list of config fragment values, and merges
-#  them one by one. Provides warnings on overridden values, and specified
-#  values that did not make it to the resulting .config file (due to missed
-#  dependencies or config symbol removal).
-#
-#  Portions reused from kconf_check and generate_cfg:
-#  http://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-tools/tree/tools/kconf_check
-#  http://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-tools/tree/tools/generate_cfg
-#
-#  Copyright (c) 2009-2010 Wind River Systems, Inc.
-#  Copyright 2011 Linaro
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2 as
-#  published by the Free Software Foundation.
-#
-#  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.
-
-clean_up() {
-        rm -f $TMP_FILE
-        exit
-}
-trap clean_up HUP INT TERM
-
-usage() {
-        echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
-        echo "  -h    display this help text"
-        echo "  -m    only merge the fragments, do not execute the make command"
-        echo "  -n    use allnoconfig instead of alldefconfig"
-        echo "  -r    list redundant entries when merging fragments"
-}
-
-MAKE=true
-ALLTARGET=alldefconfig
-WARNREDUN=false
-
-while true; do
-        case $1 in
-        "-n")
-                ALLTARGET=allnoconfig
-                shift
-                continue
-                ;;
-        "-m")
-                MAKE=false
-                shift
-                continue
-                ;;
-        "-h")
-                usage
-                exit
-                ;;
-        "-r")
-                WARNREDUN=true
-                shift
-                continue
-                ;;
-        *)
-                break
-                ;;
-        esac
-done
-
-INITFILE=$1
-shift;
-
-MERGE_LIST=$*
-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
-TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
-
-echo "Using $INITFILE as base"
-cat $INITFILE > $TMP_FILE
-
-# Merge files, printing warnings on overrided values
-for MERGE_FILE in $MERGE_LIST ; do
-        echo "Merging $MERGE_FILE"
-        CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
-
-        for CFG in $CFG_LIST ; do
-                grep -q -w $CFG $TMP_FILE
-                if [ $? -eq 0 ] ; then
-                        PREV_VAL=$(grep -w $CFG $TMP_FILE)
-                        NEW_VAL=$(grep -w $CFG $MERGE_FILE)
-                        if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
-                        echo Value of $CFG is redefined by fragment $MERGE_FILE:
-                        echo Previous  value: $PREV_VAL
-                        echo New value:       $NEW_VAL
-                        echo
-                        elif [ "$WARNREDUN" = "true" ]; then
-                        echo Value of $CFG is redundant by fragment $MERGE_FILE:
-                        fi
-                        sed -i "/$CFG[ =]/d" $TMP_FILE
-                fi
-        done
-        cat $MERGE_FILE >> $TMP_FILE
-done
-
-if [ "$MAKE" = "false" ]; then
-        cp $TMP_FILE .config
-        echo "#"
-        echo "# merged configuration written to .config (needs make)"
-        echo "#"
-        clean_up
-        exit
-fi
-
-# Use the merged file as the starting point for:
-# alldefconfig: Fills in any missing symbols with Kconfig default
-# allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
-make KCONFIG_ALLCONFIG=$TMP_FILE $ALLTARGET
-
-
-# Check all specified config values took (might have missed-dependency issues)
-for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
-
-        REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
-        ACTUAL_VAL=$(grep -w -e "$CFG" .config)
-        if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
-                echo "Value requested for $CFG not in final .config"
-                echo "Requested value:  $REQUESTED_VAL"
-                echo "Actual value:     $ACTUAL_VAL"
-                echo ""
-        fi
-done
-
-clean_up
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 87d4b15da95..39ca1f1640e 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -83,10 +83,10 @@ static const char nconf_readme[] = N_(
 "Text Box    (Help Window)\n"
 "--------\n"
 "o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
-"   keys h,j,k,l function here as do <u>, <d> and <SPACE BAR> for\n"
-"   those who are familiar with less and lynx.\n"
+"   keys h,j,k,l function here as do <SPACE BAR> for those\n"
+"   who are familiar with less and lynx.\n"
 "\n"
-"o  Press <Enter>, <F1>, <F5>, <F9>, <q> or <Esc> to exit.\n"
+"o  Press <Enter>, <F1>, <F5>, <F7> or <Esc> to exit.\n"
 "\n"
 "\n"
 "Alternate Configuration Files\n"
@@ -182,6 +182,8 @@ setmod_text[] = N_(
 "This feature depends on another which\n"
 "has been configured as a module.\n"
 "As a result, this feature will be built as a module."),
+nohelp_text[] = N_(
+"There is no help available for this option.\n"),
 load_config_text[] = N_(
 "Enter the name of the configuration file you wish to load.\n"
 "Accept the name shown to restore the configuration you\n"
@@ -223,7 +225,7 @@ search_help[] = N_(
 "Defined at drivers/pci/Kconfig:47\n"
 "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
 "Location:\n"
-"  -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
+"  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
 "    -> PCI support (PCI [ = y])\n"
 "      -> PCI access mode (<choice> [ = y])\n"
 "Selects: LIBCRC32\n"
@@ -278,9 +280,6 @@ static int global_exit;
 /* the currently selected button */
 const char *current_instructions = menu_instructions;
 
-static char *dialog_input_result;
-static int dialog_input_result_len;
-
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
 static void conf_string(struct menu *menu);
@@ -696,6 +695,7 @@ static void search_conf(void)
 {
         struct symbol **sym_arr;
         struct gstr res;
+        char dialog_input_result[100];
         char *dialog_input;
         int dres;
 again:
@@ -703,7 +703,7 @@ again:
                         _("Search Configuration Parameter"),
                         _("Enter " CONFIG_ " (sub)string to search for "
                                 "(with or without \"" CONFIG_ "\")"),
-                        "", &dialog_input_result, &dialog_input_result_len);
+                        "", dialog_input_result, 99);
         switch (dres) {
         case 0:
                 break;
@@ -721,7 +721,7 @@ again:
                 dialog_input += strlen(CONFIG_);
 
         sym_arr = sym_re_search(dialog_input);
-        res = get_relations_str(sym_arr, NULL);
+        res = get_relations_str(sym_arr);
         free(sym_arr);
         show_scroll_win(main_window,
                         _("Search Results"), str_get(&res));
@@ -1348,6 +1348,7 @@ static void conf_choice(struct menu *menu)
 static void conf_string(struct menu *menu)
 {
         const char *prompt = menu_get_prompt(menu);
+        char dialog_input_result[256];
 
         while (1) {
                 int res;
@@ -1370,8 +1371,8 @@ static void conf_string(struct menu *menu)
                                 prompt ? _(prompt) : _("Main Menu"),
                                 heading,
                                 sym_get_string_value(menu->sym),
-                                &dialog_input_result,
-                                &dialog_input_result_len);
+                                dialog_input_result,
+                                sizeof(dialog_input_result));
                 switch (res) {
                 case 0:
                         if (sym_set_string_value(menu->sym,
@@ -1391,13 +1392,14 @@ static void conf_string(struct menu *menu)
 
 static void conf_load(void)
 {
+        char dialog_input_result[256];
         while (1) {
                 int res;
                 res = dialog_inputbox(main_window,
                                 NULL, load_config_text,
                                 filename,
-                                &dialog_input_result,
-                                &dialog_input_result_len);
+                                dialog_input_result,
+                                sizeof(dialog_input_result));
                 switch (res) {
                 case 0:
                         if (!dialog_input_result[0])
@@ -1422,13 +1424,14 @@ static void conf_load(void)
 
 static void conf_save(void)
 {
+        char dialog_input_result[256];
         while (1) {
                 int res;
                 res = dialog_inputbox(main_window,
                                 NULL, save_config_text,
                                 filename,
-                                &dialog_input_result,
-                                &dialog_input_result_len);
+                                dialog_input_result,
+                                sizeof(dialog_input_result));
                 switch (res) {
                 case 0:
                         if (!dialog_input_result[0])
@@ -1503,11 +1506,7 @@ int main(int ac, char **av)
         }
 
         notimeout(stdscr, FALSE);
-#if NCURSES_REENTRANT
-        set_escdelay(1);
-#else
         ESCDELAY = 1;
-#endif
 
         /* set btns menu */
         curses_menu = new_menu(curses_menu_items);
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index 379003c7a2b..f8137b3a538 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -356,7 +356,7 @@ int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...)
 
 int dialog_inputbox(WINDOW *main_window,
                 const char *title, const char *prompt,
-                const char *init, char **resultp, int *result_len)
+                const char *init, char *result, int result_len)
 {
         int prompt_lines = 0;
         int prompt_width = 0;
@@ -367,13 +367,7 @@ int dialog_inputbox(WINDOW *main_window,
         int i, x, y;
         int res = -1;
         int cursor_position = strlen(init);
-        int cursor_form_win;
-        char *result = *resultp;
 
-        if (strlen(init)+1 > *result_len) {
-                *result_len = strlen(init)+1;
-                *resultp = result = realloc(result, *result_len);
-        }
 
         /* find the widest line of msg: */
         prompt_lines = get_line_no(prompt);
@@ -390,7 +384,7 @@ int dialog_inputbox(WINDOW *main_window,
         y = (LINES-(prompt_lines+4))/2;
         x = (COLS-(prompt_width+4))/2;
 
-        strncpy(result, init, *result_len);
+        strncpy(result, init, result_len);
 
         /* create the windows */
         win = newwin(prompt_lines+6, prompt_width+7, y, x);
@@ -411,9 +405,7 @@ int dialog_inputbox(WINDOW *main_window,
         fill_window(prompt_win, prompt);
 
         mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
-        cursor_form_win = min(cursor_position, prompt_width-1);
-        mvwprintw(form_win, 0, 0, "%s",
-                  result + cursor_position-cursor_form_win);
+        mvwprintw(form_win, 0, 0, "%s", result);
 
         /* create panels */
         panel = new_panel(win);
@@ -439,8 +431,6 @@ int dialog_inputbox(WINDOW *main_window,
                                                 &result[cursor_position],
                                                 len-cursor_position+1);
                                 cursor_position--;
-                                cursor_form_win--;
-                                len--;
                         }
                         break;
                 case KEY_DC:
@@ -448,63 +438,38 @@ int dialog_inputbox(WINDOW *main_window,
                                 memmove(&result[cursor_position],
                                                 &result[cursor_position+1],
                                                 len-cursor_position+1);
-                                len--;
                         }
                         break;
                 case KEY_UP:
                 case KEY_RIGHT:
-                        if (cursor_position < len) {
+                        if (cursor_position < len &&
+                            cursor_position < min(result_len, prompt_width))
                                 cursor_position++;
-                                cursor_form_win++;
-                        }
                         break;
                 case KEY_DOWN:
                 case KEY_LEFT:
-                        if (cursor_position > 0) {
+                        if (cursor_position > 0)
                                 cursor_position--;
-                                cursor_form_win--;
-                        }
-                        break;
-                case KEY_HOME:
-                        cursor_position = 0;
-                        cursor_form_win = 0;
-                        break;
-                case KEY_END:
-                        cursor_position = len;
-                        cursor_form_win = min(cursor_position, prompt_width-1);
                         break;
                 default:
-                        if ((isgraph(res) || isspace(res))) {
-                                /* one for new char, one for '\0' */
-                                if (len+2 > *result_len) {
-                                        *result_len = len+2;
-                                        *resultp = result = realloc(result,
-                                                                *result_len);
-                                }
+                        if ((isgraph(res) || isspace(res)) &&
+                                        len-2 < result_len) {
                                 /* insert the char at the proper position */
                                 memmove(&result[cursor_position+1],
                                                 &result[cursor_position],
-                                                len-cursor_position+1);
+                                                len+1);
                                 result[cursor_position] = res;
                                 cursor_position++;
-                                cursor_form_win++;
-                                len++;
                         } else {
-                                mvprintw(0, 0, "unknown key: %d\n", res);
+                                mvprintw(0, 0, "unknow key: %d\n", res);
                         }
                         break;
                 }
-                if (cursor_form_win < 0)
-                        cursor_form_win = 0;
-                else if (cursor_form_win > prompt_width-1)
-                        cursor_form_win = prompt_width-1;
-
                 wmove(form_win, 0, 0);
                 wclrtoeol(form_win);
                 mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
-                mvwprintw(form_win, 0, 0, "%s",
-                        result + cursor_position-cursor_form_win);
-                wmove(form_win, 0, cursor_form_win);
+                mvwprintw(form_win, 0, 0, "%s", result);
+                wmove(form_win, 0, cursor_position);
                 touchwin(win);
                 refresh_all_windows(main_window);
 
@@ -604,11 +569,9 @@ void show_scroll_win(WINDOW *main_window,
                 switch (res) {
                 case KEY_NPAGE:
                 case ' ':
-                case 'd':
                         start_y += text_lines-2;
                         break;
                 case KEY_PPAGE:
-                case 'u':
                         start_y -= text_lines+2;
                         break;
                 case KEY_HOME:
@@ -634,10 +597,10 @@ void show_scroll_win(WINDOW *main_window,
                         start_x++;
                         break;
                 }
-                if (res == 10 || res == 27 || res == 'q' ||
-                        res == KEY_F(F_HELP) || res == KEY_F(F_BACK) ||
-                        res == KEY_F(F_EXIT))
+                if (res == 10 || res == 27 || res == 'q'
+                    || res == KEY_F(F_BACK) || res == KEY_F(F_EXIT)) {
                         break;
+                }
                 if (start_y < 0)
                         start_y = 0;
                 if (start_y >= total_lines-text_lines)
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h
index 0d5261705ef..58fbda8fc0d 100644
--- a/scripts/kconfig/nconf.h
+++ b/scripts/kconfig/nconf.h
@@ -89,7 +89,7 @@ void fill_window(WINDOW *win, const char *text);
 int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...);
 int dialog_inputbox(WINDOW *main_window,
                 const char *title, const char *prompt,
-                const char *init, char **resultp, int *result_len);
+                const char *init, char *result, int result_len);
 void refresh_all_windows(WINDOW *main_window);
 void show_scroll_win(WINDOW *main_window,
                 const char *title,
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 33689396953..a4fe923c013 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -43,17 +43,6 @@
 #    make oldconfig
 #
 use strict;
-use Getopt::Long;
-
-# set the environment variable LOCALMODCONFIG_DEBUG to get
-# debug output.
-my $debugprint = 0;
-$debugprint = 1 if (defined($ENV{LOCALMODCONFIG_DEBUG}));
-
-sub dprint {
-    return if (!$debugprint);
-    print STDERR @_;
-}
 
 my $config = ".config";
 
@@ -100,7 +89,7 @@ my @searchconfigs = (
         },
 );
 
-sub read_config {
+sub find_config {
     foreach my $conf (@searchconfigs) {
         my $file = $conf->{"file"};
 
@@ -115,27 +104,18 @@ sub read_config {
 
         print STDERR "using config: '$file'\n";
 
-        open(my $infile, '-|', "$exec $file") || die "Failed to run $exec $file";
-        my @x = <$infile>;
-        close $infile;
-        return @x;
+        open(CIN, "$exec $file |") || die "Failed to run $exec $file";
+        return;
     }
     die "No config file found";
 }
 
-my @config_file = read_config;
-
-# Parse options
-my $localmodconfig = 0;
-my $localyesconfig = 0;
-
-GetOptions("localmodconfig" => \$localmodconfig,
-           "localyesconfig" => \$localyesconfig);
+find_config;
 
 # Get the build source and top level Kconfig file (passed in)
-my $ksource = ($ARGV[0] ? $ARGV[0] : '.');
+my $ksource = $ARGV[0];
 my $kconfig = $ARGV[1];
-my $lsmod_file = $ENV{'LSMOD'};
+my $lsmod_file = $ARGV[2];
 
 my @makefiles = `find $ksource -name Makefile 2>/dev/null`;
 chomp @makefiles;
@@ -171,8 +151,8 @@ sub read_kconfig {
         $source =~ s/\$$env/$ENV{$env}/;
     }
 
-    open(my $kinfile, '<', $source) || die "Can't open $kconfig";
-    while (<$kinfile>) {
+    open(KIN, "$source") || die "Can't open $kconfig";
+    while (<KIN>) {
         chomp;
 
         # Make sure that lines ending with \ continue
@@ -198,7 +178,6 @@ sub read_kconfig {
             $state = "NEW";
             $config = $2;
 
-            # Add depends for 'if' nesting
             for (my $i = 0; $i < $iflevel; $i++) {
                 if ($i) {
                     $depends{$config} .= " " . $ifdeps[$i];
@@ -217,11 +196,10 @@ sub read_kconfig {
 
         # Get the configs that select this config
         } elsif ($state ne "NONE" && /^\s*select\s+(\S+)/) {
-            my $conf = $1;
-            if (defined($selects{$conf})) {
-                $selects{$conf} .= " " . $config;
+            if (defined($selects{$1})) {
+                $selects{$1} .= " " . $config;
             } else {
-                $selects{$conf} = $config;
+                $selects{$1} = $config;
             }
 
         # configs without prompts must be selected
@@ -249,10 +227,10 @@ sub read_kconfig {
             $state = "NONE";
         }
     }
-    close($kinfile);
+    close(KIN);
 
     # read in any configs that were found.
-    foreach my $kconfig (@kconfigs) {
+    foreach $kconfig (@kconfigs) {
         if (!defined($read_kconfigs{$kconfig})) {
             $read_kconfigs{$kconfig} = 1;
             read_kconfig($kconfig);
@@ -264,63 +242,33 @@ if ($kconfig) {
     read_kconfig($kconfig);
 }
 
-# Makefiles can use variables to define their dependencies
-sub convert_vars {
-    my ($line, %vars) = @_;
-
-    my $process = "";
-
-    while ($line =~ s/^(.*?)(\$\((.*?)\))//) {
-        my $start = $1;
-        my $variable = $2;
-        my $var = $3;
-
-        if (defined($vars{$var})) {
-            $process .= $start . $vars{$var};
-        } else {
-            $process .= $start . $variable;
-        }
-    }
-
-    $process .= $line;
-
-    return $process;
-}
-
 # Read all Makefiles to map the configs to the objects
 foreach my $makefile (@makefiles) {
 
-    my $line = "";
-    my %make_vars;
-
-    open(my $infile, '<', $makefile) || die "Can't open $makefile";
-    while (<$infile>) {
-        # if this line ends with a backslash, continue
-        chomp;
-        if (/^(.*)\\$/) {
-            $line .= $1;
-            next;
-        }
-
-        $line .= $_;
-        $_ = $line;
-        $line = "";
+    my $cont = 0;
 
+    open(MIN,$makefile) || die "Can't open $makefile";
+    while (<MIN>) {
         my $objs;
 
-        # Convert variables in a line (could define configs)
-        $_ = convert_vars($_, %make_vars);
+        # is this a line after a line with a backslash?
+        if ($cont && /(\S.*)$/) {
+            $objs = $1;
+        }
+        $cont = 0;
 
         # collect objects after obj-$(CONFIG_FOO_BAR)
         if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
             $var = $1;
             $objs = $2;
-
-        # check if variables are set
-        } elsif (/^\s*(\S+)\s*[:]?=\s*(.*\S)/) {
-            $make_vars{$1} = $2;
         }
         if (defined($objs)) {
+            # test if the line ends with a backslash
+            if ($objs =~ m,(.*)\\$,) {
+                $objs = $1;
+                $cont = 1;
+            }
+
             foreach my $obj (split /\s+/,$objs) {
                 $obj =~ s/-/_/g;
                 if ($obj =~ /(.*)\.o$/) {
@@ -341,24 +289,22 @@ foreach my $makefile (@makefiles) {
             }
         }
     }
-    close($infile);
+    close(MIN);
 }
 
 my %modules;
-my $linfile;
 
 if (defined($lsmod_file)) {
     if ( ! -f $lsmod_file) {
-        if ( -f $ENV{'objtree'}."/".$lsmod_file) {
-            $lsmod_file = $ENV{'objtree'}."/".$lsmod_file;
-        } else {
-                die "$lsmod_file not found";
-        }
+        die "$lsmod_file not found";
+    }
+    if ( -x $lsmod_file) {
+        # the file is executable, run it
+        open(LIN, "$lsmod_file|");
+    } else {
+        # Just read the contents
+        open(LIN, "$lsmod_file");
     }
-
-    my $otype = ( -x $lsmod_file) ? '-|' : '<';
-    open($linfile, $otype, $lsmod_file);
-
 } else {
 
     # see what modules are loaded on this system
@@ -375,27 +321,25 @@ if (defined($lsmod_file)) {
         $lsmod = "lsmod";
     }
 
-    open($linfile, '-|', $lsmod) || die "Can not call lsmod with $lsmod";
+    open(LIN,"$lsmod|") || die "Can not call lsmod with $lsmod";
 }
 
-while (<$linfile>) {
+while (<LIN>) {
         next if (/^Module/);  # Skip the first line.
         if (/^(\S+)/) {
                 $modules{$1} = 1;
         }
 }
-close ($linfile);
+close (LIN);
 
 # add to the configs hash all configs that are needed to enable
-# a loaded module. This is a direct obj-${CONFIG_FOO} += bar.o
-# where we know we need bar.o so we add FOO to the list.
+# a loaded module.
 my %configs;
 foreach my $module (keys(%modules)) {
     if (defined($objects{$module})) {
         my @arr = @{$objects{$module}};
         foreach my $conf (@arr) {
             $configs{$conf} = $module;
-            dprint "$conf added by direct ($module)\n";
         }
     } else {
         # Most likely, someone has a custom (binary?) module loaded.
@@ -403,24 +347,9 @@ foreach my $module (keys(%modules)) {
     }
 }
 
-# Read the current config, and see what is enabled. We want to
-# ignore configs that we would not enable anyway.
-
-my %orig_configs;
 my $valid = "A-Za-z_0-9";
-
-foreach my $line (@config_file) {
-    $_ = $line;
-
-    if (/(CONFIG_[$valid]*)=(m|y)/) {
-        $orig_configs{$1} = $2;
-    }
-}
-
 my $repeat = 1;
 
-my $depconfig;
-
 #
 # Note, we do not care about operands (like: &&, ||, !) we want to add any
 # config that is in the depend list of another config. This script does
@@ -429,7 +358,7 @@ my $depconfig;
 # to keep on. If A was on in the original config, B would not have been
 # and B would not be turned on by this script.
 #
-sub parse_config_depends
+sub parse_config_dep_select
 {
     my ($p) = @_;
 
@@ -440,16 +369,10 @@ sub parse_config_depends
 
             $p =~ s/^[^$valid]*[$valid]+//;
 
-            # We only need to process if the depend config is a module
-            if (!defined($orig_configs{$conf}) || !$orig_configs{conf} eq "m") {
-                next;
-            }
-
             if (!defined($configs{$conf})) {
                 # We must make sure that this config has its
                 # dependencies met.
                 $repeat = 1; # do again
-                dprint "$conf selected by depend $depconfig\n";
                 $configs{$conf} = 1;
             }
         } else {
@@ -458,132 +381,31 @@ sub parse_config_depends
     }
 }
 
-# Select is treated a bit differently than depends. We call this
-# when a config has no prompt and requires another config to be
-# selected. We use to just select all configs that selected this
-# config, but found that that can balloon into enabling hundreds
-# of configs that we do not care about.
-#
-# The idea is we look at all the configs that select it. If one
-# is already in our list of configs to enable, then there's nothing
-# else to do. If there isn't, we pick the first config that was
-# enabled in the orignal config and use that.
-sub parse_config_selects
-{
-    my ($config, $p) = @_;
-
-    my $next_config;
-
-    while ($p =~ /[$valid]/) {
-
-        if ($p =~ /^[^$valid]*([$valid]+)/) {
-            my $conf = "CONFIG_" . $1;
-
-            $p =~ s/^[^$valid]*[$valid]+//;
+while ($repeat) {
+    $repeat = 0;
 
-            # Make sure that this config exists in the current .config file
-            if (!defined($orig_configs{$conf})) {
-                dprint "$conf not set for $config select\n";
-                next;
-            }
+    foreach my $config (keys %configs) {
+        $config =~ s/^CONFIG_//;
 
-            # Check if something other than a module selects this config
-            if (defined($orig_configs{$conf}) && $orig_configs{$conf} ne "m") {
-                dprint "$conf (non module) selects config, we are good\n";
-                # we are good with this
-                return;
-            }
-            if (defined($configs{$conf})) {
-                dprint "$conf selects $config so we are good\n";
-                # A set config selects this config, we are good
-                return;
-            }
-            # Set this config to be selected
-            if (!defined($next_config)) {
-                $next_config = $conf;
-            }
-        } else {
-            die "this should never happen";
+        if (defined($depends{$config})) {
+            # This config has dependencies. Make sure they are also included
+            parse_config_dep_select $depends{$config};
         }
-    }
-
-    # If no possible config selected this, then something happened.
-    if (!defined($next_config)) {
-        print STDERR "WARNING: $config is required, but nothing in the\n";
-        print STDERR "  current config selects it.\n";
-        return;
-    }
-
-    # If we are here, then we found no config that is set and
-    # selects this config. Repeat.
-    $repeat = 1;
-    # Make this config need to be selected
-    $configs{$next_config} = 1;
-    dprint "$next_config selected by select $config\n";
-}
-
-my %process_selects;
-
-# loop through all configs, select their dependencies.
-sub loop_depend {
-    $repeat = 1;
 
-    while ($repeat) {
-        $repeat = 0;
-
-      forloop:
-        foreach my $config (keys %configs) {
-
-            # If this config is not a module, we do not need to process it
-            if (defined($orig_configs{$config}) && $orig_configs{$config} ne "m") {
-                next forloop;
-            }
-
-            $config =~ s/^CONFIG_//;
-            $depconfig = $config;
-
-            if (defined($depends{$config})) {
-                # This config has dependencies. Make sure they are also included
-                parse_config_depends $depends{$config};
-            }
-
-            # If the config has no prompt, then we need to check if a config
-            # that is enabled selected it. Or if we need to enable one.
-            if (!defined($prompts{$config}) && defined($selects{$config})) {
-                $process_selects{$config} = 1;
-            }
+        if (defined($prompts{$config}) || !defined($selects{$config})) {
+            next;
         }
-    }
-}
-
-sub loop_select {
-
-    foreach my $config (keys %process_selects) {
-        $config =~ s/^CONFIG_//;
-
-        dprint "Process select $config\n";
 
         # config has no prompt and must be selected.
-        parse_config_selects $config, $selects{$config};
+        parse_config_dep_select $selects{$config};
     }
 }
 
-while ($repeat) {
-    # Get the first set of configs and their dependencies.
-    loop_depend;
-
-    $repeat = 0;
-
-    # Now we need to see if we have to check selects;
-    loop_select;
-}           
-
 my %setconfigs;
 
 # Finally, read the .config file and turn off any module enabled that
 # we could not find a reason to keep enabled.
-foreach my $line (@config_file) {
-    $_ = $line;
+while(<CIN>) {
 
     if (/CONFIG_IKCONFIG/) {
         if (/# CONFIG_IKCONFIG is not set/) {
@@ -599,13 +421,7 @@ foreach my $line (@config_file) {
 
     if (/^(CONFIG.*)=(m|y)/) {
         if (defined($configs{$1})) {
-            if ($localyesconfig) {
-                $setconfigs{$1} = 'y';
-                print "$1=y\n";
-                next;
-            } else {
-                $setconfigs{$1} = $2;
-            }
+            $setconfigs{$1} = $2;
         } elsif ($2 eq "m") {
             print "# $1 is not set\n";
             next;
@@ -613,6 +429,7 @@ foreach my $line (@config_file) {
     }
     print;
 }
+close(CIN);
 
 # Integrity check, make sure all modules that we want enabled do
 # indeed have their configs set.
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 22a3c400fc4..071f00c3046 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -262,18 +262,11 @@ static struct symbol *sym_calc_choice(struct symbol *sym)
         struct symbol *def_sym;
         struct property *prop;
         struct expr *e;
-        int flags;
 
         /* first calculate all choice values' visibilities */
-        flags = sym->flags;
         prop = sym_get_choice_prop(sym);
-        expr_list_for_each_sym(prop->expr, e, def_sym) {
+        expr_list_for_each_sym(prop->expr, e, def_sym)
                 sym_calc_visibility(def_sym);
-                if (def_sym->visible != no)
-                        flags &= def_sym->flags;
-        }
-
-        sym->flags &= flags | ~SYMBOL_DEF_USER;
 
         /* is the user choice visible? */
         def_sym = sym->def[S_DEF_USER].val;
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index f565536a2be..d793001929c 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -5,8 +5,7 @@ use strict;
 ## Copyright (c) 1998 Michael Zucchi, All Rights Reserved        ##
 ## Copyright (C) 2000, 1  Tim Waugh <twaugh@redhat.com>          ##
 ## Copyright (C) 2001  Simon Huggins                             ##
-## Copyright (C) 2005-2012  Randy Dunlap                         ##
-## Copyright (C) 2012  Dan Luedtke                               ##
+## Copyright (C) 2005-2010  Randy Dunlap                         ##
 ##                                                               ##
 ## #define enhancements by Armin Kuster <akuster@mvista.com>     ##
 ## Copyright (c) 2000 MontaVista Software, Inc.                  ##
@@ -36,8 +35,6 @@ use strict;
 #              Small fixes (like spaces vs. \s in regex)
 # -- Tim Jansen <tim@tjansen.de>
 
-# 25/07/2012 - Added support for HTML5
-# -- Dan Luedtke <mail@danrl.de>
 
 #
 # This will read a 'c' file and scan for embedded comments in the
@@ -47,16 +44,12 @@ use strict;
 # Note: This only supports 'c'.
 
 # usage:
-# kernel-doc [ -docbook | -html | -html5 | -text | -man | -list ]
-#            [ -no-doc-sections ]
-#            [ -function funcname [ -function funcname ...] ]
-#            c file(s)s > outputfile
+# kernel-doc [ -docbook | -html | -text | -man | -list ] [ -no-doc-sections ]
+#           [ -function funcname [ -function funcname ...] ] c file(s)s > outputfile
 # or
-#            [ -nofunction funcname [ -function funcname ...] ]
-#            c file(s)s > outputfile
+#           [ -nofunction funcname [ -function funcname ...] ] c file(s)s > outputfile
 #
-#  Set output format using one of -docbook -html -html5 -text or -man.
-#  Default is man.
+#  Set output format using one of -docbook -html -text or -man.  Default is man.
 #  The -list format is for internal use by docproc.
 #
 #  -no-doc-sections
@@ -137,8 +130,6 @@ use strict;
 # should document the "Context:" of the function, e.g. whether the functions
 # can be called form interrupts. Unlike other sections you can end it with an
 # empty line.
-# A non-void function should have a "Return:" section describing the return
-# value(s).
 # Example-sections should contain the string EXAMPLE so that they are marked
 # appropriately in DocBook.
 #
@@ -191,14 +182,6 @@ my $local_lt = "\\\\\\\\lt:";
 my $local_gt = "\\\\\\\\gt:";
 my $blankline_html = $local_lt . "p" . $local_gt;       # was "<p>"
 
-# html version 5
-my %highlights_html5 = ( $type_constant, "<span class=\"const\">\$1</span>",
-                        $type_func, "<span class=\"func\">\$1</span>",
-                        $type_struct_xml, "<span class=\"struct\">\$1</span>",
-                        $type_env, "<span class=\"env\">\$1</span>",
-                        $type_param, "<span class=\"param\">\$1</span>" );
-my $blankline_html5 = $local_lt . "br /" . $local_gt;
-
 # XML, docbook format
 my %highlights_xml = ( "([^=])\\\"([^\\\"<]+)\\\"", "\$1<quote>\$2</quote>",
                         $type_constant, "<constant>\$1</constant>",
@@ -247,7 +230,6 @@ my $dohighlight = "";
 
 my $verbose = 0;
 my $output_mode = "man";
-my $output_preformatted = 0;
 my $no_doc_sections = 0;
 my %highlights = %highlights_man;
 my $blankline = $blankline_man;
@@ -298,10 +280,9 @@ my $doc_special = "\@\%\$\&";
 my $doc_start = '^/\*\*\s*$'; # Allow whitespace at end of comment start.
 my $doc_end = '\*/';
 my $doc_com = '\s*\*\s*';
-my $doc_com_body = '\s*\* ?';
 my $doc_decl = $doc_com . '(\w+)';
 my $doc_sect = $doc_com . '([' . $doc_special . ']?[\w\s]+):(.*)';
-my $doc_content = $doc_com_body . '(.*)';
+my $doc_content = $doc_com . '(.*)';
 my $doc_block = $doc_com . 'DOC:\s*(.*)?';
 
 my %constants;
@@ -317,7 +298,6 @@ my $section_default = "Description";	# default section
 my $section_intro = "Introduction";
 my $section = $section_default;
 my $section_context = "Context";
-my $section_return = "Return";
 
 my $undescribed = "-- undescribed --";
 
@@ -329,10 +309,6 @@ while ($ARGV[0] =~ m/^-(.*)/) {
         $output_mode = "html";
         %highlights = %highlights_html;
         $blankline = $blankline_html;
-    } elsif ($cmd eq "-html5") {
-        $output_mode = "html5";
-        %highlights = %highlights_html5;
-        $blankline = $blankline_html5;
     } elsif ($cmd eq "-man") {
         $output_mode = "man";
         %highlights = %highlights_man;
@@ -375,11 +351,10 @@ while ($ARGV[0] =~ m/^-(.*)/) {
 # continue execution near EOF;
 
 sub usage {
-    print "Usage: $0 [ -docbook | -html | -html5 | -text | -man | -list ]\n";
+    print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man | -list ]\n";
     print "         [ -no-doc-sections ]\n";
     print "         [ -function funcname [ -function funcname ...] ]\n";
     print "         [ -nofunction funcname [ -nofunction funcname ...] ]\n";
-    print "         [ -v ]\n";
     print "         c source file(s) > outputfile\n";
     print "         -v : verbose output, more warnings & other info listed\n";
     exit 1;
@@ -473,8 +448,7 @@ sub output_highlight {
 #       confess "output_highlight got called with no args?\n";
 #   }
 
-    if ($output_mode eq "html" || $output_mode eq "html5" ||
-        $output_mode eq "xml") {
+    if ($output_mode eq "html" || $output_mode eq "xml") {
         $contents = local_unescape($contents);
         # convert data read & converted thru xml_escape() into &xyz; format:
         $contents =~ s/\\\\\\/\&/g;
@@ -484,19 +458,9 @@ sub output_highlight {
     die $@ if $@;
 #   print STDERR "contents af:$contents\n";
 
-#   strip whitespaces when generating html5
-    if ($output_mode eq "html5") {
-        $contents =~ s/^\s+//;
-        $contents =~ s/\s+$//;
-    }
     foreach $line (split "\n", $contents) {
-        if (! $output_preformatted) {
-            $line =~ s/^\s*//;
-        }
         if ($line eq ""){
-            if (! $output_preformatted) {
-                print $lineprefix, local_unescape($blankline);
-            }
+            print $lineprefix, local_unescape($blankline);
         } else {
             $line =~ s/\\\\\\/\&/g;
             if ($output_mode eq "man" && substr($line, 0, 1) eq ".") {
@@ -509,7 +473,7 @@ sub output_highlight {
     }
 }
 
-# output sections in html
+#output sections in html
 sub output_section_html(%) {
     my %args = %{$_[0]};
     my $section;
@@ -669,239 +633,6 @@ sub output_blockhead_html(%) {
     print "<hr>\n";
 }
 
-# output sections in html5
-sub output_section_html5(%) {
-    my %args = %{$_[0]};
-    my $section;
-
-    foreach $section (@{$args{'sectionlist'}}) {
-        print "<section>\n";
-        print "<h1>$section</h1>\n";
-        print "<p>\n";
-        output_highlight($args{'sections'}{$section});
-        print "</p>\n";
-        print "</section>\n";
-    }
-}
-
-# output enum in html5
-sub output_enum_html5(%) {
-    my %args = %{$_[0]};
-    my ($parameter);
-    my $count;
-    my $html5id;
-
-    $html5id = $args{'enum'};
-    $html5id =~ s/[^a-zA-Z0-9\-]+/_/g;
-    print "<article class=\"enum\" id=\"enum:". $html5id . "\">";
-    print "<h1>enum " . $args{'enum'} . "</h1>\n";
-    print "<ol class=\"code\">\n";
-    print "<li>";
-    print "<span class=\"keyword\">enum</span> ";
-    print "<span class=\"identifier\">" . $args{'enum'} . "</span> {";
-    print "</li>\n";
-    $count = 0;
-    foreach $parameter (@{$args{'parameterlist'}}) {
-        print "<li class=\"indent\">";
-        print "<span class=\"param\">" . $parameter . "</span>";
-        if ($count != $#{$args{'parameterlist'}}) {
-            $count++;
-            print ",";
-        }
-        print "</li>\n";
-    }
-    print "<li>};</li>\n";
-    print "</ol>\n";
-
-    print "<section>\n";
-    print "<h1>Constants</h1>\n";
-    print "<dl>\n";
-    foreach $parameter (@{$args{'parameterlist'}}) {
-        print "<dt>" . $parameter . "</dt>\n";
-        print "<dd>";
-        output_highlight($args{'parameterdescs'}{$parameter});
-        print "</dd>\n";
-    }
-    print "</dl>\n";
-    print "</section>\n";
-    output_section_html5(@_);
-    print "</article>\n";
-}
-
-# output typedef in html5
-sub output_typedef_html5(%) {
-    my %args = %{$_[0]};
-    my ($parameter);
-    my $count;
-    my $html5id;
-
-    $html5id = $args{'typedef'};
-    $html5id =~ s/[^a-zA-Z0-9\-]+/_/g;
-    print "<article class=\"typedef\" id=\"typedef:" . $html5id . "\">\n";
-    print "<h1>typedef " . $args{'typedef'} . "</h1>\n";
-
-    print "<ol class=\"code\">\n";
-    print "<li>";
-    print "<span class=\"keyword\">typedef</span> ";
-    print "<span class=\"identifier\">" . $args{'typedef'} . "</span>";
-    print "</li>\n";
-    print "</ol>\n";
-    output_section_html5(@_);
-    print "</article>\n";
-}
-
-# output struct in html5
-sub output_struct_html5(%) {
-    my %args = %{$_[0]};
-    my ($parameter);
-    my $html5id;
-
-    $html5id = $args{'struct'};
-    $html5id =~ s/[^a-zA-Z0-9\-]+/_/g;
-    print "<article class=\"struct\" id=\"struct:" . $html5id . "\">\n";
-    print "<hgroup>\n";
-    print "<h1>" . $args{'type'} . " " . $args{'struct'} . "</h1>";
-    print "<h2>". $args{'purpose'} . "</h2>\n";
-    print "</hgroup>\n";
-    print "<ol class=\"code\">\n";
-    print "<li>";
-    print "<span class=\"type\">" . $args{'type'} . "</span> ";
-    print "<span class=\"identifier\">" . $args{'struct'} . "</span> {";
-    print "</li>\n";
-    foreach $parameter (@{$args{'parameterlist'}}) {
-        print "<li class=\"indent\">";
-        if ($parameter =~ /^#/) {
-                print "<span class=\"param\">" . $parameter ."</span>\n";
-                print "</li>\n";
-                next;
-        }
-        my $parameter_name = $parameter;
-        $parameter_name =~ s/\[.*//;
-
-        ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
-        $type = $args{'parametertypes'}{$parameter};
-        if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
-            # pointer-to-function
-            print "<span class=\"type\">$1</span> ";
-            print "<span class=\"param\">$parameter</span>";
-            print "<span class=\"type\">)</span> ";
-            print "(<span class=\"args\">$2</span>);";
-        } elsif ($type =~ m/^(.*?)\s*(:.*)/) {
-            # bitfield
-            print "<span class=\"type\">$1</span> ";
-            print "<span class=\"param\">$parameter</span>";
-            print "<span class=\"bits\">$2</span>;";
-        } else {
-            print "<span class=\"type\">$type</span> ";
-            print "<span class=\"param\">$parameter</span>;";
-        }
-        print "</li>\n";
-    }
-    print "<li>};</li>\n";
-    print "</ol>\n";
-
-    print "<section>\n";
-    print "<h1>Members</h1>\n";
-    print "<dl>\n";
-    foreach $parameter (@{$args{'parameterlist'}}) {
-        ($parameter =~ /^#/) && next;
-
-        my $parameter_name = $parameter;
-        $parameter_name =~ s/\[.*//;
-
-        ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
-        print "<dt>" . $parameter . "</dt>\n";
-        print "<dd>";
-        output_highlight($args{'parameterdescs'}{$parameter_name});
-        print "</dd>\n";
-    }
-    print "</dl>\n";
-    print "</section>\n";
-    output_section_html5(@_);
-    print "</article>\n";
-}
-
-# output function in html5
-sub output_function_html5(%) {
-    my %args = %{$_[0]};
-    my ($parameter, $section);
-    my $count;
-    my $html5id;
-
-    $html5id = $args{'function'};
-    $html5id =~ s/[^a-zA-Z0-9\-]+/_/g;
-    print "<article class=\"function\" id=\"func:". $html5id . "\">\n";
-    print "<hgroup>\n";
-    print "<h1>" . $args{'function'} . "</h1>";
-    print "<h2>" . $args{'purpose'} . "</h2>\n";
-    print "</hgroup>\n";
-    print "<ol class=\"code\">\n";
-    print "<li>";
-    print "<span class=\"type\">" . $args{'functiontype'} . "</span> ";
-    print "<span class=\"identifier\">" . $args{'function'} . "</span> (";
-    print "</li>";
-    $count = 0;
-    foreach $parameter (@{$args{'parameterlist'}}) {
-        print "<li class=\"indent\">";
-        $type = $args{'parametertypes'}{$parameter};
-        if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {
-            # pointer-to-function
-            print "<span class=\"type\">$1</span> ";
-            print "<span class=\"param\">$parameter</span>";
-            print "<span class=\"type\">)</span> ";
-            print "(<span class=\"args\">$2</span>)";
-        } else {
-            print "<span class=\"type\">$type</span> ";
-            print "<span class=\"param\">$parameter</span>";
-        }
-        if ($count != $#{$args{'parameterlist'}}) {
-            $count++;
-            print ",";
-        }
-        print "</li>\n";
-    }
-    print "<li>)</li>\n";
-    print "</ol>\n";
-
-    print "<section>\n";
-    print "<h1>Arguments</h1>\n";
-    print "<p>\n";
-    print "<dl>\n";
-    foreach $parameter (@{$args{'parameterlist'}}) {
-        my $parameter_name = $parameter;
-        $parameter_name =~ s/\[.*//;
-
-        ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next;
-        print "<dt>" . $parameter . "</dt>\n";
-        print "<dd>";
-        output_highlight($args{'parameterdescs'}{$parameter_name});
-        print "</dd>\n";
-    }
-    print "</dl>\n";
-    print "</section>\n";
-    output_section_html5(@_);
-    print "</article>\n";
-}
-
-# output DOC: block header in html5
-sub output_blockhead_html5(%) {
-    my %args = %{$_[0]};
-    my ($parameter, $section);
-    my $count;
-    my $html5id;
-
-    foreach $section (@{$args{'sectionlist'}}) {
-        $html5id = $section;
-        $html5id =~ s/[^a-zA-Z0-9\-]+/_/g;
-        print "<article class=\"doc\" id=\"doc:". $html5id . "\">\n";
-        print "<h1>$section</h1>\n";
-        print "<p>\n";
-        output_highlight($args{'sections'}{$section});
-        print "</p>\n";
-    }
-    print "</article>\n";
-}
-
 sub output_section_xml(%) {
     my %args = %{$_[0]};
     my $section;
@@ -912,12 +643,10 @@ sub output_section_xml(%) {
         print "<title>$section</title>\n";
         if ($section =~ m/EXAMPLE/i) {
             print "<informalexample><programlisting>\n";
-            $output_preformatted = 1;
         } else {
             print "<para>\n";
         }
         output_highlight($args{'sections'}{$section});
-        $output_preformatted = 0;
         if ($section =~ m/EXAMPLE/i) {
             print "</programlisting></informalexample>\n";
         } else {
@@ -1220,12 +949,10 @@ sub output_blockhead_xml(%) {
         }
         if ($section =~ m/EXAMPLE/i) {
             print "<example><para>\n";
-            $output_preformatted = 1;
         } else {
             print "<para>\n";
         }
         output_highlight($args{'sections'}{$section});
-        $output_preformatted = 0;
         if ($section =~ m/EXAMPLE/i) {
             print "</para></example>\n";
         } else {
@@ -1301,12 +1028,10 @@ sub output_function_gnome {
         print "<simplesect>\n <title>$section</title>\n";
         if ($section =~ m/EXAMPLE/i) {
             print "<example><programlisting>\n";
-            $output_preformatted = 1;
         } else {
         }
         print "<para>\n";
         output_highlight($args{'sections'}{$section});
-        $output_preformatted = 0;
         print "</para>\n";
         if ($section =~ m/EXAMPLE/i) {
             print "</programlisting></example>\n";
@@ -2042,28 +1767,6 @@ sub check_sections($$$$$$) {
 }
 
 ##
-# Checks the section describing the return value of a function.
-sub check_return_section {
-        my $file = shift;
-        my $declaration_name = shift;
-        my $return_type = shift;
-
-        # Ignore an empty return type (It's a macro)
-        # Ignore functions with a "void" return type. (But don't ignore "void *")
-        if (($return_type eq "") || ($return_type =~ /void\s*\w*\s*$/)) {
-                return;
-        }
-
-        if (!defined($sections{$section_return}) ||
-            $sections{$section_return} eq "") {
-                print STDERR "Warning(${file}:$.): " .
-                        "No description found for return value of " .
-                        "'$declaration_name'\n";
-                ++$warnings;
-        }
-}
-
-##
 # takes a function prototype and the name of the current file being
 # processed and spits out all the details stored in the global
 # arrays/hashes.
@@ -2079,10 +1782,9 @@ sub dump_function($$) {
     $prototype =~ s/^__inline +//;
     $prototype =~ s/^__always_inline +//;
     $prototype =~ s/^noinline +//;
+    $prototype =~ s/__devinit +//;
     $prototype =~ s/__init +//;
     $prototype =~ s/__init_or_module +//;
-    $prototype =~ s/__must_check +//;
-    $prototype =~ s/__weak +//;
     $prototype =~ s/^#\s*define\s+//; #ak added
     $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//;
 
@@ -2133,15 +1835,6 @@ sub dump_function($$) {
         my $prms = join " ", @parameterlist;
         check_sections($file, $declaration_name, "function", $sectcheck, $prms, "");
 
-        # This check emits a lot of warnings at the moment, because many
-        # functions don't have a 'Return' doc section. So until the number
-        # of warnings goes sufficiently down, the check is only performed in
-        # verbose mode.
-        # TODO: always perform the check.
-        if ($verbose) {
-                check_return_section($file, $declaration_name, $return_type);
-        }
-
     output_declaration($declaration_name,
                        'function',
                        {'function' => $declaration_name,
@@ -2351,9 +2044,6 @@ sub process_file($) {
 
     $section_counter = 0;
     while (<IN>) {
-        while (s/\\\s*$//) {
-            $_ .= <IN>;
-        }
         if ($state == 0) {
             if (/$doc_start/o) {
                 $state = 1;             # next line is always the function name
@@ -2381,7 +2071,7 @@ sub process_file($) {
                     $descr= $1;
                     $descr =~ s/^\s*//;
                     $descr =~ s/\s*$//;
-                    $descr =~ s/\s+/ /g;
+                    $descr =~ s/\s+/ /;
                     $declaration_purpose = xml_escape($descr);
                     $in_purpose = 1;
                 } else {
@@ -2473,7 +2163,6 @@ sub process_file($) {
                     # Continued declaration purpose
                     chomp($declaration_purpose);
                     $declaration_purpose .= " " . xml_escape($1);
-                    $declaration_purpose =~ s/\s+/ /g;
                 } else {
                     $contents .= $1 . "\n";
                 }
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
deleted file mode 100644
index b3d907eb93a..00000000000
--- a/scripts/link-vmlinux.sh
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/sh
-#
-# link vmlinux
-#
-# vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_INIT) and
-# $(KBUILD_VMLINUX_MAIN). Most are built-in.o files from top-level directories
-# in the kernel tree, others are specified in arch/$(ARCH)/Makefile.
-# Ordering when linking is important, and $(KBUILD_VMLINUX_INIT) must be first.
-#
-# vmlinux
-#   ^
-#   |
-#   +-< $(KBUILD_VMLINUX_INIT)
-#   |   +--< init/version.o + more
-#   |
-#   +--< $(KBUILD_VMLINUX_MAIN)
-#   |    +--< drivers/built-in.o mm/built-in.o + more
-#   |
-#   +-< ${kallsymso} (see description in KALLSYMS section)
-#
-# vmlinux version (uname -v) cannot be updated during normal
-# descending-into-subdirs phase since we do not yet know if we need to
-# update vmlinux.
-# Therefore this step is delayed until just before final link of vmlinux.
-#
-# System.map is generated to document addresses of all kernel symbols
-
-# Error out on error
-set -e
-
-# Nice output in kbuild format
-# Will be supressed by "make -s"
-info()
-{
-        if [ "${quiet}" != "silent_" ]; then
-                printf "  %-7s %s\n" ${1} ${2}
-        fi
-}
-
-# Link of vmlinux.o used for section mismatch analysis
-# ${1} output file
-modpost_link()
-{
-        ${LD} ${LDFLAGS} -r -o ${1} ${KBUILD_VMLINUX_INIT}                   \
-                --start-group ${KBUILD_VMLINUX_MAIN} --end-group
-}
-
-# Link of vmlinux
-# ${1} - optional extra .o files
-# ${2} - output file
-vmlinux_link()
-{
-        local lds="${objtree}/${KBUILD_LDS}"
-
-        if [ "${SRCARCH}" != "um" ]; then
-                ${LD} ${LDFLAGS} ${LDFLAGS_vmlinux} -o ${2}                  \
-                        -T ${lds} ${KBUILD_VMLINUX_INIT}                     \
-                        --start-group ${KBUILD_VMLINUX_MAIN} --end-group ${1}
-        else
-                ${CC} ${CFLAGS_vmlinux} -o ${2}                              \
-                        -Wl,-T,${lds} ${KBUILD_VMLINUX_INIT}                 \
-                        -Wl,--start-group                                    \
-                                 ${KBUILD_VMLINUX_MAIN}                      \
-                        -Wl,--end-group                                      \
-                        -lutil ${1}
-                rm -f linux
-        fi
-}
-
-
-# Create ${2} .o file with all symbols from the ${1} object file
-kallsyms()
-{
-        info KSYM ${2}
-        local kallsymopt;
-
-        if [ -n "${CONFIG_SYMBOL_PREFIX}" ]; then
-                kallsymopt="${kallsymopt} \
-                            --symbol-prefix=${CONFIG_SYMBOL_PREFIX}"
-        fi
-
-        if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
-                kallsymopt="${kallsymopt} --all-symbols"
-        fi
-
-        local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
-                      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
-
-        ${NM} -n ${1} | \
-                scripts/kallsyms ${kallsymopt} | \
-                ${CC} ${aflags} -c -o ${2} -x assembler-with-cpp -
-}
-
-# Create map file with all symbols from ${1}
-# See mksymap for additional details
-mksysmap()
-{
-        ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2}
-}
-
-sortextable()
-{
-        ${objtree}/scripts/sortextable ${1}
-}
-
-# Delete output files in case of error
-trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM ERR
-cleanup()
-{
-        rm -f .old_version
-        rm -f .tmp_System.map
-        rm -f .tmp_kallsyms*
-        rm -f .tmp_version
-        rm -f .tmp_vmlinux*
-        rm -f System.map
-        rm -f vmlinux
-        rm -f vmlinux.o
-}
-
-#
-#
-# Use "make V=1" to debug this script
-case "${KBUILD_VERBOSE}" in
-*1*)
-        set -x
-        ;;
-esac
-
-if [ "$1" = "clean" ]; then
-        cleanup
-        exit 0
-fi
-
-# We need access to CONFIG_ symbols
-. ./.config
-
-#link vmlinux.o
-info LD vmlinux.o
-modpost_link vmlinux.o
-
-# modpost vmlinux.o to check for section mismatches
-${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o
-
-# Update version
-info GEN .version
-if [ ! -r .version ]; then
-        rm -f .version;
-        echo 1 >.version;
-else
-        mv .version .old_version;
-        expr 0$(cat .old_version) + 1 >.version;
-fi;
-
-# final build of init/
-${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
-
-kallsymso=""
-kallsyms_vmlinux=""
-if [ -n "${CONFIG_KALLSYMS}" ]; then
-
-        # kallsyms support
-        # Generate section listing all symbols and add it into vmlinux
-        # It's a three step process:
-        # 1)  Link .tmp_vmlinux1 so it has all symbols and sections,
-        #     but __kallsyms is empty.
-        #     Running kallsyms on that gives us .tmp_kallsyms1.o with
-        #     the right size
-        # 2)  Link .tmp_vmlinux2 so it now has a __kallsyms section of
-        #     the right size, but due to the added section, some
-        #     addresses have shifted.
-        #     From here, we generate a correct .tmp_kallsyms2.o
-        # 2a) We may use an extra pass as this has been necessary to
-        #     woraround some alignment related bugs.
-        #     KALLSYMS_EXTRA_PASS=1 is used to trigger this.
-        # 3)  The correct ${kallsymso} is linked into the final vmlinux.
-        #
-        # a)  Verify that the System.map from vmlinux matches the map from
-        #     ${kallsymso}.
-
-        kallsymso=.tmp_kallsyms2.o
-        kallsyms_vmlinux=.tmp_vmlinux2
-
-        # step 1
-        vmlinux_link "" .tmp_vmlinux1
-        kallsyms .tmp_vmlinux1 .tmp_kallsyms1.o
-
-        # step 2
-        vmlinux_link .tmp_kallsyms1.o .tmp_vmlinux2
-        kallsyms .tmp_vmlinux2 .tmp_kallsyms2.o
-
-        # step 2a
-        if [ -n "${KALLSYMS_EXTRA_PASS}" ]; then
-                kallsymso=.tmp_kallsyms3.o
-                kallsyms_vmlinux=.tmp_vmlinux3
-
-                vmlinux_link .tmp_kallsyms2.o .tmp_vmlinux3
-
-                kallsyms .tmp_vmlinux3 .tmp_kallsyms3.o
-        fi
-fi
-
-info LD vmlinux
-vmlinux_link "${kallsymso}" vmlinux
-
-if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
-        info SORTEX vmlinux
-        sortextable vmlinux
-fi
-
-info SYSMAP System.map
-mksysmap vmlinux System.map
-
-# step a (see comment above)
-if [ -n "${CONFIG_KALLSYMS}" ]; then
-        mksysmap ${kallsyms_vmlinux} .tmp_System.map
-
-        if ! cmp -s System.map .tmp_System.map; then
-                echo >&2 Inconsistent kallsyms data
-                echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround
-                cleanup
-                exit 1
-        fi
-fi
-
-# We made a new kernel - delete old version file
-rm -f .old_version
diff --git a/scripts/mksysmap b/scripts/mksysmap
index c1b6191ef87..6e133a0bae7 100644
--- a/scripts/mksysmap
+++ b/scripts/mksysmap
@@ -16,7 +16,7 @@
 #   The second row specify the type of the symbol:
 #   A = Absolute
 #   B = Uninitialised data (.bss)
-#   C = Common symbol
+#   C = Comon symbol
 #   D = Initialised data
 #   G = Initialised data for small objects
 #   I = Indirect reference to another symbol
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index df4fc23dd83..e26e2fb462d 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -28,7 +28,6 @@ typedef Elf64_Addr	kernel_ulong_t;
 #endif
 
 #include <ctype.h>
-#include <stdbool.h>
 
 typedef uint32_t        __u32;
 typedef uint16_t        __u16;
@@ -39,61 +38,6 @@ typedef unsigned char	__u8;
  * we handle those differences explicitly below */
 #include "../../include/linux/mod_devicetable.h"
 
-/* This array collects all instances that use the generic do_table */
-struct devtable {
-        const char *device_id; /* name of table, __mod_<name>_device_table. */
-        unsigned long id_size;
-        void *function;
-};
-
-#define ___cat(a,b) a ## b
-#define __cat(a,b) ___cat(a,b)
-
-/* we need some special handling for this host tool running eventually on
- * Darwin. The Mach-O section handling is a bit different than ELF section
- * handling. The differnces in detail are:
- *  a) we have segments which have sections
- *  b) we need a API call to get the respective section symbols */
-#if defined(__MACH__)
-#include <mach-o/getsect.h>
-
-#define INIT_SECTION(name)  do {                                        \
-                unsigned long name ## _len;                             \
-                char *__cat(pstart_,name) = getsectdata("__TEXT",       \
-                        #name, &__cat(name,_len));                      \
-                char *__cat(pstop_,name) = __cat(pstart_,name) +        \
-                        __cat(name, _len);                              \
-                __cat(__start_,name) = (void *)__cat(pstart_,name);     \
-                __cat(__stop_,name) = (void *)__cat(pstop_,name);       \
-        } while (0)
-#define SECTION(name)   __attribute__((section("__TEXT, " #name)))
-
-struct devtable **__start___devtable, **__stop___devtable;
-#else
-#define INIT_SECTION(name) /* no-op for ELF */
-#define SECTION(name)   __attribute__((section(#name)))
-
-/* We construct a table of pointers in an ELF section (pointers generally
- * go unpadded by gcc).  ld creates boundary syms for us. */
-extern struct devtable *__start___devtable[], *__stop___devtable[];
-#endif /* __MACH__ */
-
-#if __GNUC__ == 3 && __GNUC_MINOR__ < 3
-# define __used                 __attribute__((__unused__))
-#else
-# define __used                 __attribute__((__used__))
-#endif
-
-/* Add a table entry.  We test function type matches while we're here. */
-#define ADD_TO_DEVTABLE(device_id, type, function) \
-        static struct devtable __cat(devtable,__LINE__) = {     \
-                device_id + 0*sizeof((function)((const char *)NULL,     \
-                                                (type *)NULL,           \
-                                                (char *)NULL)),         \
-                sizeof(type), (function) };                             \
-        static struct devtable *SECTION(__devtable) __used \
-                __cat(devtable_ptr,__LINE__) = &__cat(devtable,__LINE__)
-
 #define ADD(str, sep, cond, field)                              \
 do {                                                            \
         strcat(str, sep);                                       \
@@ -156,7 +100,7 @@ static void device_id_check(const char *modname, const char *device_id,
 }
 
 /* USB is special because the bcdDevice can be matched against a numeric range */
-/* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
+/* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */
 static void do_usb_entry(struct usb_device_id *id,
                          unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
                          unsigned char range_lo, unsigned char range_hi,
@@ -210,9 +154,6 @@ static void do_usb_entry(struct usb_device_id *id,
         ADD(alias, "ip",
             id->match_flags&USB_DEVICE_ID_MATCH_INT_PROTOCOL,
             id->bInterfaceProtocol);
-        ADD(alias, "in",
-            id->match_flags&USB_DEVICE_ID_MATCH_INT_NUMBER,
-            id->bInterfaceNumber);
 
         add_wildcard(alias);
         buf_printf(&mod->dev_table_buf,
@@ -339,19 +280,15 @@ static int do_hid_entry(const char *filename,
                              struct hid_device_id *id, char *alias)
 {
         id->bus = TO_NATIVE(id->bus);
-        id->group = TO_NATIVE(id->group);
         id->vendor = TO_NATIVE(id->vendor);
         id->product = TO_NATIVE(id->product);
 
-        sprintf(alias, "hid:");
-        ADD(alias, "b", id->bus != HID_BUS_ANY, id->bus);
-        ADD(alias, "g", id->group != HID_GROUP_ANY, id->group);
+        sprintf(alias, "hid:b%04X", id->bus);
         ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor);
         ADD(alias, "p", id->product != HID_ANY_ID, id->product);
 
         return 1;
 }
-ADD_TO_DEVTABLE("hid", struct hid_device_id, do_hid_entry);
 
 /* Looks like: ieee1394:venNmoNspNverN */
 static int do_ieee1394_entry(const char *filename,
@@ -376,7 +313,6 @@ static int do_ieee1394_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("ieee1394", struct ieee1394_device_id, do_ieee1394_entry);
 
 /* Looks like: pci:vNdNsvNsdNbcNscNiN. */
 static int do_pci_entry(const char *filename,
@@ -420,7 +356,6 @@ static int do_pci_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("pci", struct pci_device_id, do_pci_entry);
 
 /* looks like: "ccw:tNmNdtNdmN" */
 static int do_ccw_entry(const char *filename,
@@ -444,7 +379,6 @@ static int do_ccw_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("ccw", struct ccw_device_id, do_ccw_entry);
 
 /* looks like: "ap:tN" */
 static int do_ap_entry(const char *filename,
@@ -453,7 +387,6 @@ static int do_ap_entry(const char *filename,
         sprintf(alias, "ap:t%02X*", id->dev_type);
         return 1;
 }
-ADD_TO_DEVTABLE("ap", struct ap_device_id, do_ap_entry);
 
 /* looks like: "css:tN" */
 static int do_css_entry(const char *filename,
@@ -462,7 +395,6 @@ static int do_css_entry(const char *filename,
         sprintf(alias, "css:t%01X", id->type);
         return 1;
 }
-ADD_TO_DEVTABLE("css", struct css_device_id, do_css_entry);
 
 /* Looks like: "serio:tyNprNidNexN" */
 static int do_serio_entry(const char *filename,
@@ -482,7 +414,6 @@ static int do_serio_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("serio", struct serio_device_id, do_serio_entry);
 
 /* looks like: "acpi:ACPI0003 or acpi:PNP0C0B" or "acpi:LNXVIDEO" */
 static int do_acpi_entry(const char *filename,
@@ -491,7 +422,6 @@ static int do_acpi_entry(const char *filename,
         sprintf(alias, "acpi*:%s:*", id->id);
         return 1;
 }
-ADD_TO_DEVTABLE("acpi", struct acpi_device_id, do_acpi_entry);
 
 /* looks like: "pnp:dD" */
 static void do_pnp_device_entry(void *symval, unsigned long size,
@@ -614,7 +544,8 @@ static int do_pcmcia_entry(const char *filename,
         add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("pcmcia", struct pcmcia_device_id, do_pcmcia_entry);
+
+
 
 static int do_of_entry (const char *filename, struct of_device_id *of, char *alias)
 {
@@ -637,7 +568,6 @@ static int do_of_entry (const char *filename, struct of_device_id *of, char *ali
     add_wildcard(alias);
     return 1;
 }
-ADD_TO_DEVTABLE("of", struct of_device_id, do_of_entry);
 
 static int do_vio_entry(const char *filename, struct vio_device_id *vio,
                 char *alias)
@@ -655,7 +585,6 @@ static int do_vio_entry(const char *filename, struct vio_device_id *vio,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("vio", struct vio_device_id, do_vio_entry);
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
@@ -711,7 +640,6 @@ static int do_input_entry(const char *filename, struct input_device_id *id,
                 do_input(alias, id->swbit, 0, INPUT_DEVICE_ID_SW_MAX);
         return 1;
 }
-ADD_TO_DEVTABLE("input", struct input_device_id, do_input_entry);
 
 static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
                 char *alias)
@@ -722,7 +650,6 @@ static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
                 strcat(alias, "*");
         return 1;
 }
-ADD_TO_DEVTABLE("eisa", struct eisa_device_id, do_eisa_entry);
 
 /* Looks like: parisc:tNhvNrevNsvN */
 static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
@@ -742,7 +669,6 @@ static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("parisc", struct parisc_device_id, do_parisc_entry);
 
 /* Looks like: sdio:cNvNdN. */
 static int do_sdio_entry(const char *filename,
@@ -759,7 +685,6 @@ static int do_sdio_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("sdio", struct sdio_device_id, do_sdio_entry);
 
 /* Looks like: ssb:vNidNrevN. */
 static int do_ssb_entry(const char *filename,
@@ -776,7 +701,6 @@ static int do_ssb_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("ssb", struct ssb_device_id, do_ssb_entry);
 
 /* Looks like: bcma:mNidNrevNclN. */
 static int do_bcma_entry(const char *filename,
@@ -795,7 +719,6 @@ static int do_bcma_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("bcma", struct bcma_device_id, do_bcma_entry);
 
 /* Looks like: virtio:dNvN */
 static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
@@ -811,29 +734,6 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("virtio", struct virtio_device_id, do_virtio_entry);
-
-/*
- * Looks like: vmbus:guid
- * Each byte of the guid will be represented by two hex characters
- * in the name.
- */
-
-static int do_vmbus_entry(const char *filename, struct hv_vmbus_device_id *id,
-                          char *alias)
-{
-        int i;
-        char guid_name[((sizeof(id->guid) + 1)) * 2];
-
-        for (i = 0; i < (sizeof(id->guid) * 2); i += 2)
-                sprintf(&guid_name[i], "%02x", id->guid[i/2]);
-
-        strcpy(alias, "vmbus:");
-        strcat(alias, guid_name);
-
-        return 1;
-}
-ADD_TO_DEVTABLE("vmbus", struct hv_vmbus_device_id, do_vmbus_entry);
 
 /* Looks like: i2c:S */
 static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
@@ -843,7 +743,6 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
 
         return 1;
 }
-ADD_TO_DEVTABLE("i2c", struct i2c_device_id, do_i2c_entry);
 
 /* Looks like: spi:S */
 static int do_spi_entry(const char *filename, struct spi_device_id *id,
@@ -853,7 +752,6 @@ static int do_spi_entry(const char *filename, struct spi_device_id *id,
 
         return 1;
 }
-ADD_TO_DEVTABLE("spi", struct spi_device_id, do_spi_entry);
 
 static const struct dmifield {
         const char *prefix;
@@ -908,7 +806,6 @@ static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
         strcat(alias, ":");
         return 1;
 }
-ADD_TO_DEVTABLE("dmi", struct dmi_system_id, do_dmi_entry);
 
 static int do_platform_entry(const char *filename,
                              struct platform_device_id *id, char *alias)
@@ -916,7 +813,6 @@ static int do_platform_entry(const char *filename,
         sprintf(alias, PLATFORM_MODULE_PREFIX "%s", id->name);
         return 1;
 }
-ADD_TO_DEVTABLE("platform", struct platform_device_id, do_platform_entry);
 
 static int do_mdio_entry(const char *filename,
                          struct mdio_device_id *id, char *alias)
@@ -939,7 +835,6 @@ static int do_mdio_entry(const char *filename,
 
         return 1;
 }
-ADD_TO_DEVTABLE("mdio", struct mdio_device_id, do_mdio_entry);
 
 /* Looks like: zorro:iN. */
 static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
@@ -950,7 +845,6 @@ static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
         ADD(alias, "i", id->id != ZORRO_WILDCARD, id->id);
         return 1;
 }
-ADD_TO_DEVTABLE("zorro", struct zorro_device_id, do_zorro_entry);
 
 /* looks like: "pnp:dD" */
 static int do_isapnp_entry(const char *filename,
@@ -964,124 +858,16 @@ static int do_isapnp_entry(const char *filename,
                 (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
         return 1;
 }
-ADD_TO_DEVTABLE("isapnp", struct isapnp_device_id, do_isapnp_entry);
 
-/* Looks like: "ipack:fNvNdN". */
-static int do_ipack_entry(const char *filename,
-                          struct ipack_device_id *id, char *alias)
+/* Ignore any prefix, eg. some architectures prepend _ */
+static inline int sym_is(const char *symbol, const char *name)
 {
-        id->vendor = TO_NATIVE(id->vendor);
-        id->device = TO_NATIVE(id->device);
-        strcpy(alias, "ipack:");
-        ADD(alias, "f", id->format != IPACK_ANY_FORMAT, id->format);
-        ADD(alias, "v", id->vendor != IPACK_ANY_ID, id->vendor);
-        ADD(alias, "d", id->device != IPACK_ANY_ID, id->device);
-        add_wildcard(alias);
-        return 1;
-}
-ADD_TO_DEVTABLE("ipack", struct ipack_device_id, do_ipack_entry);
-
-/*
- * Append a match expression for a single masked hex digit.
- * outp points to a pointer to the character at which to append.
- *      *outp is updated on return to point just after the appended text,
- *      to facilitate further appending.
- */
-static void append_nibble_mask(char **outp,
-                               unsigned int nibble, unsigned int mask)
-{
-        char *p = *outp;
-        unsigned int i;
-
-        switch (mask) {
-        case 0:
-                *p++ = '?';
-                break;
-
-        case 0xf:
-                p += sprintf(p, "%X",  nibble);
-                break;
-
-        default:
-                /*
-                 * Dumbly emit a match pattern for all possible matching
-                 * digits.  This could be improved in some cases using ranges,
-                 * but it has the advantage of being trivially correct, and is
-                 * often optimal.
-                 */
-                *p++ = '[';
-                for (i = 0; i < 0x10; i++)
-                        if ((i & mask) == nibble)
-                                p += sprintf(p, "%X", i);
-                *p++ = ']';
-        }
-
-        /* Ensure that the string remains NUL-terminated: */
-        *p = '\0';
+        const char *match;
 
-        /* Advance the caller's end-of-string pointer: */
-        *outp = p;
-}
-
-/*
- * looks like: "amba:dN"
- *
- * N is exactly 8 digits, where each is an upper-case hex digit, or
- *      a ? or [] pattern matching exactly one digit.
- */
-static int do_amba_entry(const char *filename,
-                         struct amba_id *id, char *alias)
-{
-        unsigned int digit;
-        char *p = alias;
-
-        if ((id->id & id->mask) != id->id)
-                fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: "
-                      "id=0x%08X, mask=0x%08X.  Please fix this driver.\n",
-                      filename, id->id, id->mask);
-
-        p += sprintf(alias, "amba:d");
-        for (digit = 0; digit < 8; digit++)
-                append_nibble_mask(&p,
-                                   (id->id >> (4 * (7 - digit))) & 0xf,
-                                   (id->mask >> (4 * (7 - digit))) & 0xf);
-
-        return 1;
-}
-ADD_TO_DEVTABLE("amba", struct amba_id, do_amba_entry);
-
-/* LOOKS like x86cpu:vendor:VVVV:family:FFFF:model:MMMM:feature:*,FEAT,*
- * All fields are numbers. It would be nicer to use strings for vendor
- * and feature, but getting those out of the build system here is too
- * complicated.
- */
-
-static int do_x86cpu_entry(const char *filename, struct x86_cpu_id *id,
-                           char *alias)
-{
-        id->feature = TO_NATIVE(id->feature);
-        id->family = TO_NATIVE(id->family);
-        id->model = TO_NATIVE(id->model);
-        id->vendor = TO_NATIVE(id->vendor);
-
-        strcpy(alias, "x86cpu:");
-        ADD(alias, "vendor:",  id->vendor != X86_VENDOR_ANY, id->vendor);
-        ADD(alias, ":family:", id->family != X86_FAMILY_ANY, id->family);
-        ADD(alias, ":model:",  id->model  != X86_MODEL_ANY,  id->model);
-        strcat(alias, ":feature:*");
-        if (id->feature != X86_FEATURE_ANY)
-                sprintf(alias + strlen(alias), "%04X*", id->feature);
-        return 1;
-}
-ADD_TO_DEVTABLE("x86cpu", struct x86_cpu_id, do_x86cpu_entry);
-
-/* Does namelen bytes of name exactly match the symbol? */
-static bool sym_is(const char *name, unsigned namelen, const char *symbol)
-{
-        if (namelen != strlen(symbol))
-                return false;
-
-        return memcmp(name, symbol, namelen) == 0;
+        match = strstr(symbol, name);
+        if (!match)
+                return 0;
+        return match[strlen(name)] == '\0';
 }
 
 static void do_table(void *symval, unsigned long size,
@@ -1114,29 +900,11 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
 {
         void *symval;
         char *zeros = NULL;
-        const char *name;
-        unsigned int namelen;
 
         /* We're looking for a section relative symbol */
         if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
                 return;
 
-        /* We're looking for an object */
-        if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
-                return;
-
-        /* All our symbols are of form <prefix>__mod_XXX_device_table. */
-        name = strstr(symname, "__mod_");
-        if (!name)
-                return;
-        name += strlen("__mod_");
-        namelen = strlen(name);
-        if (namelen < strlen("_device_table"))
-                return;
-        if (strcmp(name + namelen - strlen("_device_table"), "_device_table"))
-                return;
-        namelen -= strlen("_device_table");
-
         /* Handle all-NULL symbols allocated into .bss */
         if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {
                 zeros = calloc(1, sym->st_size);
@@ -1147,25 +915,113 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                         + sym->st_value;
         }
 
-        /* First handle the "special" cases */
-        if (sym_is(name, namelen, "usb"))
+        if (sym_is(symname, "__mod_pci_device_table"))
+                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(name, namelen, "pnp"))
+        else if (sym_is(symname, "__mod_hid_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct hid_device_id), "hid",
+                         do_hid_entry, mod);
+        else if (sym_is(symname, "__mod_ieee1394_device_table"))
+                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), "ccw",
+                         do_ccw_entry, mod);
+        else if (sym_is(symname, "__mod_ap_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct ap_device_id), "ap",
+                         do_ap_entry, mod);
+        else if (sym_is(symname, "__mod_css_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct css_device_id), "css",
+                         do_css_entry, mod);
+        else if (sym_is(symname, "__mod_serio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct serio_device_id), "serio",
+                         do_serio_entry, mod);
+        else if (sym_is(symname, "__mod_acpi_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct acpi_device_id), "acpi",
+                         do_acpi_entry, mod);
+        else if (sym_is(symname, "__mod_pnp_device_table"))
                 do_pnp_device_entry(symval, sym->st_size, mod);
-        else if (sym_is(name, namelen, "pnp_card"))
+        else if (sym_is(symname, "__mod_pnp_card_device_table"))
                 do_pnp_card_entries(symval, sym->st_size, mod);
-        else {
-                struct devtable **p;
-                INIT_SECTION(__devtable);
-
-                for (p = __start___devtable; p < __stop___devtable; p++) {
-                        if (sym_is(name, namelen, (*p)->device_id)) {
-                                do_table(symval, sym->st_size, (*p)->id_size,
-                                         (*p)->device_id, (*p)->function, mod);
-                                break;
-                        }
-                }
-        }
+        else if (sym_is(symname, "__mod_pcmcia_device_table"))
+                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), "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), "vio",
+                         do_vio_entry, mod);
+        else if (sym_is(symname, "__mod_input_device_table"))
+                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);
+        else if (sym_is(symname, "__mod_parisc_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct parisc_device_id), "parisc",
+                         do_parisc_entry, mod);
+        else if (sym_is(symname, "__mod_sdio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct sdio_device_id), "sdio",
+                         do_sdio_entry, mod);
+        else if (sym_is(symname, "__mod_ssb_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct ssb_device_id), "ssb",
+                         do_ssb_entry, mod);
+        else if (sym_is(symname, "__mod_bcma_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct bcma_device_id), "bcma",
+                         do_bcma_entry, mod);
+        else if (sym_is(symname, "__mod_virtio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct virtio_device_id), "virtio",
+                         do_virtio_entry, mod);
+        else if (sym_is(symname, "__mod_i2c_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct i2c_device_id), "i2c",
+                         do_i2c_entry, mod);
+        else if (sym_is(symname, "__mod_spi_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct spi_device_id), "spi",
+                         do_spi_entry, mod);
+        else if (sym_is(symname, "__mod_dmi_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct dmi_system_id), "dmi",
+                         do_dmi_entry, mod);
+        else if (sym_is(symname, "__mod_platform_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct platform_device_id), "platform",
+                         do_platform_entry, mod);
+        else if (sym_is(symname, "__mod_mdio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct mdio_device_id), "mdio",
+                         do_mdio_entry, mod);
+        else if (sym_is(symname, "__mod_zorro_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct zorro_device_id), "zorro",
+                         do_zorro_entry, mod);
+        else if (sym_is(symname, "__mod_isapnp_device_table"))
+                do_table(symval, sym->st_size,
+                        sizeof(struct isapnp_device_id), "isa",
+                        do_isapnp_entry, mod);
         free(zeros);
 }
 
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index ff36c508a10..a509ff8f32f 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -132,10 +132,8 @@ static struct module *new_module(char *modname)
         /* strip trailing .o */
         s = strrchr(p, '.');
         if (s != NULL)
-                if (strcmp(s, ".o") == 0) {
+                if (strcmp(s, ".o") == 0)
                         *s = '\0';
-                        mod->is_dot_o = 1;
-                }
 
         /* add to list */
         mod->name = p;
@@ -337,20 +335,17 @@ static void sym_update_crc(const char *name, struct module *mod,
 void *grab_file(const char *filename, unsigned long *size)
 {
         struct stat st;
-        void *map = MAP_FAILED;
+        void *map;
         int fd;
 
         fd = open(filename, O_RDONLY);
-        if (fd < 0)
+        if (fd < 0 || fstat(fd, &st) != 0)
                 return NULL;
-        if (fstat(fd, &st))
-                goto failed;
 
         *size = st.st_size;
         map = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-
-failed:
         close(fd);
+
         if (map == MAP_FAILED)
                 return NULL;
         return map;
@@ -592,8 +587,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
         unsigned int crc;
         enum export export;
 
-        if ((!is_vmlinux(mod->name) || mod->is_dot_o) &&
-            strncmp(symname, "__ksymtab", 9) == 0)
+        if (!is_vmlinux(mod->name) && strncmp(symname, "__ksymtab", 9) == 0)
                 export = export_from_secname(info, get_secindex(info, sym));
         else
                 export = export_from_sec(info, get_secindex(info, sym));
@@ -821,15 +815,12 @@ static const char *section_white_list[] =
         ".debug*",
         ".zdebug*",             /* Compressed debug sections. */
         ".GCC-command-line",    /* mn10300 */
-        ".GCC.command.line",    /* record-gcc-switches, non mn10300 */
         ".mdebug*",        /* alpha, score, mips etc. */
         ".pdr",            /* alpha, score, mips etc. */
         ".stab*",
         ".note*",
         ".got*",
         ".toc*",
-        ".xt.prop",                              /* xtensa */
-        ".xt.lit",         /* xtensa */
         NULL
 };
 
@@ -858,23 +849,20 @@ static void check_section(const char *modname, struct elf_info *elf,
 
 #define ALL_INIT_DATA_SECTIONS \
         ".init.setup$", ".init.rodata$", \
-        ".cpuinit.rodata$", ".meminit.rodata$", \
-        ".init.data$", ".cpuinit.data$", ".meminit.data$"
+        ".devinit.rodata$", ".cpuinit.rodata$", ".meminit.rodata$" \
+        ".init.data$", ".devinit.data$", ".cpuinit.data$", ".meminit.data$"
 #define ALL_EXIT_DATA_SECTIONS \
-        ".exit.data$", ".cpuexit.data$", ".memexit.data$"
+        ".exit.data$", ".devexit.data$", ".cpuexit.data$", ".memexit.data$"
 
 #define ALL_INIT_TEXT_SECTIONS \
-        ".init.text$", ".cpuinit.text$", ".meminit.text$"
+        ".init.text$", ".devinit.text$", ".cpuinit.text$", ".meminit.text$"
 #define ALL_EXIT_TEXT_SECTIONS \
-        ".exit.text$", ".cpuexit.text$", ".memexit.text$"
-
-#define ALL_PCI_INIT_SECTIONS   \
-        ".pci_fixup_early$", ".pci_fixup_header$", ".pci_fixup_final$", \
-        ".pci_fixup_enable$", ".pci_fixup_resume$", \
-        ".pci_fixup_resume_early$", ".pci_fixup_suspend$"
+        ".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$"
 
-#define ALL_XXXINIT_SECTIONS CPU_INIT_SECTIONS, MEM_INIT_SECTIONS
-#define ALL_XXXEXIT_SECTIONS CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS
+#define ALL_XXXINIT_SECTIONS DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, \
+        MEM_INIT_SECTIONS
+#define ALL_XXXEXIT_SECTIONS DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, \
+        MEM_EXIT_SECTIONS
 
 #define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS
 #define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
@@ -883,10 +871,12 @@ static void check_section(const char *modname, struct elf_info *elf,
 #define TEXT_SECTIONS ".text$"
 
 #define INIT_SECTIONS      ".init.*"
+#define DEV_INIT_SECTIONS  ".devinit.*"
 #define CPU_INIT_SECTIONS  ".cpuinit.*"
 #define MEM_INIT_SECTIONS  ".meminit.*"
 
 #define EXIT_SECTIONS      ".exit.*"
+#define DEV_EXIT_SECTIONS  ".devexit.*"
 #define CPU_EXIT_SECTIONS  ".cpuexit.*"
 #define MEM_EXIT_SECTIONS  ".memexit.*"
 
@@ -975,7 +965,7 @@ const struct sectioncheck sectioncheck[] = {
         .mismatch = DATA_TO_ANY_EXIT,
         .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
-/* Do not reference init code/data from cpuinit/meminit code/data */
+/* Do not reference init code/data from devinit/cpuinit/meminit code/data */
 {
         .fromsec = { ALL_XXXINIT_SECTIONS, NULL },
         .tosec   = { INIT_SECTIONS, NULL },
@@ -996,7 +986,7 @@ const struct sectioncheck sectioncheck[] = {
         .mismatch = XXXINIT_TO_SOME_INIT,
         .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
-/* Do not reference exit code/data from cpuexit/memexit code/data */
+/* Do not reference exit code/data from devexit/cpuexit/memexit code/data */
 {
         .fromsec = { ALL_XXXEXIT_SECTIONS, NULL },
         .tosec   = { EXIT_SECTIONS, NULL },
@@ -1031,12 +1021,6 @@ const struct sectioncheck sectioncheck[] = {
         .mismatch = ANY_EXIT_TO_ANY_INIT,
         .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
-{
-        .fromsec = { ALL_PCI_INIT_SECTIONS, NULL },
-        .tosec   = { INIT_SECTIONS, NULL },
-        .mismatch = ANY_INIT_TO_ANY_EXIT,
-        .symbol_white_list = { NULL },
-},
 /* Do not export init/exit functions or data */
 {
         .fromsec = { "__ksymtab*", NULL },
@@ -1085,7 +1069,7 @@ static const struct sectioncheck *section_mismatch(
  * Pattern 2:
  *   Many drivers utilise a *driver container with references to
  *   add, remove, probe functions etc.
- *   These functions may often be marked __cpuinit and we do not want to
+ *   These functions may often be marked __devinit and we do not want to
  *   warn here.
  *   the pattern is identified by:
  *   tosec   = init or exit section
@@ -1510,13 +1494,6 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
         return 0;
 }
 
-#ifndef R_ARM_CALL
-#define R_ARM_CALL      28
-#endif
-#ifndef R_ARM_JUMP24
-#define R_ARM_JUMP24    29
-#endif
-
 static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
 {
         unsigned int r_typ = ELF_R_TYPE(r->r_info);
@@ -1528,8 +1505,6 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
                               (elf->symtab_start + ELF_R_SYM(r->r_info));
                 break;
         case R_ARM_PC24:
-        case R_ARM_CALL:
-        case R_ARM_JUMP24:
                 /* From ARM ABI: ((S + A) | T) - P */
                 r->r_addend = (int)(long)(elf->hdr +
                               sechdr->sh_offset +
@@ -1863,23 +1838,17 @@ static void add_header(struct buffer *b, struct module *mod)
         buf_printf(b, "\n");
         buf_printf(b, "struct module __this_module\n");
         buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-        buf_printf(b, "\t.name = KBUILD_MODNAME,\n");
+        buf_printf(b, " .name = KBUILD_MODNAME,\n");
         if (mod->has_init)
-                buf_printf(b, "\t.init = init_module,\n");
+                buf_printf(b, " .init = init_module,\n");
         if (mod->has_cleanup)
                 buf_printf(b, "#ifdef CONFIG_MODULE_UNLOAD\n"
-                              "\t.exit = cleanup_module,\n"
+                              " .exit = cleanup_module,\n"
                               "#endif\n");
-        buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n");
+        buf_printf(b, " .arch = MODULE_ARCH_INIT,\n");
         buf_printf(b, "};\n");
 }
 
-static void add_intree_flag(struct buffer *b, int is_intree)
-{
-        if (is_intree)
-                buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
-}
-
 static void add_staging_flag(struct buffer *b, const char *name)
 {
         static const char *staging_dir = "drivers/staging";
@@ -2200,7 +2169,6 @@ int main(int argc, char **argv)
                 buf.pos = 0;
 
                 add_header(&buf, mod);
-                add_intree_flag(&buf, !external_module);
                 add_staging_flag(&buf, mod->name);
                 err |= add_versions(&buf, mod);
                 add_depends(&buf, mod, modules);
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 51207e4d5f8..2031119080d 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -113,7 +113,6 @@ struct module {
         int has_cleanup;
         struct buffer dev_table_buf;
         char         srcversion[25];
-        int is_dot_o;
 };
 
 struct elf_info {
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 87bf08076b1..bc6aa003860 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -141,7 +141,7 @@ perf-%pkg: FORCE
 help: FORCE
         @echo '  rpm-pkg             - Build both source and binary RPM kernel packages'
         @echo '  binrpm-pkg          - Build only the binary kernel package'
-        @echo '  deb-pkg             - Build the kernel as a deb package'
+        @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 acb86507828..f6cbc3ddb68 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -92,12 +92,11 @@ rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
 mkdir -m 755 -p "$fwdir/DEBIAN"
-mkdir -p "$fwdir/lib/firmware/$version/" "$fwdir/usr/share/doc/$fwpackagename"
+mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
 mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
 mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"
 mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
 mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename"
-mkdir -p "$kernel_headers_dir/lib/modules/$version/"
 if [ "$ARCH" = "um" ] ; then
         mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
 fi
@@ -121,19 +120,15 @@ else
 fi
 
 if grep -q '^CONFIG_MODULES=y' .config ; then
-        INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
-        rm -f "$tmpdir/lib/modules/$version/build"
-        rm -f "$tmpdir/lib/modules/$version/source"
+        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
 
-if [ "$ARCH" != "um" ]; then
-        $MAKE headers_check KBUILD_SRC=
-        $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-fi
+make headers_check
+make headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
 
 # Install the maintainer scripts
 # Note: hook scripts under /etc/kernel are also executed by official Debian
@@ -243,15 +238,14 @@ EOF
 fi
 
 # Build header package
-(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
-(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
-(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
+(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$)
+(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$)
+(cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
-(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
-(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
-ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
-rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
+(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)
+(cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)
+rm -f /tmp/files$$ /tmp/objfiles$$
 arch=$(dpkg --print-architecture)
 
 cat <<EOF >> debian/control
@@ -265,10 +259,11 @@ Description: Linux kernel headers for $KERNELRELEASE on $arch
  This is useful for people who need to build external modules
 EOF
 
+create_package "$kernel_headers_packagename" "$kernel_headers_dir"
+
 # Do we have firmware? Move it out of the way and build it into a package.
 if [ -e "$tmpdir/lib/firmware" ]; then
-        mv "$tmpdir/lib/firmware"/* "$fwdir/lib/firmware/$version/"
-        rmdir "$tmpdir/lib/firmware"
+        mv "$tmpdir/lib/firmware" "$fwdir/lib/"
 
         cat <<EOF >> debian/control
 
@@ -292,11 +287,7 @@ Description: Linux support headers for userspace development
  are used by the installed headers for GNU glibc and other system libraries.
 EOF
 
-if [ "$ARCH" != "um" ]; then
-        create_package "$kernel_headers_packagename" "$kernel_headers_dir"
-        create_package "$libc_headers_packagename" "$libc_headers_dir"
-fi
-
+create_package "$libc_headers_packagename" "$libc_headers_dir"
 create_package "$packagename" "$tmpdir"
 
 exit 0
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 62d8234f878..8a7b15598ea 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -28,15 +28,15 @@ case "${1}" in
                 file_ext=""
                 ;;
         targz-pkg)
-                compress="gzip"
+                compress="gzip -c9"
                 file_ext=".gz"
                 ;;
         tarbz2-pkg)
-                compress="bzip2"
+                compress="bzip2 -c9"
                 file_ext=".bz2"
                 ;;
         tarxz-pkg)
-                compress="xz"
+                compress="xz -c9"
                 file_ext=".xz"
                 ;;
         *)
@@ -109,7 +109,7 @@ esac
         if tar --owner=root --group=root --help >/dev/null 2>&1; then
                 opts="--owner=root --group=root"
         fi
-        tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"
+        tar cf - . $opts | ${compress} > "${tarball}${file_ext}"
 )
 
 echo "Tarball successfully created in ${tarball}${file_ext}"
diff --git a/scripts/patch-kernel b/scripts/patch-kernel
index d000ea3a41f..20fb25c2338 100755
--- a/scripts/patch-kernel
+++ b/scripts/patch-kernel
@@ -116,10 +116,6 @@ findFile () {
                 ext=".bz2"
                 name="bzip2"
                 uncomp="bunzip2 -dc"
-  elif [ -r ${filebase}.xz ]; then
-                ext=".xz"
-                name="xz"
-                uncomp="xz -dc"
   elif [ -r ${filebase}.zip ]; then
                 ext=".zip"
                 name="zip"
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
index 68bb4efc5af..5c113123ed9 100644
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
@@ -74,7 +74,6 @@ static unsigned int logo_height;
 static struct color **logo_data;
 static struct color logo_clut[MAX_LINUX_LOGO_COLORS];
 static unsigned int logo_clutsize;
-static int is_plain_pbm = 0;
 
 static void die(const char *fmt, ...)
     __attribute__ ((noreturn)) __attribute ((format (printf, 1, 2)));
@@ -104,11 +103,6 @@ static unsigned int get_number(FILE *fp)
     val = 0;
     while (isdigit(c)) {
         val = 10*val+c-'0';
-        /* some PBM are 'broken'; GiMP for example exports a PBM without space
-         * between the digits. This is Ok cause we know a PBM can only have a '1'
-         * or a '0' for the digit. */
-        if (is_plain_pbm)
-                break;
         c = fgetc(fp);
         if (c == EOF)
             die("%s: end of file\n", filename);
@@ -173,7 +167,6 @@ static void read_image(void)
     switch (magic) {
         case '1':
             /* Plain PBM */
-            is_plain_pbm = 1;
             for (i = 0; i < logo_height; i++)
                 for (j = 0; j < logo_width; j++)
                     logo_data[i][j].red = logo_data[i][j].green =
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index 9d1421e63ff..f40a6af6bf4 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -261,13 +261,11 @@ static unsigned get_mcountsym(Elf_Sym const *const sym0,
                 &sym0[Elf_r_sym(relp)];
         char const *symname = &str0[w(symp->st_name)];
         char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
-        char const *fentry = "__fentry__";
 
         if (symname[0] == '.')
                 ++symname;  /* ppc64 hack */
         if (strcmp(mcount, symname) == 0 ||
-            (altmcount && strcmp(altmcount, symname) == 0) ||
-            (strcmp(fentry, symname) == 0))
+            (altmcount && strcmp(altmcount, symname) == 0))
                 mcountsym = Elf_r_sym(relp);
 
         return mcountsym;
@@ -464,7 +462,7 @@ __has_rel_mcount(Elf_Shdr const *const relhdr,  /* is SHT_REL or SHT_RELA */
                 succeed_file();
         }
         if (w(txthdr->sh_type) != SHT_PROGBITS ||
-            !(_w(txthdr->sh_flags) & SHF_EXECINSTR))
+            !(w(txthdr->sh_flags) & SHF_EXECINSTR))
                 return NULL;
         return txtname;
 }
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index bd6dca8a0ab..8d9a5edd9c6 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -33,6 +33,12 @@ scm_version()
         local short
         short=false
 
+        system=`echo $TARGET_SYSTEM`
+        if [ "$system" = "CARMA" ]; then
+                printf '%s' -carma
+                return
+        fi
+
         cd "$srctree"
         if test -e .scmversion; then
                 cat .scmversion
@@ -75,7 +81,8 @@ scm_version()
                 [ -w . ] && git update-index --refresh --unmerged > /dev/null
 
                 # Check for uncommitted changes
-                if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then
+                if git diff-index --name-only HEAD | grep -v "^scripts/package" \
+                    | read dummy; then
                         printf '%s' -dirty
                 fi
 
diff --git a/scripts/sign-file b/scripts/sign-file
deleted file mode 100755
index 974a20b661b..00000000000
--- a/scripts/sign-file
+++ /dev/null
@@ -1,429 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Sign a module file using the given key.
-#
-# Format:
-#
-#       ./scripts/sign-file [-v] <key> <x509> <module> [<dest>]
-#
-#
-use strict;
-use FileHandle;
-use IPC::Open2;
-
-my $verbose = 0;
-if ($#ARGV >= 0 && $ARGV[0] eq "-v") {
-    $verbose = 1;
-    shift;
-}
-
-die "Format: ./scripts/sign-file [-v] <key> <x509> <module> [<dest>]\n"
-    if ($#ARGV != 2 && $#ARGV != 3);
-
-my $private_key = $ARGV[0];
-my $x509 = $ARGV[1];
-my $module = $ARGV[2];
-my $dest = ($#ARGV == 3) ? $ARGV[3] : $ARGV[2] . "~";
-
-die "Can't read private key\n" unless (-r $private_key);
-die "Can't read X.509 certificate\n" unless (-r $x509);
-die "Can't read module\n" unless (-r $module);
-
-#
-# Read the kernel configuration
-#
-my %config = (
-    CONFIG_MODULE_SIG_SHA512 => 1
-    );
-
-if (-r ".config") {
-    open(FD, "<.config") || die ".config";
-    while (<FD>) {
-        if ($_ =~ /^(CONFIG_.*)=[ym]/) {
-            $config{$1} = 1;
-        }
-    }
-    close(FD);
-}
-
-#
-# Function to read the contents of a file into a variable.
-#
-sub read_file($)
-{
-    my ($file) = @_;
-    my $contents;
-    my $len;
-
-    open(FD, "<$file") || die $file;
-    binmode FD;
-    my @st = stat(FD);
-    die $file if (!@st);
-    $len = read(FD, $contents, $st[7]) || die $file;
-    close(FD) || die $file;
-    die "$file: Wanted length ", $st[7], ", got ", $len, "\n"
-        if ($len != $st[7]);
-    return $contents;
-}
-
-###############################################################################
-#
-# First of all, we have to parse the X.509 certificate to find certain details
-# about it.
-#
-# We read the DER-encoded X509 certificate and parse it to extract the Subject
-# name and Subject Key Identifier.  Theis provides the data we need to build
-# the certificate identifier.
-#
-# The signer's name part of the identifier is fabricated from the commonName,
-# the organizationName or the emailAddress components of the X.509 subject
-# name.
-#
-# The subject key ID is used to select which of that signer's certificates
-# we're intending to use to sign the module.
-#
-###############################################################################
-my $x509_certificate = read_file($x509);
-
-my $UNIV = 0 << 6;
-my $APPL = 1 << 6;
-my $CONT = 2 << 6;
-my $PRIV = 3 << 6;
-
-my $CONS = 0x20;
-
-my $BOOLEAN     = 0x01;
-my $INTEGER     = 0x02;
-my $BIT_STRING  = 0x03;
-my $OCTET_STRING = 0x04;
-my $NULL        = 0x05;
-my $OBJ_ID      = 0x06;
-my $UTF8String  = 0x0c;
-my $SEQUENCE    = 0x10;
-my $SET         = 0x11;
-my $UTCTime     = 0x17;
-my $GeneralizedTime = 0x18;
-
-my %OIDs = (
-    pack("CCC", 85, 4, 3)       => "commonName",
-    pack("CCC", 85, 4, 6)       => "countryName",
-    pack("CCC", 85, 4, 10)      => "organizationName",
-    pack("CCC", 85, 4, 11)      => "organizationUnitName",
-    pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 1, 1) => "rsaEncryption",
-    pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 1, 5) => "sha1WithRSAEncryption",
-    pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 9, 1) => "emailAddress",
-    pack("CCC", 85, 29, 35)     => "authorityKeyIdentifier",
-    pack("CCC", 85, 29, 14)     => "subjectKeyIdentifier",
-    pack("CCC", 85, 29, 19)     => "basicConstraints"
-);
-
-###############################################################################
-#
-# Extract an ASN.1 element from a string and return information about it.
-#
-###############################################################################
-sub asn1_extract($$@)
-{
-    my ($cursor, $expected_tag, $optional) = @_;
-
-    return [ -1 ]
-        if ($cursor->[1] == 0 && $optional);
-
-    die $x509, ": ", $cursor->[0], ": ASN.1 data underrun (elem ", $cursor->[1], ")\n"
-        if ($cursor->[1] < 2);
-
-    my ($tag, $len) = unpack("CC", substr(${$cursor->[2]}, $cursor->[0], 2));
-
-    if ($expected_tag != -1 && $tag != $expected_tag) {
-        return [ -1 ]
-            if ($optional);
-        die $x509, ": ", $cursor->[0], ": ASN.1 unexpected tag (", $tag,
-        " not ", $expected_tag, ")\n";
-    }
-
-    $cursor->[0] += 2;
-    $cursor->[1] -= 2;
-
-    die $x509, ": ", $cursor->[0], ": ASN.1 long tag\n"
-        if (($tag & 0x1f) == 0x1f);
-    die $x509, ": ", $cursor->[0], ": ASN.1 indefinite length\n"
-        if ($len == 0x80);
-
-    if ($len > 0x80) {
-        my $l = $len - 0x80;
-        die $x509, ": ", $cursor->[0], ": ASN.1 data underrun (len len $l)\n"
-            if ($cursor->[1] < $l);
-
-        if ($l == 0x1) {
-            $len = unpack("C", substr(${$cursor->[2]}, $cursor->[0], 1));
-        } elsif ($l == 0x2) {
-            $len = unpack("n", substr(${$cursor->[2]}, $cursor->[0], 2));
-        } elsif ($l == 0x3) {
-            $len = unpack("C", substr(${$cursor->[2]}, $cursor->[0], 1)) << 16;
-            $len = unpack("n", substr(${$cursor->[2]}, $cursor->[0] + 1, 2));
-        } elsif ($l == 0x4) {
-            $len = unpack("N", substr(${$cursor->[2]}, $cursor->[0], 4));
-        } else {
-            die $x509, ": ", $cursor->[0], ": ASN.1 element too long (", $l, ")\n";
-        }
-
-        $cursor->[0] += $l;
-        $cursor->[1] -= $l;
-    }
-
-    die $x509, ": ", $cursor->[0], ": ASN.1 data underrun (", $len, ")\n"
-        if ($cursor->[1] < $len);
-
-    my $ret = [ $tag, [ $cursor->[0], $len, $cursor->[2] ] ];
-    $cursor->[0] += $len;
-    $cursor->[1] -= $len;
-
-    return $ret;
-}
-
-###############################################################################
-#
-# Retrieve the data referred to by a cursor
-#
-###############################################################################
-sub asn1_retrieve($)
-{
-    my ($cursor) = @_;
-    my ($offset, $len, $data) = @$cursor;
-    return substr($$data, $offset, $len);
-}
-
-###############################################################################
-#
-# Roughly parse the X.509 certificate
-#
-###############################################################################
-my $cursor = [ 0, length($x509_certificate), \$x509_certificate ];
-
-my $cert = asn1_extract($cursor, $UNIV | $CONS | $SEQUENCE);
-my $tbs = asn1_extract($cert->[1], $UNIV | $CONS | $SEQUENCE);
-my $version = asn1_extract($tbs->[1], $CONT | $CONS | 0, 1);
-my $serial_number = asn1_extract($tbs->[1], $UNIV | $INTEGER);
-my $sig_type = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
-my $issuer = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
-my $validity = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
-my $subject = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
-my $key = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
-my $issuer_uid = asn1_extract($tbs->[1], $CONT | $CONS | 1, 1);
-my $subject_uid = asn1_extract($tbs->[1], $CONT | $CONS | 2, 1);
-my $extension_list = asn1_extract($tbs->[1], $CONT | $CONS | 3, 1);
-
-my $subject_key_id = ();
-my $authority_key_id = ();
-
-#
-# Parse the extension list
-#
-if ($extension_list->[0] != -1) {
-    my $extensions = asn1_extract($extension_list->[1], $UNIV | $CONS | $SEQUENCE);
-
-    while ($extensions->[1]->[1] > 0) {
-        my $ext = asn1_extract($extensions->[1], $UNIV | $CONS | $SEQUENCE);
-        my $x_oid = asn1_extract($ext->[1], $UNIV | $OBJ_ID);
-        my $x_crit = asn1_extract($ext->[1], $UNIV | $BOOLEAN, 1);
-        my $x_val = asn1_extract($ext->[1], $UNIV | $OCTET_STRING);
-
-        my $raw_oid = asn1_retrieve($x_oid->[1]);
-        next if (!exists($OIDs{$raw_oid}));
-        my $x_type = $OIDs{$raw_oid};
-
-        my $raw_value = asn1_retrieve($x_val->[1]);
-
-        if ($x_type eq "subjectKeyIdentifier") {
-            my $vcursor = [ 0, length($raw_value), \$raw_value ];
-
-            $subject_key_id = asn1_extract($vcursor, $UNIV | $OCTET_STRING);
-        }
-    }
-}
-
-###############################################################################
-#
-# Determine what we're going to use as the signer's name.  In order of
-# preference, take one of: commonName, organizationName or emailAddress.
-#
-###############################################################################
-my $org = "";
-my $cn = "";
-my $email = "";
-
-while ($subject->[1]->[1] > 0) {
-    my $rdn = asn1_extract($subject->[1], $UNIV | $CONS | $SET);
-    my $attr = asn1_extract($rdn->[1], $UNIV | $CONS | $SEQUENCE);
-    my $n_oid = asn1_extract($attr->[1], $UNIV | $OBJ_ID);
-    my $n_val = asn1_extract($attr->[1], -1);
-
-    my $raw_oid = asn1_retrieve($n_oid->[1]);
-    next if (!exists($OIDs{$raw_oid}));
-    my $n_type = $OIDs{$raw_oid};
-
-    my $raw_value = asn1_retrieve($n_val->[1]);
-
-    if ($n_type eq "organizationName") {
-        $org = $raw_value;
-    } elsif ($n_type eq "commonName") {
-        $cn = $raw_value;
-    } elsif ($n_type eq "emailAddress") {
-        $email = $raw_value;
-    }
-}
-
-my $signers_name = $email;
-
-if ($org && $cn) {
-    # Don't use the organizationName if the commonName repeats it
-    if (length($org) <= length($cn) &&
-        substr($cn, 0, length($org)) eq $org) {
-        $signers_name = $cn;
-        goto got_id_name;
-    }
-
-    # Or a signifcant chunk of it
-    if (length($org) >= 7 &&
-        length($cn) >= 7 &&
-        substr($cn, 0, 7) eq substr($org, 0, 7)) {
-        $signers_name = $cn;
-        goto got_id_name;
-    }
-
-    $signers_name = $org . ": " . $cn;
-} elsif ($org) {
-    $signers_name = $org;
-} elsif ($cn) {
-    $signers_name = $cn;
-}
-
-got_id_name:
-
-die $x509, ": ", "X.509: Couldn't find the Subject Key Identifier extension\n"
-    if (!$subject_key_id);
-
-my $key_identifier = asn1_retrieve($subject_key_id->[1]);
-
-###############################################################################
-#
-# Create and attach the module signature
-#
-###############################################################################
-
-#
-# Signature parameters
-#
-my $algo = 1;           # Public-key crypto algorithm: RSA
-my $hash = 0;           # Digest algorithm
-my $id_type = 1;        # Identifier type: X.509
-
-#
-# Digest the data
-#
-my ($dgst, $prologue) = ();
-if (exists $config{"CONFIG_MODULE_SIG_SHA1"}) {
-    $prologue = pack("C*",
-                     0x30, 0x21, 0x30, 0x09, 0x06, 0x05,
-                     0x2B, 0x0E, 0x03, 0x02, 0x1A,
-                     0x05, 0x00, 0x04, 0x14);
-    $dgst = "-sha1";
-    $hash = 2;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA224"}) {
-    $prologue = pack("C*",
-                     0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09,
-                     0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04,
-                     0x05, 0x00, 0x04, 0x1C);
-    $dgst = "-sha224";
-    $hash = 7;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA256"}) {
-    $prologue = pack("C*",
-                     0x30, 0x31, 0x30, 0x0d, 0x06, 0x09,
-                     0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01,
-                     0x05, 0x00, 0x04, 0x20);
-    $dgst = "-sha256";
-    $hash = 4;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA384"}) {
-    $prologue = pack("C*",
-                     0x30, 0x41, 0x30, 0x0d, 0x06, 0x09,
-                     0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02,
-                     0x05, 0x00, 0x04, 0x30);
-    $dgst = "-sha384";
-    $hash = 5;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA512"}) {
-    $prologue = pack("C*",
-                     0x30, 0x51, 0x30, 0x0d, 0x06, 0x09,
-                     0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03,
-                     0x05, 0x00, 0x04, 0x40);
-    $dgst = "-sha512";
-    $hash = 6;
-} else {
-    die "Can't determine hash algorithm";
-}
-
-#
-# Generate the digest and read from openssl's stdout
-#
-my $digest;
-$digest = readpipe("openssl dgst $dgst -binary $module") || die "openssl dgst";
-
-#
-# Generate the binary signature, which will be just the integer that comprises
-# the signature with no metadata attached.
-#
-my $pid;
-$pid = open2(*read_from, *write_to,
-             "openssl rsautl -sign -inkey $private_key -keyform PEM") ||
-    die "openssl rsautl";
-binmode write_to;
-print write_to $prologue . $digest || die "pipe to openssl rsautl";
-close(write_to) || die "pipe to openssl rsautl";
-
-binmode read_from;
-my $signature;
-read(read_from, $signature, 4096) || die "pipe from openssl rsautl";
-close(read_from) || die "pipe from openssl rsautl";
-$signature = pack("n", length($signature)) . $signature,
-
-waitpid($pid, 0) || die;
-die "openssl rsautl died: $?" if ($? >> 8);
-
-#
-# Build the signed binary
-#
-my $unsigned_module = read_file($module);
-
-my $magic_number = "~Module signature appended~\n";
-
-my $info = pack("CCCCCxxxN",
-                $algo, $hash, $id_type,
-                length($signers_name),
-                length($key_identifier),
-                length($signature));
-
-if ($verbose) {
-    print "Size of unsigned module: ", length($unsigned_module), "\n";
-    print "Size of signer's name  : ", length($signers_name), "\n";
-    print "Size of key identifier : ", length($key_identifier), "\n";
-    print "Size of signature      : ", length($signature), "\n";
-    print "Size of informaton     : ", length($info), "\n";
-    print "Size of magic number   : ", length($magic_number), "\n";
-    print "Signer's name          : '", $signers_name, "'\n";
-    print "Digest                 : $dgst\n";
-}
-
-open(FD, ">$dest") || die $dest;
-binmode FD;
-print FD
-    $unsigned_module,
-    $signers_name,
-    $key_identifier,
-    $signature,
-    $info,
-    $magic_number
-    ;
-close FD || die $dest;
-
-if ($#ARGV != 3) {
-    rename($dest, $module) || die $module;
-}
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
deleted file mode 100644
index 1f10e89d15b..00000000000
--- a/scripts/sortextable.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * sortextable.c: Sort the kernel's exception table
- *
- * Copyright 2011 - 2012 Cavium, Inc.
- *
- * Based on code taken from recortmcount.c which is:
- *
- * Copyright 2009 John F. Reiser <jreiser@BitWagon.com>.  All rights reserved.
- * Licensed under the GNU General Public License, version 2 (GPLv2).
- *
- * Restructured to fit Linux format, as well as other updates:
- *  Copyright 2010 Steven Rostedt <srostedt@redhat.com>, Red Hat Inc.
- */
-
-/*
- * Strategy: alter the vmlinux file in-place.
- */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <getopt.h>
-#include <elf.h>
-#include <fcntl.h>
-#include <setjmp.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <tools/be_byteshift.h>
-#include <tools/le_byteshift.h>
-
-static int fd_map;      /* File descriptor for file being modified. */
-static int mmap_failed; /* Boolean flag. */
-static void *ehdr_curr; /* current ElfXX_Ehdr *  for resource cleanup */
-static struct stat sb;  /* Remember .st_size, etc. */
-static jmp_buf jmpenv;  /* setjmp/longjmp per-file error escape */
-
-/* setjmp() return values */
-enum {
-        SJ_SETJMP = 0,  /* hardwired first return */
-        SJ_FAIL,
-        SJ_SUCCEED
-};
-
-/* Per-file resource cleanup when multiple files. */
-static void
-cleanup(void)
-{
-        if (!mmap_failed)
-                munmap(ehdr_curr, sb.st_size);
-        close(fd_map);
-}
-
-static void __attribute__((noreturn))
-fail_file(void)
-{
-        cleanup();
-        longjmp(jmpenv, SJ_FAIL);
-}
-
-static void __attribute__((noreturn))
-succeed_file(void)
-{
-        cleanup();
-        longjmp(jmpenv, SJ_SUCCEED);
-}
-
-
-/*
- * Get the whole file as a programming convenience in order to avoid
- * malloc+lseek+read+free of many pieces.  If successful, then mmap
- * avoids copying unused pieces; else just read the whole file.
- * Open for both read and write.
- */
-static void *mmap_file(char const *fname)
-{
-        void *addr;
-
-        fd_map = open(fname, O_RDWR);
-        if (fd_map < 0 || fstat(fd_map, &sb) < 0) {
-                perror(fname);
-                fail_file();
-        }
-        if (!S_ISREG(sb.st_mode)) {
-                fprintf(stderr, "not a regular file: %s\n", fname);
-                fail_file();
-        }
-        addr = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_SHARED,
-                    fd_map, 0);
-        if (addr == MAP_FAILED) {
-                mmap_failed = 1;
-                fprintf(stderr, "Could not mmap file: %s\n", fname);
-                fail_file();
-        }
-        return addr;
-}
-
-static uint64_t r8be(const uint64_t *x)
-{
-        return get_unaligned_be64(x);
-}
-static uint32_t rbe(const uint32_t *x)
-{
-        return get_unaligned_be32(x);
-}
-static uint16_t r2be(const uint16_t *x)
-{
-        return get_unaligned_be16(x);
-}
-static uint64_t r8le(const uint64_t *x)
-{
-        return get_unaligned_le64(x);
-}
-static uint32_t rle(const uint32_t *x)
-{
-        return get_unaligned_le32(x);
-}
-static uint16_t r2le(const uint16_t *x)
-{
-        return get_unaligned_le16(x);
-}
-
-static void w8be(uint64_t val, uint64_t *x)
-{
-        put_unaligned_be64(val, x);
-}
-static void wbe(uint32_t val, uint32_t *x)
-{
-        put_unaligned_be32(val, x);
-}
-static void w2be(uint16_t val, uint16_t *x)
-{
-        put_unaligned_be16(val, x);
-}
-static void w8le(uint64_t val, uint64_t *x)
-{
-        put_unaligned_le64(val, x);
-}
-static void wle(uint32_t val, uint32_t *x)
-{
-        put_unaligned_le32(val, x);
-}
-static void w2le(uint16_t val, uint16_t *x)
-{
-        put_unaligned_le16(val, x);
-}
-
-static uint64_t (*r8)(const uint64_t *);
-static uint32_t (*r)(const uint32_t *);
-static uint16_t (*r2)(const uint16_t *);
-static void (*w8)(uint64_t, uint64_t *);
-static void (*w)(uint32_t, uint32_t *);
-static void (*w2)(uint16_t, uint16_t *);
-
-typedef void (*table_sort_t)(char *, int);
-
-/* 32 bit and 64 bit are very similar */
-#include "sortextable.h"
-#define SORTEXTABLE_64
-#include "sortextable.h"
-
-static int compare_relative_table(const void *a, const void *b)
-{
-        int32_t av = (int32_t)r(a);
-        int32_t bv = (int32_t)r(b);
-
-        if (av < bv)
-                return -1;
-        if (av > bv)
-                return 1;
-        return 0;
-}
-
-static void sort_relative_table(char *extab_image, int image_size)
-{
-        int i;
-
-        /*
-         * Do the same thing the runtime sort does, first normalize to
-         * being relative to the start of the section.
-         */
-        i = 0;
-        while (i < image_size) {
-                uint32_t *loc = (uint32_t *)(extab_image + i);
-                w(r(loc) + i, loc);
-                i += 4;
-        }
-
-        qsort(extab_image, image_size / 8, 8, compare_relative_table);
-
-        /* Now denormalize. */
-        i = 0;
-        while (i < image_size) {
-                uint32_t *loc = (uint32_t *)(extab_image + i);
-                w(r(loc) - i, loc);
-                i += 4;
-        }
-}
-
-static void
-do_file(char const *const fname)
-{
-        table_sort_t custom_sort;
-        Elf32_Ehdr *ehdr = mmap_file(fname);
-
-        ehdr_curr = ehdr;
-        switch (ehdr->e_ident[EI_DATA]) {
-        default:
-                fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
-                        ehdr->e_ident[EI_DATA], fname);
-                fail_file();
-                break;
-        case ELFDATA2LSB:
-                r = rle;
-                r2 = r2le;
-                r8 = r8le;
-                w = wle;
-                w2 = w2le;
-                w8 = w8le;
-                break;
-        case ELFDATA2MSB:
-                r = rbe;
-                r2 = r2be;
-                r8 = r8be;
-                w = wbe;
-                w2 = w2be;
-                w8 = w8be;
-                break;
-        }  /* end switch */
-        if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0
-        ||  r2(&ehdr->e_type) != ET_EXEC
-        ||  ehdr->e_ident[EI_VERSION] != EV_CURRENT) {
-                fprintf(stderr, "unrecognized ET_EXEC file %s\n", fname);
-                fail_file();
-        }
-
-        custom_sort = NULL;
-        switch (r2(&ehdr->e_machine)) {
-        default:
-                fprintf(stderr, "unrecognized e_machine %d %s\n",
-                        r2(&ehdr->e_machine), fname);
-                fail_file();
-                break;
-        case EM_386:
-        case EM_X86_64:
-        case EM_S390:
-                custom_sort = sort_relative_table;
-                break;
-        case EM_ARM:
-        case EM_MIPS:
-                break;
-        }  /* end switch */
-
-        switch (ehdr->e_ident[EI_CLASS]) {
-        default:
-                fprintf(stderr, "unrecognized ELF class %d %s\n",
-                        ehdr->e_ident[EI_CLASS], fname);
-                fail_file();
-                break;
-        case ELFCLASS32:
-                if (r2(&ehdr->e_ehsize) != sizeof(Elf32_Ehdr)
-                ||  r2(&ehdr->e_shentsize) != sizeof(Elf32_Shdr)) {
-                        fprintf(stderr,
-                                "unrecognized ET_EXEC file: %s\n", fname);
-                        fail_file();
-                }
-                do32(ehdr, fname, custom_sort);
-                break;
-        case ELFCLASS64: {
-                Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
-                if (r2(&ghdr->e_ehsize) != sizeof(Elf64_Ehdr)
-                ||  r2(&ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {
-                        fprintf(stderr,
-                                "unrecognized ET_EXEC file: %s\n", fname);
-                        fail_file();
-                }
-                do64(ghdr, fname, custom_sort);
-                break;
-        }
-        }  /* end switch */
-
-        cleanup();
-}
-
-int
-main(int argc, char *argv[])
-{
-        int n_error = 0;  /* gcc-4.3.0 false positive complaint */
-        int i;
-
-        if (argc < 2) {
-                fprintf(stderr, "usage: sortextable vmlinux...\n");
-                return 0;
-        }
-
-        /* Process each file in turn, allowing deep failure. */
-        for (i = 1; i < argc; i++) {
-                char *file = argv[i];
-                int const sjval = setjmp(jmpenv);
-
-                switch (sjval) {
-                default:
-                        fprintf(stderr, "internal error: %s\n", file);
-                        exit(1);
-                        break;
-                case SJ_SETJMP:    /* normal sequence */
-                        /* Avoid problems if early cleanup() */
-                        fd_map = -1;
-                        ehdr_curr = NULL;
-                        mmap_failed = 1;
-                        do_file(file);
-                        break;
-                case SJ_FAIL:    /* error in do_file or below */
-                        ++n_error;
-                        break;
-                case SJ_SUCCEED:    /* premature success */
-                        /* do nothing */
-                        break;
-                }  /* end switch */
-        }
-        return !!n_error;
-}
diff --git a/scripts/sortextable.h b/scripts/sortextable.h
deleted file mode 100644
index e4fd45b7e45..00000000000
--- a/scripts/sortextable.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * sortextable.h
- *
- * Copyright 2011 - 2012 Cavium, Inc.
- *
- * Some of this code was taken out of recordmcount.h written by:
- *
- * Copyright 2009 John F. Reiser <jreiser@BitWagon.com>.  All rights reserved.
- * Copyright 2010 Steven Rostedt <srostedt@redhat.com>, Red Hat Inc.
- *
- *
- * Licensed under the GNU General Public License, version 2 (GPLv2).
- */
-
-#undef extable_ent_size
-#undef compare_extable
-#undef do_func
-#undef Elf_Addr
-#undef Elf_Ehdr
-#undef Elf_Shdr
-#undef Elf_Rel
-#undef Elf_Rela
-#undef Elf_Sym
-#undef ELF_R_SYM
-#undef Elf_r_sym
-#undef ELF_R_INFO
-#undef Elf_r_info
-#undef ELF_ST_BIND
-#undef ELF_ST_TYPE
-#undef fn_ELF_R_SYM
-#undef fn_ELF_R_INFO
-#undef uint_t
-#undef _r
-#undef _w
-
-#ifdef SORTEXTABLE_64
-# define extable_ent_size       16
-# define compare_extable        compare_extable_64
-# define do_func                do64
-# define Elf_Addr               Elf64_Addr
-# define Elf_Ehdr               Elf64_Ehdr
-# define Elf_Shdr               Elf64_Shdr
-# define Elf_Rel                Elf64_Rel
-# define Elf_Rela               Elf64_Rela
-# define Elf_Sym                Elf64_Sym
-# define ELF_R_SYM              ELF64_R_SYM
-# define Elf_r_sym              Elf64_r_sym
-# define ELF_R_INFO             ELF64_R_INFO
-# define Elf_r_info             Elf64_r_info
-# define ELF_ST_BIND            ELF64_ST_BIND
-# define ELF_ST_TYPE            ELF64_ST_TYPE
-# define fn_ELF_R_SYM           fn_ELF64_R_SYM
-# define fn_ELF_R_INFO          fn_ELF64_R_INFO
-# define uint_t                 uint64_t
-# define _r                     r8
-# define _w                     w8
-#else
-# define extable_ent_size       8
-# define compare_extable        compare_extable_32
-# define do_func                do32
-# define Elf_Addr               Elf32_Addr
-# define Elf_Ehdr               Elf32_Ehdr
-# define Elf_Shdr               Elf32_Shdr
-# define Elf_Rel                Elf32_Rel
-# define Elf_Rela               Elf32_Rela
-# define Elf_Sym                Elf32_Sym
-# define ELF_R_SYM              ELF32_R_SYM
-# define Elf_r_sym              Elf32_r_sym
-# define ELF_R_INFO             ELF32_R_INFO
-# define Elf_r_info             Elf32_r_info
-# define ELF_ST_BIND            ELF32_ST_BIND
-# define ELF_ST_TYPE            ELF32_ST_TYPE
-# define fn_ELF_R_SYM           fn_ELF32_R_SYM
-# define fn_ELF_R_INFO          fn_ELF32_R_INFO
-# define uint_t                 uint32_t
-# define _r                     r
-# define _w                     w
-#endif
-
-static int compare_extable(const void *a, const void *b)
-{
-        Elf_Addr av = _r(a);
-        Elf_Addr bv = _r(b);
-
-        if (av < bv)
-                return -1;
-        if (av > bv)
-                return 1;
-        return 0;
-}
-
-static void
-do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
-{
-        Elf_Shdr *shdr;
-        Elf_Shdr *shstrtab_sec;
-        Elf_Shdr *strtab_sec = NULL;
-        Elf_Shdr *symtab_sec = NULL;
-        Elf_Shdr *extab_sec = NULL;
-        Elf_Sym *sym;
-        Elf_Sym *sort_needed_sym;
-        Elf_Shdr *sort_needed_sec;
-        Elf_Rel *relocs = NULL;
-        int relocs_size;
-        uint32_t *sort_done_location;
-        const char *secstrtab;
-        const char *strtab;
-        char *extab_image;
-        int extab_index = 0;
-        int i;
-        int idx;
-
-        shdr = (Elf_Shdr *)((char *)ehdr + _r(&ehdr->e_shoff));
-        shstrtab_sec = shdr + r2(&ehdr->e_shstrndx);
-        secstrtab = (const char *)ehdr + _r(&shstrtab_sec->sh_offset);
-        for (i = 0; i < r2(&ehdr->e_shnum); i++) {
-                idx = r(&shdr[i].sh_name);
-                if (strcmp(secstrtab + idx, "__ex_table") == 0) {
-                        extab_sec = shdr + i;
-                        extab_index = i;
-                }
-                if ((r(&shdr[i].sh_type) == SHT_REL ||
-                     r(&shdr[i].sh_type) == SHT_RELA) &&
-                    r(&shdr[i].sh_info) == extab_index) {
-                        relocs = (void *)ehdr + _r(&shdr[i].sh_offset);
-                        relocs_size = _r(&shdr[i].sh_size);
-                }
-                if (strcmp(secstrtab + idx, ".symtab") == 0)
-                        symtab_sec = shdr + i;
-                if (strcmp(secstrtab + idx, ".strtab") == 0)
-                        strtab_sec = shdr + i;
-        }
-        if (strtab_sec == NULL) {
-                fprintf(stderr, "no .strtab in  file: %s\n", fname);
-                fail_file();
-        }
-        if (symtab_sec == NULL) {
-                fprintf(stderr, "no .symtab in  file: %s\n", fname);
-                fail_file();
-        }
-        if (extab_sec == NULL) {
-                fprintf(stderr, "no __ex_table in  file: %s\n", fname);
-                fail_file();
-        }
-        strtab = (const char *)ehdr + _r(&strtab_sec->sh_offset);
-
-        extab_image = (void *)ehdr + _r(&extab_sec->sh_offset);
-
-        if (custom_sort) {
-                custom_sort(extab_image, _r(&extab_sec->sh_size));
-        } else {
-                int num_entries = _r(&extab_sec->sh_size) / extable_ent_size;
-                qsort(extab_image, num_entries,
-                      extable_ent_size, compare_extable);
-        }
-        /* If there were relocations, we no longer need them. */
-        if (relocs)
-                memset(relocs, 0, relocs_size);
-
-        /* find main_extable_sort_needed */
-        sort_needed_sym = NULL;
-        for (i = 0; i < _r(&symtab_sec->sh_size) / sizeof(Elf_Sym); i++) {
-                sym = (void *)ehdr + _r(&symtab_sec->sh_offset);
-                sym += i;
-                if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
-                        continue;
-                idx = r(&sym->st_name);
-                if (strcmp(strtab + idx, "main_extable_sort_needed") == 0) {
-                        sort_needed_sym = sym;
-                        break;
-                }
-        }
-        if (sort_needed_sym == NULL) {
-                fprintf(stderr,
-                        "no main_extable_sort_needed symbol in  file: %s\n",
-                        fname);
-                fail_file();
-        }
-        sort_needed_sec = &shdr[r2(&sort_needed_sym->st_shndx)];
-        sort_done_location = (void *)ehdr +
-                _r(&sort_needed_sec->sh_offset) +
-                _r(&sort_needed_sym->st_value) -
-                _r(&sort_needed_sec->sh_addr);
-
-#if 1
-        printf("sort done marker at %lx\n",
-               (unsigned long)((char *)sort_done_location - (char *)ehdr));
-#endif
-        /* We sorted it, clear the flag. */
-        w(0, sort_done_location);
-}
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 08f06c00745..75c5d24f199 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -48,14 +48,13 @@ find_arch_sources()
         for i in $archincludedir; do
                 prune="$prune -wholename $i -prune -o"
         done
-        find ${tree}arch/$1 $ignore $subarchprune $prune -name "$2" -print;
+        find ${tree}arch/$1 $ignore $prune -name "$2" -print;
 }
 
 # find sources in arch/$1/include
 find_arch_include_sources()
 {
-        include=$(find ${tree}arch/$1/ $subarchprune \
-                                        -name include -type d -print);
+        include=$(find ${tree}arch/$1/ -name include -type d);
         if [ -n "$include" ]; then
                 archincludedir="$archincludedir $include"
                 find $include $ignore -name "$2" -print;
@@ -96,32 +95,6 @@ all_sources()
         find_other_sources '*.[chS]'
 }
 
-all_compiled_sources()
-{
-        for i in $(all_sources); do
-                case "$i" in
-                        *.[cS])
-                                j=${i/\.[cS]/\.o}
-                                if [ -e $j ]; then
-                                        echo $i
-                                fi
-                                ;;
-                        *)
-                                echo $i
-                                ;;
-                esac
-        done
-}
-
-all_target_sources()
-{
-        if [ -n "$COMPILED_SOURCE" ]; then
-                all_compiled_sources
-        else
-                all_sources
-        fi
-}
-
 all_kconfigs()
 {
         for arch in $ALLSOURCE_ARCHS; do
@@ -137,18 +110,18 @@ all_defconfigs()
 
 docscope()
 {
-        (echo \-k; echo \-q; all_target_sources) > cscope.files
+        (echo \-k; echo \-q; all_sources) > cscope.files
         cscope -b -f cscope.out
 }
 
 dogtags()
 {
-        all_target_sources | gtags -i -f -
+        all_sources | gtags -f -
 }
 
 exuberant()
 {
-        all_target_sources | xargs $1 -a                        \
+        all_sources | xargs $1 -a                               \
         -I __initdata,__exitdata,__acquires,__releases          \
         -I __read_mostly,____cacheline_aligned                  \
         -I ____cacheline_aligned_in_smp                         \
@@ -156,34 +129,10 @@ exuberant()
         -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \
         -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
         --extra=+f --c-kinds=+px                                \
-        --regex-asm='/^(ENTRY|_GLOBAL)\(([^)]*)\).*/\2/'        \
+        --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'                  \
         --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \
         --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/'               \
-        --regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1/'     \
-        --regex-c++='/PAGEFLAG\(([^,)]*).*/Page\1/'                     \
-        --regex-c++='/PAGEFLAG\(([^,)]*).*/SetPage\1/'                  \
-        --regex-c++='/PAGEFLAG\(([^,)]*).*/ClearPage\1/'                \
-        --regex-c++='/TESTSETFLAG\(([^,)]*).*/TestSetPage\1/'           \
-        --regex-c++='/TESTPAGEFLAG\(([^,)]*).*/Page\1/'                 \
-        --regex-c++='/SETPAGEFLAG\(([^,)]*).*/SetPage\1/'               \
-        --regex-c++='/__SETPAGEFLAG\(([^,)]*).*/__SetPage\1/'           \
-        --regex-c++='/TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'       \
-        --regex-c++='/__TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'     \
-        --regex-c++='/CLEARPAGEFLAG\(([^,)]*).*/ClearPage\1/'           \
-        --regex-c++='/__CLEARPAGEFLAG\(([^,)]*).*/__ClearPage\1/'       \
-        --regex-c++='/__PAGEFLAG\(([^,)]*).*/__SetPage\1/'              \
-        --regex-c++='/__PAGEFLAG\(([^,)]*).*/__ClearPage\1/'            \
-        --regex-c++='/PAGEFLAG_FALSE\(([^,)]*).*/Page\1/'               \
-        --regex-c++='/TESTSCFLAG\(([^,)]*).*/TestSetPage\1/'            \
-        --regex-c++='/TESTSCFLAG\(([^,)]*).*/TestClearPage\1/'          \
-        --regex-c++='/SETPAGEFLAG_NOOP\(([^,)]*).*/SetPage\1/'          \
-        --regex-c++='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/'      \
-        --regex-c++='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/'  \
-        --regex-c++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
-        --regex-c++='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
-        --regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'                \
-        --regex-c='/PCI_OP_READ\(([a-z]*[a-z]).*[1-4]\)/pci_bus_read_config_\1/' \
-        --regex-c='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\1/'
+        --regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1/'
 
         all_kconfigs | xargs $1 -a                              \
         --langdef=kconfig --language-force=kconfig              \
@@ -196,39 +145,16 @@ exuberant()
         all_defconfigs | xargs -r $1 -a                         \
         --langdef=dotconfig --language-force=dotconfig          \
         --regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'
+
 }
 
 emacs()
 {
-        all_target_sources | xargs $1 -a                        \
-        --regex='/^(ENTRY|_GLOBAL)(\([^)]*\)).*/\2/'            \
+        all_sources | xargs $1 -a                               \
+        --regex='/^ENTRY(\([^)]*\)).*/\1/'                      \
         --regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
         --regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'          \
-        --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/' \
-        --regex='/PAGEFLAG\(([^,)]*).*/Page\1/'                 \
-        --regex='/PAGEFLAG\(([^,)]*).*/SetPage\1/'              \
-        --regex='/PAGEFLAG\(([^,)]*).*/ClearPage\1/'            \
-        --regex='/TESTSETFLAG\(([^,)]*).*/TestSetPage\1/'       \
-        --regex='/TESTPAGEFLAG\(([^,)]*).*/Page\1/'             \
-        --regex='/SETPAGEFLAG\(([^,)]*).*/SetPage\1/'           \
-        --regex='/__SETPAGEFLAG\(([^,)]*).*/__SetPage\1/'       \
-        --regex='/TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'   \
-        --regex='/__TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/' \
-        --regex='/CLEARPAGEFLAG\(([^,)]*).*/ClearPage\1/'       \
-        --regex='/__CLEARPAGEFLAG\(([^,)]*).*/__ClearPage\1/'   \
-        --regex='/__PAGEFLAG\(([^,)]*).*/__SetPage\1/'          \
-        --regex='/__PAGEFLAG\(([^,)]*).*/__ClearPage\1/'        \
-        --regex='/PAGEFLAG_FALSE\(([^,)]*).*/Page\1/'           \
-        --regex='/TESTSCFLAG\(([^,)]*).*/TestSetPage\1/'        \
-        --regex='/TESTSCFLAG\(([^,)]*).*/TestClearPage\1/'      \
-        --regex='/SETPAGEFLAG_NOOP\(([^,)]*).*/SetPage\1/'      \
-        --regex='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/'  \
-        --regex='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \
-        --regex='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
-        --regex='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
-        --regex='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'            \
-        --regex='/PCI_OP_READ\(([a-z]*[a-z]).*[1-4]\)/pci_bus_read_config_\1/' \
-        --regex='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\1/'
+        --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/'
 
         all_kconfigs | xargs $1 -a                              \
         --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'
@@ -247,10 +173,11 @@ xtags()
         elif $1 --version 2>&1 | grep -iq emacs; then
                 emacs $1
         else
-                all_target_sources | xargs $1 -a
+                all_sources | xargs $1 -a
         fi
 }
 
+
 # Support um (which uses SUBARCH)
 if [ "${ARCH}" = "um" ]; then
         if [ "$SUBARCH" = "i386" ]; then
@@ -260,24 +187,8 @@ if [ "${ARCH}" = "um" ]; then
         else
                 archinclude=${SUBARCH}
         fi
-elif [ "${SRCARCH}" = "arm" -a "${SUBARCH}" != "" ]; then
-        subarchdir=$(find ${tree}arch/$SRCARCH/ -name "mach-*" -type d -o \
-                                                        -name "plat-*" -type d);
-        for i in $subarchdir; do
-                case "$i" in
-                        *"mach-"${SUBARCH})
-                                ;;
-                        *"plat-"${SUBARCH})
-                                ;;
-                        *)
-                                subarchprune="$subarchprune \
-                                                -wholename $i -prune -o"
-                                ;;
-                esac
-        done
 fi
 
-remove_structs=
 case "$1" in
         "cscope")
                 docscope
@@ -290,17 +201,10 @@ case "$1" in
         "tags")
                 rm -f tags
                 xtags ctags
-                remove_structs=y
                 ;;
 
         "TAGS")
                 rm -f TAGS
                 xtags etags
-                remove_structs=y
                 ;;
 esac
-
-# Remove structure forward declarations.
-if [ -n "$remove_structs" ]; then
-    LANG=C sed -i -e '/^\([a-zA-Z_][a-zA-Z0-9_]*\)\t.*\t\/\^struct \1;.*\$\/;"\tx$/d' $1
-fi
diff --git a/scripts/xz_wrap.sh b/scripts/xz_wrap.sh
index 7a2d372f488..17a5798c29d 100644
--- a/scripts/xz_wrap.sh
+++ b/scripts/xz_wrap.sh
@@ -12,8 +12,8 @@
 BCJ=
 LZMA2OPTS=
 
-case $SRCARCH in
-        x86)            BCJ=--x86 ;;
+case $ARCH in
+        x86|x86_64)     BCJ=--x86 ;;
         powerpc)        BCJ=--powerpc ;;
         ia64)           BCJ=--ia64; LZMA2OPTS=pb=4 ;;
         arm)            BCJ=--arm ;;