115 files changed, 2576 insertions, 1032 deletions
diff --git a/.gitignore b/.gitignore
index 946c7ec5c922..fb2190c61af0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
 *.lst
 *.symtypes
 *.order
+modules.builtin
 *.elf
 *.bin
 *.gz
@@ -45,14 +46,8 @@ Module.symvers
 #
 # Generated include files
 #
-include/asm
-include/asm-*/asm-offsets.h
 include/config
-include/linux/autoconf.h
-include/linux/compile.h
 include/linux/version.h
-include/linux/utsrelease.h
-include/linux/bounds.h
 include/generated
 # stgit generated dirs
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index e151b2a36267..3ad6acead949 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -103,6 +103,7 @@ gconf
 gen-devlist
 gen_crc32table
 gen_init_cpio
+generated
 genheaders
 genksyms
 *_gray256.c
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt
index bb3bf38f03da..6f8c1cabbc5d 100644
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
@@ -1,3 +1,17 @@
+Output files
+modules.order
+--------------------------------------------------
+This file records the order in which modules appear in Makefiles. This
+is used by modprobe to deterministically resolve aliases that match
+multiple modules.
+modules.builtin
+--------------------------------------------------
+This file lists all modules that are built into the kernel. This is used
+by modprobe to not fail when trying to load something builtin.
 Environment variables
 KCPPFLAGS
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt
index 849b5e56d06f..49efae703979 100644
--- a/Documentation/kbuild/kconfig.txt
+++ b/Documentation/kbuild/kconfig.txt
@@ -103,10 +103,16 @@ KCONFIG_AUTOCONFIG
 This environment variable can be set to specify the path & name of the
 "auto.conf" file.  Its default value is "include/config/auto.conf".
+KCONFIG_TRISTATE
+--------------------------------------------------
+This environment variable can be set to specify the path & name of the
+"tristate.conf" file.  Its default value is "include/config/tristate.conf".
 KCONFIG_AUTOHEADER
 --------------------------------------------------
 This environment variable can be set to specify the path & name of the
-"autoconf.h" (header) file.  Its default value is "include/linux/autoconf.h".
+"autoconf.h" (header) file.
+Its default value is "include/generated/autoconf.h".
 ======================================================================
diff --git a/Kbuild b/Kbuild
index f056b4feee51..e3737ad72b5a 100644
--- a/Kbuild
+++ b/Kbuild
@@ -8,7 +8,7 @@
 #####
 # 1) Generate bounds.h
-bounds-file := include/linux/bounds.h
+bounds-file := include/generated/bounds.h
 always  := $(bounds-file)
 targets := $(bounds-file) kernel/bounds.s
@@ -43,7 +43,7 @@ $(obj)/$(bounds-file): kernel/bounds.s Kbuild
 # 2) Generate asm-offsets.h
 #
-offsets-file := include/asm/asm-offsets.h
+offsets-file := include/generated/asm-offsets.h
 always  += $(offsets-file)
 targets += $(offsets-file)
diff --git a/MAINTAINERS b/MAINTAINERS
index 0699782f8c5b..efd2ef2c2660 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5434,6 +5434,12 @@ F:	drivers/uwb/*
 F:      include/linux/uwb.h
 F:      include/linux/uwb/
+UNIFDEF
+M:      Tony Finch <dot@dotat.at>
+W:      http://dotat.at/prog/unifdef
+S:      Maintained
+F:      scripts/unifdef.c
 UNIFORM CDROM DRIVER
 M:      Jens Axboe <axboe@kernel.dk>
 W:      http://www.kernel.dk
diff --git a/Makefile b/Makefile
index 33d4732a6c4a..8491b21b5537 100644
--- a/Makefile
+++ b/Makefile
@@ -334,10 +334,9 @@ CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
-LINUXINCLUDE    := -Iinclude \
+LINUXINCLUDE    := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \
-                   $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
+                   $(if $(KBUILD_SRC), -I$(srctree)/include) \
-                   -I$(srctree)/arch/$(hdr-arch)/include               \
+                   -include include/generated/autoconf.h
-                   -include include/linux/autoconf.h
 KBUILD_CPPFLAGS := -D__KERNEL__
@@ -465,7 +464,7 @@ ifeq ($(KBUILD_EXTMOD),)
 # Carefully list dependencies so we do not try to build scripts twice
 # in parallel
 PHONY += scripts
-scripts: scripts_basic include/config/auto.conf
+scripts: scripts_basic include/config/auto.conf include/config/tristate.conf
        $(Q)$(MAKE) $(build)=$(@)
 # Objects we will link into vmlinux / subdirs we need to visit
@@ -492,18 +491,18 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
 # with it and forgot to run make oldconfig.
 # if auto.conf.cmd is missing then we are probably in a cleaned tree so
 # we execute the config step to be sure to catch updated Kconfig files
-include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
+include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
        $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
 else
-# external modules needs include/linux/autoconf.h and include/config/auto.conf
+# external modules needs include/generated/autoconf.h and include/config/auto.conf
 # but do not care if they are up-to-date. Use auto.conf to trigger the test
 PHONY += include/config/auto.conf
 include/config/auto.conf:
-        $(Q)test -e include/linux/autoconf.h -a -e $@ || (              \
+        $(Q)test -e include/generated/autoconf.h -a -e $@ || (          \
        echo;                                                           \
        echo "  ERROR: Kernel configuration is invalid.";               \
-        echo "         include/linux/autoconf.h or $@ are missing.";    \
+        echo "         include/generated/autoconf.h or $@ are missing.";\
        echo "         Run 'make oldconfig && make prepare' on kernel src to fix it.";  \
        echo;                                                           \
        /bin/false)
@@ -877,6 +876,9 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
 PHONY += $(vmlinux-dirs)
 $(vmlinux-dirs): prepare scripts
        $(Q)$(MAKE) $(build)=$@
+ifdef CONFIG_MODULES
+        $(Q)$(MAKE) $(modbuiltin)=$@
+endif
 # Build the kernel release string
 #
@@ -955,7 +957,6 @@ PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3
 # prepare3 is used to check if we are building in a separate output directory,
 # and if so do:
 # 1) Check that make has not been executed in the kernel src $(srctree)
-# 2) Create the include2 directory, used for the second asm symlink
 prepare3: include/config/kernel.release
 ifneq ($(KBUILD_SRC),)
        @$(kecho) '  Using $(srctree) as source for kernel'
@@ -964,17 +965,13 @@ ifneq ($(KBUILD_SRC),)
                echo "  in the '$(srctree)' directory.";\
                /bin/false; \
        fi;
-        $(Q)if [ ! -d include2 ]; then                                  \
-            mkdir -p include2;                                          \
-            ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \
-        fi
 endif
 # prepare2 creates a makefile if using a separate output directory
 prepare2: prepare3 outputmakefile
-prepare1: prepare2 include/linux/version.h include/linux/utsrelease.h \
+prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
-                   include/asm include/config/auto.conf
+                   include/config/auto.conf
        $(cmd_crmodverdir)
 archprepare: prepare1 scripts_basic
@@ -986,42 +983,6 @@ prepare0: archprepare FORCE
 # All the preparing..
 prepare: prepare0
-# The asm symlink changes when $(ARCH) changes.
-# Detect this and ask user to run make mrproper
-# If asm is a stale symlink (point to dir that does not exist) remove it
-define check-symlink
-        set -e;                                                            \
-        if [ -L include/asm ]; then                                        \
-                asmlink=`readlink include/asm | cut -d '-' -f 2`;          \
-                if [ "$$asmlink" != "$(SRCARCH)" ]; then                   \
-                        echo "ERROR: the symlink $@ points to asm-$$asmlink but asm-$(SRCARCH) was expected"; \
-                        echo "       set ARCH or save .config and run 'make mrproper' to fix it";             \
-                        exit 1;                                            \
-                fi;                                                        \
-                test -e $$asmlink || rm include/asm;                       \
-        elif [ -d include/asm ]; then                                      \
-                echo "ERROR: $@ is a directory but a symlink was expected";\
-                exit 1;                                                    \
-        fi
-endef
-# We create the target directory of the symlink if it does
-# not exist so the test in check-symlink works and we have a
-# directory for generated filesas used by some architectures.
-define create-symlink
-        if [ ! -L include/asm ]; then                                      \
-                        $(kecho) '  SYMLINK $@ -> include/asm-$(SRCARCH)'; \
-                        if [ ! -d include/asm-$(SRCARCH) ]; then           \
-                                mkdir -p include/asm-$(SRCARCH);           \
-                        fi;                                                \
-                        ln -fsn asm-$(SRCARCH) $@;                         \
-        fi
-endef
-include/asm: FORCE
-        $(Q)$(check-symlink)
-        $(Q)$(create-symlink)
 # Generate some files
 # ---------------------------------------------------------------------------
@@ -1046,7 +1007,7 @@ endef
 include/linux/version.h: $(srctree)/Makefile FORCE
        $(call filechk,version.h)
-include/linux/utsrelease.h: include/config/kernel.release FORCE
+include/generated/utsrelease.h: include/config/kernel.release FORCE
        $(call filechk,utsrelease.h)
 PHONY += headerdep
@@ -1076,11 +1037,6 @@ firmware_install: FORCE
 export INSTALL_HDR_PATH = $(objtree)/usr
 hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
-# Find out where the Kbuild file is located to support
-# arch/$(ARCH)/include/asm
-hdr-dir = $(strip                                                         \
-          $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/asm/Kbuild), \
-               arch/$(hdr-arch)/include/asm, include/asm-$(hdr-arch)))
 # If we do an all arch process set dst to asm-$(hdr-arch)
 hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
@@ -1095,10 +1051,10 @@ headers_install_all:
 PHONY += headers_install
 headers_install: __headers
-        $(if $(wildcard $(srctree)/$(hdr-dir)/Kbuild),, \
+        $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/asm/Kbuild),, \
        $(error Headers not exportable for the $(SRCARCH) architecture))
        $(Q)$(MAKE) $(hdr-inst)=include
-        $(Q)$(MAKE) $(hdr-inst)=$(hdr-dir) $(hdr-dst)
+        $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst)
 PHONY += headers_check_all
 headers_check_all: headers_install_all
@@ -1107,7 +1063,7 @@ headers_check_all: headers_install_all
 PHONY += headers_check
 headers_check: headers_install
        $(Q)$(MAKE) $(hdr-inst)=include HDRCHECK=1
-        $(Q)$(MAKE) $(hdr-inst)=$(hdr-dir) $(hdr-dst) HDRCHECK=1
+        $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst) HDRCHECK=1
 # ---------------------------------------------------------------------------
 # Modules
@@ -1127,6 +1083,7 @@ all: modules
 PHONY += modules
 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
        $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
+        $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.builtin) > $(objtree)/modules.builtin
        @$(kecho) '  Building modules, stage 2.';
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
@@ -1156,6 +1113,7 @@ _modinst_:
                ln -s $(objtree) $(MODLIB)/build ; \
        fi
        @cp -f $(objtree)/modules.order $(MODLIB)/
+        @cp -f $(objtree)/modules.builtin $(MODLIB)/
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
 # This depmod is only for convenience to give the initial
@@ -1194,12 +1152,10 @@ CLEAN_FILES +=	vmlinux System.map \
                .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
 # Directories & files removed with 'make mrproper'
-MRPROPER_DIRS  += include/config include2 usr/include include/generated
+MRPROPER_DIRS  += include/config usr/include include/generated
-MRPROPER_FILES += .config .config.old include/asm .version .old_version \
+MRPROPER_FILES += .config .config.old .version .old_version             \
-                  include/linux/autoconf.h include/linux/version.h      \
+                  include/linux/version.h                               \
-                  include/linux/utsrelease.h                            \
+                  Module.symvers tags TAGS cscope*
-                  include/linux/bounds.h include/asm*/asm-offsets.h     \
-                  Module.symvers Module.markers tags TAGS cscope*
 # clean - Delete most, but leave enough to build external modules
 #
@@ -1218,7 +1174,7 @@ clean: archclean $(clean-dirs)
                \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
                -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
                -o -name '*.symtypes' -o -name 'modules.order' \
-                -o -name 'Module.markers' -o -name '.tmp_*.o.*' \
+                -o -name modules.builtin -o -name '.tmp_*.o.*' \
                -o -name '*.gcno' \) -type f -print | xargs rm -f
 # mrproper - Delete all generated files, including .config
@@ -1416,8 +1372,8 @@ $(clean-dirs):
 clean:  rm-dirs := $(MODVERDIR)
 clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers \
-                   $(KBUILD_EXTMOD)/Module.markers \
+                   $(KBUILD_EXTMOD)/modules.order \
-                   $(KBUILD_EXTMOD)/modules.order
+                   $(KBUILD_EXTMOD)/modules.builtin
 clean: $(clean-dirs)
        $(call cmd,rmdirs)
        $(call cmd,rmfiles)
diff --git a/arch/alpha/boot/bootp.c b/arch/alpha/boot/bootp.c
index 3af21c789339..3c8d1b25c661 100644
--- a/arch/alpha/boot/bootp.c
+++ b/arch/alpha/boot/bootp.c
@@ -9,7 +9,7 @@
 */
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/mm.h>
 #include <asm/system.h>
diff --git a/arch/alpha/boot/bootpz.c b/arch/alpha/boot/bootpz.c
index 1036b515e20c..ade3f129dc27 100644
--- a/arch/alpha/boot/bootpz.c
+++ b/arch/alpha/boot/bootpz.c
@@ -11,7 +11,7 @@
 */
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/mm.h>
 #include <asm/system.h>
diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c
index 89f3be071ae5..644b7db55438 100644
--- a/arch/alpha/boot/main.c
+++ b/arch/alpha/boot/main.c
@@ -7,7 +7,7 @@
 */
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/mm.h>
 #include <asm/system.h>
diff --git a/arch/alpha/include/asm/asm-offsets.h b/arch/alpha/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/alpha/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index fa0cdab2e1d3..e9da08483b3c 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -242,15 +242,8 @@ all:	$(KBUILD_IMAGE)
 boot := arch/arm/boot
-#       Update machine arch and proc symlinks if something which affects
+archprepare:
-#       them changed.  We use .arch to indicate when they were updated
+        $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h
-#       last, otherwise make uses the target directory mtime.
-archprepare: maketools
-PHONY += maketools FORCE
-maketools: include/linux/version.h FORCE
-        $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h
 # Convert bzImage to zImage
 bzImage: zImage
@@ -261,9 +254,6 @@ zImage Image xipImage bootpImage uImage: vmlinux
 zinstall install: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
-CLEAN_FILES += include/asm-arm/mach-types.h \
-               include/asm-arm/arch include/asm-arm/.arch
 # We use MRPROPER_FILES and CLEAN_FILES now
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
diff --git a/arch/arm/include/asm/asm-offsets.h b/arch/arm/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/arm/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h
new file mode 100644
index 000000000000..948178cc6ba8
--- /dev/null
+++ b/arch/arm/include/asm/mach-types.h
@@ -0,0 +1 @@
+#include <generated/mach-types.h>
diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile
index 1dbaa29ac4d7..635cb1865e4d 100644
--- a/arch/arm/tools/Makefile
+++ b/arch/arm/tools/Makefile
@@ -4,7 +4,7 @@
 # Copyright (C) 2001 Russell King
 #
-include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
+include/generated/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
        @echo '  Generating $@'
        @mkdir -p $(dir $@)
        $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types
index ce319ef64bc1..04fef71d7be9 100644
--- a/arch/arm/tools/gen-mach-types
+++ b/arch/arm/tools/gen-mach-types
@@ -1,6 +1,6 @@
 #!/bin/awk
 #
-# Awk script to generate include/asm-arm/mach-types.h
+# Awk script to generate include/generated/mach-types.h
 #
 BEGIN   { nr = 0 }
 /^#/    { next }
diff --git a/arch/avr32/include/asm/asm-offsets.h b/arch/avr32/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/avr32/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/blackfin/include/asm/asm-offsets.h b/arch/blackfin/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/blackfin/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S
index 3db478eb5155..76266f80a5f1 100644
--- a/arch/cris/arch-v32/kernel/head.S
+++ b/arch/cris/arch-v32/kernel/head.S
@@ -10,7 +10,6 @@
 * The macros found in mmu_defs_asm.h uses the ## concatenation operator, so
 * -traditional must not be used when assembling this file.
 */
-#include <linux/autoconf.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_rdwr.h>
 #include <hwregs/intr_vect.h>
diff --git a/arch/cris/include/asm/asm-offsets.h b/arch/cris/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/cris/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/cris/kernel/asm-offsets.c b/arch/cris/kernel/asm-offsets.c
index ddd6fbbe75de..dd7b8e983221 100644
--- a/arch/cris/kernel/asm-offsets.c
+++ b/arch/cris/kernel/asm-offsets.c
@@ -1,6 +1,5 @@
 #include <linux/sched.h>
 #include <asm/thread_info.h>
-#include <linux/autoconf.h>
 /*
 * Generate definitions needed by assembly language modules.
diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S
index bbfda67d2907..d49d17d2a14f 100644
--- a/arch/cris/kernel/vmlinux.lds.S
+++ b/arch/cris/kernel/vmlinux.lds.S
@@ -8,7 +8,6 @@
 * the kernel has booted.
 */
-#include <linux/autoconf.h>
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/page.h>
diff --git a/arch/frv/include/asm/asm-offsets.h b/arch/frv/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/frv/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index 55e4fab7c0bc..75cf7f4b2fa8 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -10,7 +10,7 @@
 * 2 of the License, or (at your option) any later version.
 */
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/delay.h>
diff --git a/arch/h8300/include/asm/asm-offsets.h b/arch/h8300/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/h8300/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index e7cbaa02cd0b..475e2725fbde 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -103,4 +103,4 @@ archprepare: make_nr_irqs_h FORCE
 PHONY += make_nr_irqs_h FORCE
 make_nr_irqs_h: FORCE
-        $(Q)$(MAKE) $(build)=arch/ia64/kernel include/asm-ia64/nr-irqs.h
+        $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
diff --git a/arch/ia64/include/asm/asm-offsets.h b/arch/ia64/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/ia64/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/ia64/include/asm/irq.h b/arch/ia64/include/asm/irq.h
index 5282546cdf82..91b920fd7d53 100644
--- a/arch/ia64/include/asm/irq.h
+++ b/arch/ia64/include/asm/irq.h
@@ -13,7 +13,7 @@
 #include <linux/types.h>
 #include <linux/cpumask.h>
-#include <asm-ia64/nr-irqs.h>
+#include <generated/nr-irqs.h>
 static __inline__ int
 irq_canonicalize (int irq)
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 6b7edcab0cb5..2a75e937ae8d 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -81,17 +81,14 @@ define cmd_nr_irqs
 endef
 # We use internal kbuild rules to avoid the "is up to date" message from make
-arch/$(SRCARCH)/kernel/nr-irqs.s: $(srctree)/arch/$(SRCARCH)/kernel/nr-irqs.c \
+arch/$(SRCARCH)/kernel/nr-irqs.s: arch/$(SRCARCH)/kernel/nr-irqs.c
-                                $(wildcard $(srctree)/include/asm-ia64/*/irq.h)
        $(Q)mkdir -p $(dir $@)
        $(call if_changed_dep,cc_s_c)
-include/asm-ia64/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s
+include/generated/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s
        $(Q)mkdir -p $(dir $@)
        $(call cmd,nr_irqs)
-clean-files += $(objtree)/include/asm-ia64/nr-irqs.h
 #
 # native ivt.S, entry.S and fsys.S
 #
diff --git a/arch/ia64/kvm/asm-offsets.c b/arch/ia64/kvm/asm-offsets.c
index 0c3564a7a033..9324c875caf5 100644
--- a/arch/ia64/kvm/asm-offsets.c
+++ b/arch/ia64/kvm/asm-offsets.c
@@ -22,7 +22,6 @@
 *
 */
-#include <linux/autoconf.h>
 #include <linux/kvm_host.h>
 #include <linux/kbuild.h>
diff --git a/arch/m68k/include/asm/asm-offsets.h b/arch/m68k/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/m68k/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 86edb5fbcfc3..ef54128baa0b 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -196,7 +196,7 @@
 * for them and trying to understand what they mean.
 *
 * CONFIG_xxx:  These are the obvious machine configuration defines created
- * during configuration.  These are defined in include/linux/autoconf.h.
+ * during configuration.  These are defined in autoconf.h.
 *
 * CONSOLE:     There is support for head.S console in this file.  This
 * console can talk to a Mac frame buffer, but could easily be extrapolated
diff --git a/arch/microblaze/include/asm/asm-offsets.h b/arch/microblaze/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/microblaze/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/mips/include/asm/asm-offsets.h b/arch/mips/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/mips/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/mn10300/include/asm/asm-offsets.h b/arch/mn10300/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/mn10300/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/parisc/include/asm/asm-offsets.h b/arch/parisc/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/parisc/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/powerpc/include/asm/asm-offsets.h b/arch/powerpc/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/powerpc/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index bcc69e1f77c1..45c0cb9b67e6 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -10,7 +10,7 @@
 */
 #include <linux/init.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/pci.h>
 #include <linux/of.h>
 #include <asm/prom.h>
diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c
index 9290a7a442d0..fb4eb0df054c 100644
--- a/arch/powerpc/platforms/amigaone/setup.c
+++ b/arch/powerpc/platforms/amigaone/setup.c
@@ -14,7 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/seq_file.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <asm/machdep.h>
 #include <asm/cputable.h>
diff --git a/arch/powerpc/platforms/cell/spufs/Makefile b/arch/powerpc/platforms/cell/spufs/Makefile
index b93f877ba504..b9d5d678aa44 100644
--- a/arch/powerpc/platforms/cell/spufs/Makefile
+++ b/arch/powerpc/platforms/cell/spufs/Makefile
@@ -13,10 +13,8 @@ SPU_CC		:= $(SPU_CROSS)gcc
 SPU_AS          := $(SPU_CROSS)gcc
 SPU_LD          := $(SPU_CROSS)ld
 SPU_OBJCOPY     := $(SPU_CROSS)objcopy
-SPU_CFLAGS      := -O2 -Wall -I$(srctree)/include \
+SPU_CFLAGS      := -O2 -Wall -I$(srctree)/include -D__KERNEL__
-                   -I$(objtree)/include2 -D__KERNEL__
+SPU_AFLAGS      := -c -D__ASSEMBLY__ -I$(srctree)/include -D__KERNEL__
-SPU_AFLAGS      := -c -D__ASSEMBLY__ -I$(srctree)/include \
-                   -I$(objtree)/include2 -D__KERNEL__
 SPU_LDFLAGS     := -N -Ttext=0x0
 $(obj)/switch.o: $(obj)/spu_save_dump.h $(obj)/spu_restore_dump.h
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 52f3df3b4ca0..8f41685d8f42 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -23,7 +23,7 @@
 #include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/adb.h>
 #include <linux/module.h>
 #include <linux/delay.h>
diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c
index cf660916ae0b..9dd789a7370d 100644
--- a/arch/powerpc/platforms/powermac/bootx_init.c
+++ b/arch/powerpc/platforms/powermac/bootx_init.c
@@ -12,7 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <asm/sections.h>
 #include <asm/prom.h>
 #include <asm/page.h>
diff --git a/arch/s390/include/asm/asm-offsets.h b/arch/s390/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/s390/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/score/include/asm/asm-offsets.h b/arch/score/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/score/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/score/include/asm/cacheflush.h b/arch/score/include/asm/cacheflush.h
index caaba24036e3..1d545d0ce206 100644
--- a/arch/score/include/asm/cacheflush.h
+++ b/arch/score/include/asm/cacheflush.h
@@ -14,10 +14,12 @@ extern void flush_cache_sigtramp(unsigned long addr);
 extern void flush_icache_all(void);
 extern void flush_icache_range(unsigned long start, unsigned long end);
 extern void flush_dcache_range(unsigned long start, unsigned long end);
+extern void flush_dcache_page(struct page *page);
+#define PG_dcache_dirty         PG_arch_1
 #define flush_cache_dup_mm(mm)                  do {} while (0)
 #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
-#define flush_dcache_page(page)                 do {} while (0)
 #define flush_dcache_mmap_lock(mapping)         do {} while (0)
 #define flush_dcache_mmap_unlock(mapping)       do {} while (0)
 #define flush_cache_vmap(start, end)            do {} while (0)
diff --git a/arch/score/include/asm/delay.h b/arch/score/include/asm/delay.h
index 6726ec199dc0..529e494712a5 100644
--- a/arch/score/include/asm/delay.h
+++ b/arch/score/include/asm/delay.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_SCORE_DELAY_H
 #define _ASM_SCORE_DELAY_H
+#include <asm-generic/param.h>
 static inline void __delay(unsigned long loops)
 {
        /* 3 cycles per loop. */
diff --git a/arch/score/include/asm/page.h b/arch/score/include/asm/page.h
index d92a5a2d36d4..1e9ade8e77e6 100644
--- a/arch/score/include/asm/page.h
+++ b/arch/score/include/asm/page.h
@@ -74,7 +74,7 @@ extern unsigned long max_pfn;
 #define page_to_bus(page)       (page_to_phys(page))
 #define phys_to_page(paddr)     (pfn_to_page(phys_to_pfn(paddr)))
-#define pfn_valid(pfn)          ((pfn) >= min_low_pfn && (pfn) < max_mapnr)
+#define pfn_valid(pfn)          (((pfn) >= min_low_pfn) && ((pfn) < max_low_pfn))
 #define ARCH_PFN_OFFSET         (PAGE_OFFSET >> PAGE_SHIFT)
diff --git a/arch/score/kernel/setup.c b/arch/score/kernel/setup.c
index 6a2503c75c4e..6f898c057878 100644
--- a/arch/score/kernel/setup.c
+++ b/arch/score/kernel/setup.c
@@ -49,6 +49,7 @@ static void __init bootmem_init(void)
        min_low_pfn = PFN_UP(MEMORY_START);
        max_low_pfn = PFN_UP(MEMORY_START + MEMORY_SIZE);
+        max_mapnr = max_low_pfn - min_low_pfn;
        /* Initialize the boot-time allocator with low memory only. */
        bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn,
diff --git a/arch/score/mm/cache.c b/arch/score/mm/cache.c
index dbac9d9dfddd..b25e95743600 100644
--- a/arch/score/mm/cache.c
+++ b/arch/score/mm/cache.c
@@ -29,6 +29,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/fs.h>
 #include <asm/mmu_context.h>
@@ -51,6 +52,27 @@ static void flush_data_cache_page(unsigned long addr)
        }
 }
+void flush_dcache_page(struct page *page)
+{
+        struct address_space *mapping = page_mapping(page);
+        unsigned long addr;
+        if (PageHighMem(page))
+                return;
+        if (mapping && !mapping_mapped(mapping)) {
+                set_bit(PG_dcache_dirty, &(page)->flags);
+                return;
+        }
+        /*
+         * We could delay the flush for the !page_mapping case too.  But that
+         * case is for exec env/arg pages and those are %99 certainly going to
+         * get faulted into the tlb (and thus flushed) anyways.
+         */
+        addr = (unsigned long) page_address(page);
+        flush_data_cache_page(addr);
+}
 /* called by update_mmu_cache. */
 void __update_cache(struct vm_area_struct *vma, unsigned long address,
                pte_t pte)
@@ -63,11 +85,11 @@ void __update_cache(struct vm_area_struct *vma, unsigned long address,
        if (unlikely(!pfn_valid(pfn)))
                return;
        page = pfn_to_page(pfn);
-        if (page_mapping(page) && test_bit(PG_arch_1, &page->flags)) {
+        if (page_mapping(page) && test_bit(PG_dcache_dirty, &(page)->flags)) {
                addr = (unsigned long) page_address(page);
                if (exec)
                        flush_data_cache_page(addr);
-                clear_bit(PG_arch_1, &page->flags);
+                clear_bit(PG_dcache_dirty, &(page)->flags);
        }
 }
diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c
index 4e3dcd0c4716..8c15b2c85d5a 100644
--- a/arch/score/mm/init.c
+++ b/arch/score/mm/init.c
@@ -83,7 +83,6 @@ void __init mem_init(void)
        unsigned long codesize, reservedpages, datasize, initsize;
        unsigned long tmp, ram = 0;
-        max_mapnr = max_low_pfn;
        high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
        totalram_pages += free_all_bootmem();
        totalram_pages -= setup_zero_page();    /* Setup zeroed pages. */
@@ -101,10 +100,6 @@ void __init mem_init(void)
        datasize = (unsigned long) &_edata - (unsigned long) &_etext;
        initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
-        kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT);
-        kclist_add(&kcore_vmalloc, (void *) VMALLOC_START,
-                        VMALLOC_END - VMALLOC_START);
        printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
                        "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",
                        (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index ac17c5ac550e..db91925c79d1 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -205,10 +205,7 @@ libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)
 BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec uImage.bin \
               zImage vmlinux.srec romImage
-PHONY += maketools $(BOOT_TARGETS) FORCE
+PHONY += $(BOOT_TARGETS)
-maketools:  include/linux/version.h FORCE
-        $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h
 all: $(KBUILD_IMAGE)
@@ -217,7 +214,8 @@ $(BOOT_TARGETS): vmlinux
 compressed: zImage
-archprepare: maketools
+archprepare:
+        $(Q)$(MAKE) $(build)=arch/sh/tools include/generated/machtypes.h
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
@@ -234,5 +232,3 @@ define archhelp
        @echo '  uImage.bz2                - Kernel-only image for U-Boot (bzip2)'
        @echo '  uImage.lzma               - Kernel-only image for U-Boot (lzma)'
 endef
-CLEAN_FILES += include/asm-sh/machtypes.h
diff --git a/arch/sh/drivers/pci/fixups-rts7751r2d.c b/arch/sh/drivers/pci/fixups-rts7751r2d.c
index 052b354236dc..7898f14d6641 100644
--- a/arch/sh/drivers/pci/fixups-rts7751r2d.c
+++ b/arch/sh/drivers/pci/fixups-rts7751r2d.c
@@ -15,7 +15,7 @@
 #include <mach/lboxre2.h>
 #include <mach/r2d.h>
 #include "pci-sh4.h"
-#include <asm/machtypes.h>
+#include <generated/machtypes.h>
 #define PCIMCR_MRSET_OFF        0xBFFFFFFF
 #define PCIMCR_RFSH_OFF         0xFFFFFFFB
diff --git a/arch/sh/include/asm/.gitignore b/arch/sh/include/asm/.gitignore
deleted file mode 100644
index 378db779fb6c..000000000000
--- a/arch/sh/include/asm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-machtypes.h
diff --git a/arch/sh/include/asm/asm-offsets.h b/arch/sh/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/sh/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h
index 84dd37761f56..9c30955630ff 100644
--- a/arch/sh/include/asm/machvec.h
+++ b/arch/sh/include/asm/machvec.h
@@ -12,7 +12,7 @@
 #include <linux/types.h>
 #include <linux/time.h>
-#include <asm/machtypes.h>
+#include <generated/machtypes.h>
 struct sh_machine_vector {
        void (*mv_setup)(char **cmdline_p);
diff --git a/arch/sh/tools/Makefile b/arch/sh/tools/Makefile
index 567516b58acc..558a56bcc7cf 100644
--- a/arch/sh/tools/Makefile
+++ b/arch/sh/tools/Makefile
@@ -10,7 +10,7 @@
 # Shamelessly cloned from ARM.
 #
-include/asm-sh/machtypes.h: $(src)/gen-mach-types $(src)/mach-types
+include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types
        @echo '  Generating $@'
-        $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
+        $(Q)mkdir -p $(dir $@)
        $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
diff --git a/arch/sh/tools/gen-mach-types b/arch/sh/tools/gen-mach-types
index 65161e368353..f5ff7c5d8913 100644
--- a/arch/sh/tools/gen-mach-types
+++ b/arch/sh/tools/gen-mach-types
@@ -1,6 +1,6 @@
 #!/bin/awk
 #
-# Awk script to generate include/asm-sh/machtypes.h
+# Awk script to generate include/generated/machtypes.h
 # Heavily based on arch/arm/tools/gen-mach-types
 #
 BEGIN   { nr = 0 }
diff --git a/arch/sparc/include/asm/asm-offsets.h b/arch/sparc/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/sparc/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/um/Makefile b/arch/um/Makefile
index fc633dbacf84..fab8121d2b32 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -149,6 +149,6 @@ $(SHARED_HEADERS)/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s
 $(SHARED_HEADERS)/kern_constants.h:
        $(Q)mkdir -p $(dir $@)
-        $(Q)echo '#include "../../../../include/asm/asm-offsets.h"' >$@
+        $(Q)echo '#include "../../../../include/generated/asm-offsets.h"' >$@
 export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH
diff --git a/arch/um/include/asm/asm-offsets.h b/arch/um/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/um/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index b31cc54b4641..93e689f4bd86 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -16,7 +16,7 @@
 */
 #include <asm/segment.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <asm/boot.h>
 #include <asm/e820.h>
 #include <asm/page_types.h>
diff --git a/arch/x86/boot/version.c b/arch/x86/boot/version.c
index 2723d9b5ce43..2b15aa488ffb 100644
--- a/arch/x86/boot/version.c
+++ b/arch/x86/boot/version.c
@@ -13,8 +13,8 @@
 */
 #include "boot.h"
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
-#include <linux/compile.h>
+#include <generated/compile.h>
 const char kernel_version[] =
        UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") "
diff --git a/arch/x86/include/asm/asm-offsets.h b/arch/x86/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/x86/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index 2779321046bd..017d937639fe 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -509,14 +509,14 @@ static int genregs_get(struct task_struct *target,
 {
        if (kbuf) {
                unsigned long *k = kbuf;
-                while (count > 0) {
+                while (count >= sizeof(*k)) {
                        *k++ = getreg(target, pos);
                        count -= sizeof(*k);
                        pos += sizeof(*k);
                }
        } else {
                unsigned long __user *u = ubuf;
-                while (count > 0) {
+                while (count >= sizeof(*u)) {
                        if (__put_user(getreg(target, pos), u++))
                                return -EFAULT;
                        count -= sizeof(*u);
@@ -535,14 +535,14 @@ static int genregs_set(struct task_struct *target,
        int ret = 0;
        if (kbuf) {
                const unsigned long *k = kbuf;
-                while (count > 0 && !ret) {
+                while (count >= sizeof(*k) && !ret) {
                        ret = putreg(target, pos, *k++);
                        count -= sizeof(*k);
                        pos += sizeof(*k);
                }
        } else {
                const unsigned long  __user *u = ubuf;
-                while (count > 0 && !ret) {
+                while (count >= sizeof(*u) && !ret) {
                        unsigned long word;
                        ret = __get_user(word, u++);
                        if (ret)
@@ -1458,14 +1458,14 @@ static int genregs32_get(struct task_struct *target,
 {
        if (kbuf) {
                compat_ulong_t *k = kbuf;
-                while (count > 0) {
+                while (count >= sizeof(*k)) {
                        getreg32(target, pos, k++);
                        count -= sizeof(*k);
                        pos += sizeof(*k);
                }
        } else {
                compat_ulong_t __user *u = ubuf;
-                while (count > 0) {
+                while (count >= sizeof(*u)) {
                        compat_ulong_t word;
                        getreg32(target, pos, &word);
                        if (__put_user(word, u++))
@@ -1486,14 +1486,14 @@ static int genregs32_set(struct task_struct *target,
        int ret = 0;
        if (kbuf) {
                const compat_ulong_t *k = kbuf;
-                while (count > 0 && !ret) {
+                while (count >= sizeof(*k) && !ret) {
                        ret = putreg32(target, pos, *k++);
                        count -= sizeof(*k);
                        pos += sizeof(*k);
                }
        } else {
                const compat_ulong_t __user *u = ubuf;
-                while (count > 0 && !ret) {
+                while (count >= sizeof(*u) && !ret) {
                        compat_ulong_t word;
                        ret = __get_user(word, u++);
                        if (ret)
diff --git a/arch/xtensa/include/asm/asm-offsets.h b/arch/xtensa/include/asm/asm-offsets.h
new file mode 100644
index 000000000000..d370ee36a182
--- /dev/null
+++ b/arch/xtensa/include/asm/asm-offsets.h
@@ -0,0 +1 @@
+#include <generated/asm-offsets.h>
diff --git a/drivers/accessibility/braille/braille_console.c b/drivers/accessibility/braille/braille_console.c
index d672cfe7ca59..cb423f5aef24 100644
--- a/drivers/accessibility/braille/braille_console.c
+++ b/drivers/accessibility/braille/braille_console.c
@@ -21,7 +21,6 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <linux/autoconf.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
diff --git a/drivers/hid/hid-lg.h b/drivers/hid/hid-lg.h
index 27ae750ca878..bf31592eaf79 100644
--- a/drivers/hid/hid-lg.h
+++ b/drivers/hid/hid-lg.h
@@ -1,8 +1,6 @@
 #ifndef __HID_LG_H
 #define __HID_LG_H
-#include <linux/autoconf.h>
 #ifdef CONFIG_LOGITECH_FF
 int lgff_init(struct hid_device *hdev);
 #else
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 675b7df632fc..27ca859e7453 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -63,7 +63,7 @@
 #ifndef __iwl_core_h__
 #define __iwl_core_h__
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 /************************
 * forward declarations *
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index 11003bba10d3..1a387e79f719 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -51,7 +51,6 @@
 #include <linux/dmi.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
-#include <linux/autoconf.h>
 #define COMPAL_DRIVER_VERSION "0.2.6"
diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
new file mode 100644
index 000000000000..04719551381b
--- /dev/null
+++ b/drivers/regulator/88pm8607.c
@@ -0,0 +1,685 @@
+/*
+ * Regulators driver for Marvell 88PM8607
+ *
+ * Copyright (C) 2009 Marvell International Ltd.
+ *      Haojian Zhuang <haojian.zhuang@marvell.com>
+ *
+ * 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.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/mfd/88pm8607.h>
+struct pm8607_regulator_info {
+        struct regulator_desc   desc;
+        struct pm8607_chip      *chip;
+        struct regulator_dev    *regulator;
+        int     min_uV;
+        int     max_uV;
+        int     step_uV;
+        int     vol_reg;
+        int     vol_shift;
+        int     vol_nbits;
+        int     update_reg;
+        int     update_bit;
+        int     enable_reg;
+        int     enable_bit;
+        int     slope_double;
+};
+static inline int check_range(struct pm8607_regulator_info *info,
+                                int min_uV, int max_uV)
+{
+        if (max_uV < info->min_uV || min_uV > info->max_uV || min_uV > max_uV)
+                return -EINVAL;
+        return 0;
+}
+static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+        uint8_t chip_id = info->chip->chip_id;
+        int ret = -EINVAL;
+        switch (info->desc.id) {
+        case PM8607_ID_BUCK1:
+                ret = (index < 0x1d) ? (index * 25000 + 800000) :
+                        ((index < 0x20) ? 1500000 :
+                        ((index < 0x40) ? ((index - 0x20) * 25000) :
+                        -EINVAL));
+                break;
+        case PM8607_ID_BUCK3:
+                ret = (index < 0x3d) ? (index * 25000) :
+                        ((index < 0x40) ? 1500000 : -EINVAL);
+                if (ret < 0)
+                        break;
+                if (info->slope_double)
+                        ret <<= 1;
+                break;
+        case PM8607_ID_LDO1:
+                ret = (index == 0) ? 1800000 :
+                        ((index == 1) ? 1200000 :
+                        ((index == 2) ? 2800000 : -EINVAL));
+                break;
+        case PM8607_ID_LDO5:
+                ret = (index == 0) ? 2900000 :
+                        ((index == 1) ? 3000000 :
+                        ((index == 2) ? 3100000 : 3300000));
+                break;
+        case PM8607_ID_LDO7:
+        case PM8607_ID_LDO8:
+                ret = (index < 3) ? (index * 50000 + 1800000) :
+                        ((index < 8) ? (index * 50000 + 2550000) :
+                         -EINVAL);
+                break;
+        case PM8607_ID_LDO12:
+                ret = (index < 2) ? (index * 100000 + 1800000) :
+                        ((index < 7) ? (index * 100000 + 2500000) :
+                        ((index == 7) ? 3300000 : 1200000));
+                break;
+        case PM8607_ID_LDO2:
+        case PM8607_ID_LDO3:
+        case PM8607_ID_LDO9:
+                switch (chip_id) {
+                case PM8607_CHIP_A0:
+                case PM8607_CHIP_A1:
+                        ret = (index < 3) ? (index * 50000 + 1800000) :
+                                ((index < 8) ? (index * 50000 + 2550000) :
+                                 -EINVAL);
+                        break;
+                case PM8607_CHIP_B0:
+                        ret = (index < 3) ? (index * 50000 + 1800000) :
+                                ((index < 7) ? (index * 50000 + 2550000) :
+                                3300000);
+                        break;
+                }
+                break;
+        case PM8607_ID_LDO4:
+                switch (chip_id) {
+                case PM8607_CHIP_A0:
+                case PM8607_CHIP_A1:
+                        ret = (index < 3) ? (index * 50000 + 1800000) :
+                                ((index < 8) ? (index * 50000 + 2550000) :
+                                 -EINVAL);
+                        break;
+                case PM8607_CHIP_B0:
+                        ret = (index < 3) ? (index * 50000 + 1800000) :
+                                ((index < 6) ? (index * 50000 + 2550000) :
+                                ((index == 6) ? 2900000 : 3300000));
+                        break;
+                }
+                break;
+        case PM8607_ID_LDO6:
+                switch (chip_id) {
+                case PM8607_CHIP_A0:
+                case PM8607_CHIP_A1:
+                        ret = (index < 3) ? (index * 50000 + 1800000) :
+                                ((index < 8) ? (index * 50000 + 2450000) :
+                                -EINVAL);
+                        break;
+                case PM8607_CHIP_B0:
+                        ret = (index < 2) ? (index * 50000 + 1800000) :
+                                ((index < 7) ? (index * 50000 + 2500000) :
+                                3300000);
+                        break;
+                }
+                break;
+        case PM8607_ID_LDO10:
+                switch (chip_id) {
+                case PM8607_CHIP_A0:
+                case PM8607_CHIP_A1:
+                        ret = (index < 3) ? (index * 50000 + 1800000) :
+                                ((index < 8) ? (index * 50000 + 2550000) :
+                                1200000);
+                        break;
+                case PM8607_CHIP_B0:
+                        ret = (index < 3) ? (index * 50000 + 1800000) :
+                                ((index < 7) ? (index * 50000 + 2550000) :
+                                ((index == 7) ? 3300000 : 1200000));
+                        break;
+                }
+                break;
+        case PM8607_ID_LDO14:
+                switch (chip_id) {
+                case PM8607_CHIP_A0:
+                case PM8607_CHIP_A1:
+                        ret = (index < 3) ? (index * 50000 + 1800000) :
+                                ((index < 8) ? (index * 50000 + 2550000) :
+                                 -EINVAL);
+                        break;
+                case PM8607_CHIP_B0:
+                        ret = (index < 2) ? (index * 50000 + 1800000) :
+                                ((index < 7) ? (index * 50000 + 2600000) :
+                                3300000);
+                        break;
+                }
+                break;
+        }
+        return ret;
+}
+static int choose_voltage(struct regulator_dev *rdev, int min_uV, int max_uV)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+        uint8_t chip_id = info->chip->chip_id;
+        int val = -ENOENT;
+        int ret;
+        switch (info->desc.id) {
+        case PM8607_ID_BUCK1:
+                if (min_uV >= 800000)           /* 800mV ~ 1500mV / 25mV */
+                        val = (min_uV - 775001) / 25000;
+                else {                          /* 25mV ~ 775mV / 25mV */
+                        val = (min_uV + 249999) / 25000;
+                        val += 32;
+                }
+                break;
+        case PM8607_ID_BUCK3:
+                if (info->slope_double)
+                        min_uV = min_uV >> 1;
+                val = (min_uV + 249999) / 25000; /* 0mV ~ 1500mV / 25mV */
+                break;
+        case PM8607_ID_LDO1:
+                if (min_uV > 1800000)
+                        val = 2;
+                else if (min_uV > 1200000)
+                        val = 0;
+                else
+                        val = 1;
+                break;
+        case PM8607_ID_LDO5:
+                if (min_uV > 3100000)
+                        val = 3;
+                else                            /* 2900mV ~ 3100mV / 100mV */
+                        val = (min_uV - 2800001) / 100000;
+                break;
+        case PM8607_ID_LDO7:
+        case PM8607_ID_LDO8:
+                if (min_uV < 2700000) { /* 1800mV ~ 1900mV / 50mV */
+                        if (min_uV <= 1800000)
+                                val = 0;        /* 1800mv */
+                        else if (min_uV <= 1900000)
+                                val = (min_uV - 1750001) / 50000;
+                        else
+                                val = 3;        /* 2700mV */
+                } else {                 /* 2700mV ~ 2900mV / 50mV */
+                        if (min_uV <= 2900000) {
+                                val = (min_uV - 2650001) / 50000;
+                                val += 3;
+                        } else
+                                val = -EINVAL;
+                }
+                break;
+        case PM8607_ID_LDO10:
+                if (min_uV > 2850000)
+                        val = 7;
+                else if (min_uV <= 1200000)
+                        val = 8;
+                else if (min_uV < 2700000)      /* 1800mV ~ 1900mV / 50mV */
+                        val = (min_uV - 1750001) / 50000;
+                else {                          /* 2700mV ~ 2850mV / 50mV */
+                        val = (min_uV - 2650001) / 50000;
+                        val += 3;
+                }
+                break;
+        case PM8607_ID_LDO12:
+                if (min_uV < 2700000) {         /* 1800mV ~ 1900mV / 100mV */
+                        if (min_uV <= 1200000)
+                                val = 8;        /* 1200mV */
+                        else if (min_uV <= 1800000)
+                                val = 0;        /* 1800mV */
+                        else if (min_uV <= 1900000)
+                                val = (min_uV - 1700001) / 100000;
+                        else
+                                val = 2;        /* 2700mV */
+                } else {                        /* 2700mV ~ 3100mV / 100mV */
+                        if (min_uV <= 3100000) {
+                                val = (min_uV - 2600001) / 100000;
+                                val += 2;
+                        } else if (min_uV <= 3300000)
+                                val = 7;
+                        else
+                                val = -EINVAL;
+                }
+                break;
+        case PM8607_ID_LDO2:
+        case PM8607_ID_LDO3:
+        case PM8607_ID_LDO9:
+                switch (chip_id) {
+                case PM8607_CHIP_A0:
+                case PM8607_CHIP_A1:
+                        if (min_uV < 2700000)   /* 1800mV ~ 1900mV / 50mV */
+                                if (min_uV <= 1800000)
+                                        val = 0;
+                                else if (min_uV <= 1900000)
+                                        val = (min_uV - 1750001) / 50000;
+                                else
+                                        val = 3;        /* 2700mV */
+                        else {                  /* 2700mV ~ 2900mV / 50mV */
+                                if (min_uV <= 2900000) {
+                                        val = (min_uV - 2650001) / 50000;
+                                        val += 3;
+                                } else
+                                        val = -EINVAL;
+                        }
+                        break;
+                case PM8607_CHIP_B0:
+                        if (min_uV < 2700000) { /* 1800mV ~ 1900mV / 50mV */
+                                if (min_uV <= 1800000)
+                                        val = 0;
+                                else if (min_uV <= 1900000)
+                                        val = (min_uV - 1750001) / 50000;
+                                else
+                                        val = 3;        /* 2700mV */
+                        } else {                 /* 2700mV ~ 2850mV / 50mV */
+                                if (min_uV <= 2850000) {
+                                        val = (min_uV - 2650001) / 50000;
+                                        val += 3;
+                                } else if (min_uV <= 3300000)
+                                        val = 7;
+                                else
+                                        val = -EINVAL;
+                        }
+                        break;
+                }
+                break;
+        case PM8607_ID_LDO4:
+                switch (chip_id) {
+                case PM8607_CHIP_A0:
+                case PM8607_CHIP_A1:
+                        if (min_uV < 2700000)   /* 1800mV ~ 1900mV / 50mV */
+                                if (min_uV <= 1800000)
+                                        val = 0;
+                                else if (min_uV <= 1900000)
+                                        val = (min_uV - 1750001) / 50000;
+                                else
+                                        val = 3;        /* 2700mV */
+                        else {                  /* 2700mV ~ 2900mV / 50mV */
+                                if (min_uV <= 2900000) {
+                                        val = (min_uV - 2650001) / 50000;
+                                        val += 3;
+                                } else
+                                        val = -EINVAL;
+                        }
+                        break;
+                case PM8607_CHIP_B0:
+                        if (min_uV < 2700000) { /* 1800mV ~ 1900mV / 50mV */
+                                if (min_uV <= 1800000)
+                                        val = 0;
+                                else if (min_uV <= 1900000)
+                                        val = (min_uV - 1750001) / 50000;
+                                else
+                                        val = 3;        /* 2700mV */
+                        } else {                 /* 2700mV ~ 2800mV / 50mV */
+                                if (min_uV <= 2850000) {
+                                        val = (min_uV - 2650001) / 50000;
+                                        val += 3;
+                                } else if (min_uV <= 2900000)
+                                        val = 6;
+                                else if (min_uV <= 3300000)
+                                        val = 7;
+                                else
+                                        val = -EINVAL;
+                        }
+                        break;
+                }
+                break;
+        case PM8607_ID_LDO6:
+                switch (chip_id) {
+                case PM8607_CHIP_A0:
+                case PM8607_CHIP_A1:
+                        if (min_uV < 2600000) { /* 1800mV ~ 1900mV / 50mV */
+                                if (min_uV <= 1800000)
+                                        val = 0;
+                                else if (min_uV <= 1900000)
+                                        val = (min_uV - 1750001) / 50000;
+                                else
+                                        val = 3;        /* 2600mV */
+                        } else {                /* 2600mV ~ 2800mV / 50mV */
+                                if (min_uV <= 2800000) {
+                                        val = (min_uV - 2550001) / 50000;
+                                        val += 3;
+                                } else
+                                        val = -EINVAL;
+                        }
+                        break;
+                case PM8607_CHIP_B0:
+                        if (min_uV < 2600000) { /* 1800mV ~ 1850mV / 50mV */
+                                if (min_uV <= 1800000)
+                                        val = 0;
+                                else if (min_uV <= 1850000)
+                                        val = (min_uV - 1750001) / 50000;
+                                else
+                                        val = 2;        /* 2600mV */
+                        } else {                /* 2600mV ~ 2800mV / 50mV */
+                                if (min_uV <= 2800000) {
+                                        val = (min_uV - 2550001) / 50000;
+                                        val += 2;
+                                } else if (min_uV <= 3300000)
+                                        val = 7;
+                                else
+                                        val = -EINVAL;
+                        }
+                        break;
+                }
+                break;
+        case PM8607_ID_LDO14:
+                switch (chip_id) {
+                case PM8607_CHIP_A0:
+                case PM8607_CHIP_A1:
+                        if (min_uV < 2700000) { /* 1800mV ~ 1900mV / 50mV */
+                                if (min_uV <= 1800000)
+                                        val = 0;
+                                else if (min_uV <= 1900000)
+                                        val = (min_uV - 1750001) / 50000;
+                                else
+                                        val = 3;        /* 2700mV */
+                        } else {                 /* 2700mV ~ 2900mV / 50mV */
+                                if (min_uV <= 2900000) {
+                                        val = (min_uV - 2650001) / 50000;
+                                        val += 3;
+                                } else
+                                        val = -EINVAL;
+                        }
+                        break;
+                case PM8607_CHIP_B0:
+                        if (min_uV < 2700000) { /* 1800mV ~ 1850mV / 50mV */
+                                if (min_uV <= 1800000)
+                                        val = 0;
+                                else if (min_uV <= 1850000)
+                                        val = (min_uV - 1750001) / 50000;
+                                else
+                                        val = 2;        /* 2700mV */
+                        } else {                 /* 2700mV ~ 2900mV / 50mV */
+                                if (min_uV <= 2900000) {
+                                        val = (min_uV - 2650001) / 50000;
+                                        val += 2;
+                                } else if (min_uV <= 3300000)
+                                        val = 7;
+                                else
+                                        val = -EINVAL;
+                        }
+                        break;
+                }
+                break;
+        }
+        if (val >= 0) {
+                ret = pm8607_list_voltage(rdev, val);
+                if (ret > max_uV) {
+                        pr_err("exceed voltage range (%d %d) uV",
+                                min_uV, max_uV);
+                        return -EINVAL;
+                }
+        } else
+                pr_err("invalid voltage range (%d %d) uV", min_uV, max_uV);
+        return val;
+}
+static int pm8607_set_voltage(struct regulator_dev *rdev,
+                              int min_uV, int max_uV)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+        struct pm8607_chip *chip = info->chip;
+        uint8_t val, mask;
+        int ret;
+        if (check_range(info, min_uV, max_uV)) {
+                pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);
+                return -EINVAL;
+        }
+        ret = choose_voltage(rdev, min_uV, max_uV);
+        if (ret < 0)
+                return -EINVAL;
+        val = (uint8_t)(ret << info->vol_shift);
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+        ret = pm8607_set_bits(chip, info->vol_reg, mask, val);
+        if (ret)
+                return ret;
+        switch (info->desc.id) {
+        case PM8607_ID_BUCK1:
+        case PM8607_ID_BUCK3:
+                ret = pm8607_set_bits(chip, info->update_reg,
+                                      1 << info->update_bit,
+                                      1 << info->update_bit);
+                break;
+        }
+        return ret;
+}
+static int pm8607_get_voltage(struct regulator_dev *rdev)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+        struct pm8607_chip *chip = info->chip;
+        uint8_t val, mask;
+        int ret;
+        ret = pm8607_reg_read(chip, info->vol_reg);
+        if (ret < 0)
+                return ret;
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+        val = ((unsigned char)ret & mask) >> info->vol_shift;
+        return pm8607_list_voltage(rdev, val);
+}
+static int pm8607_enable(struct regulator_dev *rdev)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+        struct pm8607_chip *chip = info->chip;
+        return pm8607_set_bits(chip, info->enable_reg,
+                               1 << info->enable_bit,
+                               1 << info->enable_bit);
+}
+static int pm8607_disable(struct regulator_dev *rdev)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+        struct pm8607_chip *chip = info->chip;
+        return pm8607_set_bits(chip, info->enable_reg,
+                               1 << info->enable_bit, 0);
+}
+static int pm8607_is_enabled(struct regulator_dev *rdev)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+        struct pm8607_chip *chip = info->chip;
+        int ret;
+        ret = pm8607_reg_read(chip, info->enable_reg);
+        if (ret < 0)
+                return ret;
+        return !!((unsigned char)ret & (1 << info->enable_bit));
+}
+static struct regulator_ops pm8607_regulator_ops = {
+        .set_voltage    = pm8607_set_voltage,
+        .get_voltage    = pm8607_get_voltage,
+        .enable         = pm8607_enable,
+        .disable        = pm8607_disable,
+        .is_enabled     = pm8607_is_enabled,
+};
+#define PM8607_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \
+{                                                                       \
+        .desc   = {                                                     \
+                .name   = "BUCK" #_id,                                  \
+                .ops    = &pm8607_regulator_ops,                        \
+                .type   = REGULATOR_VOLTAGE,                            \
+                .id     = PM8607_ID_BUCK##_id,                          \
+                .owner  = THIS_MODULE,                                  \
+        },                                                              \
+        .min_uV         = (min) * 1000,                                 \
+        .max_uV         = (max) * 1000,                                 \
+        .step_uV        = (step) * 1000,                                \
+        .vol_reg        = PM8607_##vreg,                                \
+        .vol_shift      = (0),                                          \
+        .vol_nbits      = (nbits),                                      \
+        .update_reg     = PM8607_##ureg,                                \
+        .update_bit     = (ubit),                                       \
+        .enable_reg     = PM8607_##ereg,                                \
+        .enable_bit     = (ebit),                                       \
+        .slope_double   = (0),                                          \
+}
+#define PM8607_LDO(_id, min, max, step, vreg, shift, nbits, ereg, ebit) \
+{                                                                       \
+        .desc   = {                                                     \
+                .name   = "LDO" #_id,                                   \
+                .ops    = &pm8607_regulator_ops,                        \
+                .type   = REGULATOR_VOLTAGE,                            \
+                .id     = PM8607_ID_LDO##_id,                           \
+                .owner  = THIS_MODULE,                                  \
+        },                                                              \
+        .min_uV         = (min) * 1000,                                 \
+        .max_uV         = (max) * 1000,                                 \
+        .step_uV        = (step) * 1000,                                \
+        .vol_reg        = PM8607_##vreg,                                \
+        .vol_shift      = (shift),                                      \
+        .vol_nbits      = (nbits),                                      \
+        .enable_reg     = PM8607_##ereg,                                \
+        .enable_bit     = (ebit),                                       \
+        .slope_double   = (0),                                          \
+}
+static struct pm8607_regulator_info pm8607_regulator_info[] = {
+        PM8607_DVC(1, 0, 1500, 25, BUCK1, 6, GO, 0, SUPPLIES_EN11, 0),
+        PM8607_DVC(3, 0, 1500, 25, BUCK3, 6, GO, 2, SUPPLIES_EN11, 2),
+        PM8607_LDO(1 , 1200, 2800, 0, LDO1 , 0, 2, SUPPLIES_EN11, 3),
+        PM8607_LDO(2 , 1800, 3300, 0, LDO2 , 0, 3, SUPPLIES_EN11, 4),
+        PM8607_LDO(3 , 1800, 3300, 0, LDO3 , 0, 3, SUPPLIES_EN11, 5),
+        PM8607_LDO(4 , 1800, 3300, 0, LDO4 , 0, 3, SUPPLIES_EN11, 6),
+        PM8607_LDO(5 , 2900, 3300, 0, LDO5 , 0, 2, SUPPLIES_EN11, 7),
+        PM8607_LDO(6 , 1800, 3300, 0, LDO6 , 0, 3, SUPPLIES_EN12, 0),
+        PM8607_LDO(7 , 1800, 2900, 0, LDO7 , 0, 3, SUPPLIES_EN12, 1),
+        PM8607_LDO(8 , 1800, 2900, 0, LDO8 , 0, 3, SUPPLIES_EN12, 2),
+        PM8607_LDO(9 , 1800, 3300, 0, LDO9 , 0, 3, SUPPLIES_EN12, 3),
+        PM8607_LDO(10, 1200, 3300, 0, LDO10, 0, 4, SUPPLIES_EN11, 4),
+        PM8607_LDO(12, 1200, 3300, 0, LDO12, 0, 4, SUPPLIES_EN11, 5),
+        PM8607_LDO(14, 1800, 3300, 0, LDO14, 0, 3, SUPPLIES_EN11, 6),
+};
+static inline struct pm8607_regulator_info *find_regulator_info(int id)
+{
+        struct pm8607_regulator_info *info;
+        int i;
+        for (i = 0; i < ARRAY_SIZE(pm8607_regulator_info); i++) {
+                info = &pm8607_regulator_info[i];
+                if (info->desc.id == id)
+                        return info;
+        }
+        return NULL;
+}
+static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
+{
+        struct pm8607_chip *chip = dev_get_drvdata(pdev->dev.parent);
+        struct pm8607_platform_data *pdata = chip->dev->platform_data;
+        struct pm8607_regulator_info *info = NULL;
+        info = find_regulator_info(pdev->id);
+        if (info == NULL) {
+                dev_err(&pdev->dev, "invalid regulator ID specified\n");
+                return -EINVAL;
+        }
+        info->chip = chip;
+        info->regulator = regulator_register(&info->desc, &pdev->dev,
+                                             pdata->regulator[pdev->id], info);
+        if (IS_ERR(info->regulator)) {
+                dev_err(&pdev->dev, "failed to register regulator %s\n",
+                        info->desc.name);
+                return PTR_ERR(info->regulator);
+        }
+        /* check DVC ramp slope double */
+        if (info->desc.id == PM8607_ID_BUCK3)
+                if (info->chip->buck3_double)
+                        info->slope_double = 1;
+        platform_set_drvdata(pdev, info);
+        return 0;
+}
+static int __devexit pm8607_regulator_remove(struct platform_device *pdev)
+{
+        struct pm8607_regulator_info *info = platform_get_drvdata(pdev);
+        regulator_unregister(info->regulator);
+        return 0;
+}
+#define PM8607_REGULATOR_DRIVER(_name)                          \
+{                                                               \
+        .driver         = {                                     \
+                .name   = "88pm8607-" #_name,                   \
+                .owner  = THIS_MODULE,                          \
+        },                                                      \
+        .probe          = pm8607_regulator_probe,               \
+        .remove         = __devexit_p(pm8607_regulator_remove), \
+}
+static struct platform_driver pm8607_regulator_driver[] = {
+        PM8607_REGULATOR_DRIVER(buck1),
+        PM8607_REGULATOR_DRIVER(buck2),
+        PM8607_REGULATOR_DRIVER(buck3),
+        PM8607_REGULATOR_DRIVER(ldo1),
+        PM8607_REGULATOR_DRIVER(ldo2),
+        PM8607_REGULATOR_DRIVER(ldo3),
+        PM8607_REGULATOR_DRIVER(ldo4),
+        PM8607_REGULATOR_DRIVER(ldo5),
+        PM8607_REGULATOR_DRIVER(ldo6),
+        PM8607_REGULATOR_DRIVER(ldo7),
+        PM8607_REGULATOR_DRIVER(ldo8),
+        PM8607_REGULATOR_DRIVER(ldo9),
+        PM8607_REGULATOR_DRIVER(ldo10),
+        PM8607_REGULATOR_DRIVER(ldo12),
+        PM8607_REGULATOR_DRIVER(ldo14),
+};
+static int __init pm8607_regulator_init(void)
+{
+        int i, count, ret;
+        count = ARRAY_SIZE(pm8607_regulator_driver);
+        for (i = 0; i < count; i++) {
+                ret = platform_driver_register(&pm8607_regulator_driver[i]);
+                if (ret != 0)
+                        pr_err("Failed to register regulator driver: %d\n",
+                                ret);
+        }
+        return 0;
+}
+subsys_initcall(pm8607_regulator_init);
+static void __exit pm8607_regulator_exit(void)
+{
+        int i, count;
+        count = ARRAY_SIZE(pm8607_regulator_driver);
+        for (i = 0; i < count; i++)
+                platform_driver_unregister(&pm8607_regulator_driver[i]);
+}
+module_exit(pm8607_regulator_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
+MODULE_DESCRIPTION("Regulator Driver for Marvell 88PM8607 PMIC");
+MODULE_ALIAS("platform:88pm8607-regulator");
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 7cfdd65bebb4..262f62eec837 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -69,6 +69,13 @@ config REGULATOR_MAX1586
          regulator via I2C bus. The provided regulator is suitable
          for PXA27x chips to control VCC_CORE and VCC_USIM voltages.
+config REGULATOR_MAX8660
+        tristate "Maxim 8660/8661 voltage regulator"
+        depends on I2C
+        help
+          This driver controls a Maxim 8660/8661 voltage output
+          regulator via I2C bus.
 config REGULATOR_TWL4030
        bool "TI TWL4030/TWL5030/TWL6030/TPS695x0 PMIC"
        depends on TWL4030_CORE
@@ -157,5 +164,11 @@ config REGULATOR_TPS6507X
          three step-down converters and two general-purpose LDO voltage regulators.
          It supports TI's software based Class-2 SmartReflex implementation.
+config REGULATOR_88PM8607
+        bool "Marvell 88PM8607 Power regulators"
+        depends on MFD_88PM8607=y
+        help
+          This driver supports 88PM8607 voltage regulator chips.
 endif
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 9ae3cc44e668..b3c806c79415 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
 obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
 obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o
 obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
+obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
@@ -20,10 +21,11 @@ obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
 obj-$(CONFIG_REGULATOR_DA903X)  += da903x.o
 obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
 obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
-obj-$(CONFIG_REGULATOR_MC13783) += mc13783.o
+obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
 obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
 obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o
 obj-$(CONFIG_REGULATOR_TPS6507X) += tps6507x-regulator.o
+obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index 49aeee823a25..b349db4504b7 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -81,7 +81,7 @@ static const u8 ab3100_reg_init_order[AB3100_NUM_REGULATORS+2] = {
 #define LDO_C_VOLTAGE 2650000
 #define LDO_D_VOLTAGE 2650000
-static const int const ldo_e_buck_typ_voltages[] = {
+static const int ldo_e_buck_typ_voltages[] = {
        1800000,
        1400000,
        1300000,
@@ -91,7 +91,7 @@ static const int const ldo_e_buck_typ_voltages[] = {
        900000,
 };
-static const int const ldo_f_typ_voltages[] = {
+static const int ldo_f_typ_voltages[] = {
        1800000,
        1400000,
        1300000,
@@ -102,21 +102,21 @@ static const int const ldo_f_typ_voltages[] = {
        2650000,
 };
-static const int const ldo_g_typ_voltages[] = {
+static const int ldo_g_typ_voltages[] = {
        2850000,
        2750000,
        1800000,
        1500000,
 };
-static const int const ldo_h_typ_voltages[] = {
+static const int ldo_h_typ_voltages[] = {
        2750000,
        1800000,
        1500000,
        1200000,
 };
-static const int const ldo_k_typ_voltages[] = {
+static const int ldo_k_typ_voltages[] = {
        2750000,
        1800000,
 };
@@ -241,24 +241,12 @@ static int ab3100_disable_regulator(struct regulator_dev *reg)
         * LDO D is a special regulator. When it is disabled, the entire
         * system is shut down. So this is handled specially.
         */
+        pr_info("Called ab3100_disable_regulator\n");
        if (abreg->regreg == AB3100_LDO_D) {
-                int i;
                dev_info(&reg->dev, "disabling LDO D - shut down system\n");
-                /*
-                 * Set regulators to default values, ignore any errors,
-                 * we're going DOWN
-                 */
-                for (i = 0; i < ARRAY_SIZE(ab3100_reg_init_order); i++) {
-                        (void) ab3100_set_register_interruptible(abreg->ab3100,
-                                        ab3100_reg_init_order[i],
-                                        abreg->plfdata->reg_initvals[i]);
-                }
                /* Setting LDO D to 0x00 cuts the power to the SoC */
                return ab3100_set_register_interruptible(abreg->ab3100,
                                                         AB3100_LDO_D, 0x00U);
        }
        /*
@@ -607,13 +595,6 @@ static int __init ab3100_regulators_probe(struct platform_device *pdev)
                }
        }
-        if (err) {
-                dev_err(&pdev->dev,
-                        "LDO D regulator initialization failed with error %d\n",
-                        err);
-                return err;
-        }
        /* Register the regulators */
        for (i = 0; i < AB3100_NUM_REGULATORS; i++) {
                struct ab3100_regulator *reg = &ab3100_regulators[i];
@@ -688,7 +669,7 @@ static __init int ab3100_regulators_init(void)
 static __exit void ab3100_regulators_exit(void)
 {
-        platform_driver_register(&ab3100_regulators_driver);
+        platform_driver_unregister(&ab3100_regulators_driver);
 }
 subsys_initcall(ab3100_regulators_init);
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index efe568deda12..686ef270ecf7 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -66,6 +66,16 @@ static unsigned int _regulator_get_mode(struct regulator_dev *rdev);
 static void _notifier_call_chain(struct regulator_dev *rdev,
                                  unsigned long event, void *data);
+static const char *rdev_get_name(struct regulator_dev *rdev)
+{
+        if (rdev->constraints && rdev->constraints->name)
+                return rdev->constraints->name;
+        else if (rdev->desc->name)
+                return rdev->desc->name;
+        else
+                return "";
+}
 /* gets the regulator for a given consumer device */
 static struct regulator *get_device_regulator(struct device *dev)
 {
@@ -96,12 +106,12 @@ static int regulator_check_voltage(struct regulator_dev *rdev,
        if (!rdev->constraints) {
                printk(KERN_ERR "%s: no constraints for %s\n", __func__,
-                       rdev->desc->name);
+                       rdev_get_name(rdev));
                return -ENODEV;
        }
        if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) {
                printk(KERN_ERR "%s: operation not allowed for %s\n",
-                       __func__, rdev->desc->name);
+                       __func__, rdev_get_name(rdev));
                return -EPERM;
        }
@@ -124,12 +134,12 @@ static int regulator_check_current_limit(struct regulator_dev *rdev,
        if (!rdev->constraints) {
                printk(KERN_ERR "%s: no constraints for %s\n", __func__,
-                       rdev->desc->name);
+                       rdev_get_name(rdev));
                return -ENODEV;
        }
        if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_CURRENT)) {
                printk(KERN_ERR "%s: operation not allowed for %s\n",
-                       __func__, rdev->desc->name);
+                       __func__, rdev_get_name(rdev));
                return -EPERM;
        }
@@ -159,17 +169,17 @@ static int regulator_check_mode(struct regulator_dev *rdev, int mode)
        if (!rdev->constraints) {
                printk(KERN_ERR "%s: no constraints for %s\n", __func__,
-                       rdev->desc->name);
+                       rdev_get_name(rdev));
                return -ENODEV;
        }
        if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_MODE)) {
                printk(KERN_ERR "%s: operation not allowed for %s\n",
-                       __func__, rdev->desc->name);
+                       __func__, rdev_get_name(rdev));
                return -EPERM;
        }
        if (!(rdev->constraints->valid_modes_mask & mode)) {
                printk(KERN_ERR "%s: invalid mode %x for %s\n",
-                       __func__, mode, rdev->desc->name);
+                       __func__, mode, rdev_get_name(rdev));
                return -EINVAL;
        }
        return 0;
@@ -180,12 +190,12 @@ static int regulator_check_drms(struct regulator_dev *rdev)
 {
        if (!rdev->constraints) {
                printk(KERN_ERR "%s: no constraints for %s\n", __func__,
-                       rdev->desc->name);
+                       rdev_get_name(rdev));
                return -ENODEV;
        }
        if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_DRMS)) {
                printk(KERN_ERR "%s: operation not allowed for %s\n",
-                       __func__, rdev->desc->name);
+                       __func__, rdev_get_name(rdev));
                return -EPERM;
        }
        return 0;
@@ -230,16 +240,8 @@ static ssize_t regulator_name_show(struct device *dev,
                             struct device_attribute *attr, char *buf)
 {
        struct regulator_dev *rdev = dev_get_drvdata(dev);
-        const char *name;
-        if (rdev->constraints && rdev->constraints->name)
+        return sprintf(buf, "%s\n", rdev_get_name(rdev));
-                name = rdev->constraints->name;
-        else if (rdev->desc->name)
-                name = rdev->desc->name;
-        else
-                name = "";
-        return sprintf(buf, "%s\n", name);
 }
 static ssize_t regulator_print_opmode(char *buf, int mode)
@@ -388,7 +390,7 @@ static ssize_t regulator_total_uA_show(struct device *dev,
        mutex_lock(&rdev->mutex);
        list_for_each_entry(regulator, &rdev->consumer_list, list)
-            uA += regulator->uA_load;
+                uA += regulator->uA_load;
        mutex_unlock(&rdev->mutex);
        return sprintf(buf, "%d\n", uA);
 }
@@ -563,7 +565,7 @@ static void drms_uA_update(struct regulator_dev *rdev)
        /* calc total requested load */
        list_for_each_entry(sibling, &rdev->consumer_list, list)
-            current_uA += sibling->uA_load;
+                current_uA += sibling->uA_load;
        /* now get the optimum mode for our new total regulator load */
        mode = rdev->desc->ops->get_optimum_mode(rdev, input_uV,
@@ -579,10 +581,29 @@ static int suspend_set_state(struct regulator_dev *rdev,
        struct regulator_state *rstate)
 {
        int ret = 0;
+        bool can_set_state;
-        /* enable & disable are mandatory for suspend control */
+        can_set_state = rdev->desc->ops->set_suspend_enable &&
-        if (!rdev->desc->ops->set_suspend_enable ||
+                rdev->desc->ops->set_suspend_disable;
-                !rdev->desc->ops->set_suspend_disable) {
+        /* If we have no suspend mode configration don't set anything;
+         * only warn if the driver actually makes the suspend mode
+         * configurable.
+         */
+        if (!rstate->enabled && !rstate->disabled) {
+                if (can_set_state)
+                        printk(KERN_WARNING "%s: No configuration for %s\n",
+                               __func__, rdev_get_name(rdev));
+                return 0;
+        }
+        if (rstate->enabled && rstate->disabled) {
+                printk(KERN_ERR "%s: invalid configuration for %s\n",
+                       __func__, rdev_get_name(rdev));
+                return -EINVAL;
+        }
+        if (!can_set_state) {
                printk(KERN_ERR "%s: no way to set suspend state\n",
                        __func__);
                return -EINVAL;
@@ -641,25 +662,43 @@ static void print_constraints(struct regulator_dev *rdev)
 {
        struct regulation_constraints *constraints = rdev->constraints;
        char buf[80];
-        int count;
+        int count = 0;
+        int ret;
-        if (rdev->desc->type == REGULATOR_VOLTAGE) {
+        if (constraints->min_uV && constraints->max_uV) {
                if (constraints->min_uV == constraints->max_uV)
-                        count = sprintf(buf, "%d mV ",
+                        count += sprintf(buf + count, "%d mV ",
-                                        constraints->min_uV / 1000);
+                                         constraints->min_uV / 1000);
                else
-                        count = sprintf(buf, "%d <--> %d mV ",
+                        count += sprintf(buf + count, "%d <--> %d mV ",
-                                        constraints->min_uV / 1000,
+                                         constraints->min_uV / 1000,
-                                        constraints->max_uV / 1000);
+                                         constraints->max_uV / 1000);
-        } else {
+        }
+        if (!constraints->min_uV ||
+            constraints->min_uV != constraints->max_uV) {
+                ret = _regulator_get_voltage(rdev);
+                if (ret > 0)
+                        count += sprintf(buf + count, "at %d mV ", ret / 1000);
+        }
+        if (constraints->min_uA && constraints->max_uA) {
                if (constraints->min_uA == constraints->max_uA)
-                        count = sprintf(buf, "%d mA ",
+                        count += sprintf(buf + count, "%d mA ",
-                                        constraints->min_uA / 1000);
+                                         constraints->min_uA / 1000);
                else
-                        count = sprintf(buf, "%d <--> %d mA ",
+                        count += sprintf(buf + count, "%d <--> %d mA ",
-                                        constraints->min_uA / 1000,
+                                         constraints->min_uA / 1000,
-                                        constraints->max_uA / 1000);
+                                         constraints->max_uA / 1000);
        }
+        if (!constraints->min_uA ||
+            constraints->min_uA != constraints->max_uA) {
+                ret = _regulator_get_current_limit(rdev);
+                if (ret > 0)
+                        count += sprintf(buf + count, "at %d uA ", ret / 1000);
+        }
        if (constraints->valid_modes_mask & REGULATOR_MODE_FAST)
                count += sprintf(buf + count, "fast ");
        if (constraints->valid_modes_mask & REGULATOR_MODE_NORMAL)
@@ -669,33 +708,30 @@ static void print_constraints(struct regulator_dev *rdev)
        if (constraints->valid_modes_mask & REGULATOR_MODE_STANDBY)
                count += sprintf(buf + count, "standby");
-        printk(KERN_INFO "regulator: %s: %s\n", rdev->desc->name, buf);
+        printk(KERN_INFO "regulator: %s: %s\n", rdev_get_name(rdev), buf);
 }
-/**
+static int machine_constraints_voltage(struct regulator_dev *rdev,
- * set_machine_constraints - sets regulator constraints
- * @rdev: regulator source
- * @constraints: constraints to apply
- *
- * Allows platform initialisation code to define and constrain
- * regulator circuits e.g. valid voltage/current ranges, etc.  NOTE:
- * Constraints *must* be set by platform code in order for some
- * regulator operations to proceed i.e. set_voltage, set_current_limit,
- * set_mode.
- */
-static int set_machine_constraints(struct regulator_dev *rdev,
        struct regulation_constraints *constraints)
 {
-        int ret = 0;
-        const char *name;
        struct regulator_ops *ops = rdev->desc->ops;
+        const char *name = rdev_get_name(rdev);
+        int ret;
-        if (constraints->name)
+        /* do we need to apply the constraint voltage */
-                name = constraints->name;
+        if (rdev->constraints->apply_uV &&
-        else if (rdev->desc->name)
+                rdev->constraints->min_uV == rdev->constraints->max_uV &&
-                name = rdev->desc->name;
+                ops->set_voltage) {
-        else
+                ret = ops->set_voltage(rdev,
-                name = "regulator";
+                        rdev->constraints->min_uV, rdev->constraints->max_uV);
+                        if (ret < 0) {
+                                printk(KERN_ERR "%s: failed to apply %duV constraint to %s\n",
+                                       __func__,
+                                       rdev->constraints->min_uV, name);
+                                rdev->constraints = NULL;
+                                return ret;
+                        }
+        }
        /* constrain machine-level voltage specs to fit
         * the actual range supported by this regulator.
@@ -719,14 +755,13 @@ static int set_machine_constraints(struct regulator_dev *rdev,
                /* voltage constraints are optional */
                if ((cmin == 0) && (cmax == 0))
-                        goto out;
+                        return 0;
                /* else require explicit machine-level constraints */
                if (cmin <= 0 || cmax <= 0 || cmax < cmin) {
                        pr_err("%s: %s '%s' voltage constraints\n",
                                       __func__, "invalid", name);
-                        ret = -EINVAL;
+                        return -EINVAL;
-                        goto out;
                }
                /* initial: [cmin..cmax] valid, [min_uV..max_uV] not */
@@ -748,8 +783,7 @@ static int set_machine_constraints(struct regulator_dev *rdev,
                if (max_uV < min_uV) {
                        pr_err("%s: %s '%s' voltage constraints\n",
                                       __func__, "unsupportable", name);
-                        ret = -EINVAL;
+                        return -EINVAL;
-                        goto out;
                }
                /* use regulator's subset of machine constraints */
@@ -767,22 +801,34 @@ static int set_machine_constraints(struct regulator_dev *rdev,
                }
        }
+        return 0;
+}
+/**
+ * set_machine_constraints - sets regulator constraints
+ * @rdev: regulator source
+ * @constraints: constraints to apply
+ *
+ * Allows platform initialisation code to define and constrain
+ * regulator circuits e.g. valid voltage/current ranges, etc.  NOTE:
+ * Constraints *must* be set by platform code in order for some
+ * regulator operations to proceed i.e. set_voltage, set_current_limit,
+ * set_mode.
+ */
+static int set_machine_constraints(struct regulator_dev *rdev,
+        struct regulation_constraints *constraints)
+{
+        int ret = 0;
+        const char *name;
+        struct regulator_ops *ops = rdev->desc->ops;
        rdev->constraints = constraints;
-        /* do we need to apply the constraint voltage */
+        name = rdev_get_name(rdev);
-        if (rdev->constraints->apply_uV &&
-                rdev->constraints->min_uV == rdev->constraints->max_uV &&
+        ret = machine_constraints_voltage(rdev, constraints);
-                ops->set_voltage) {
+        if (ret != 0)
-                ret = ops->set_voltage(rdev,
+                goto out;
-                        rdev->constraints->min_uV, rdev->constraints->max_uV);
-                        if (ret < 0) {
-                                printk(KERN_ERR "%s: failed to apply %duV constraint to %s\n",
-                                       __func__,
-                                       rdev->constraints->min_uV, name);
-                                rdev->constraints = NULL;
-                                goto out;
-                        }
-        }
        /* do we need to setup our suspend state */
        if (constraints->initial_state) {
@@ -903,7 +949,7 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
                                dev_name(&node->regulator->dev),
                                node->regulator->desc->name,
                                supply,
-                                dev_name(&rdev->dev), rdev->desc->name);
+                                dev_name(&rdev->dev), rdev_get_name(rdev));
                return -EBUSY;
        }
@@ -1212,7 +1258,7 @@ static int _regulator_enable(struct regulator_dev *rdev)
                ret = _regulator_enable(rdev->supply);
                if (ret < 0) {
                        printk(KERN_ERR "%s: failed to enable %s: %d\n",
-                               __func__, rdev->desc->name, ret);
+                               __func__, rdev_get_name(rdev), ret);
                        return ret;
                }
        }
@@ -1238,7 +1284,7 @@ static int _regulator_enable(struct regulator_dev *rdev)
                        }
                } else if (ret < 0) {
                        printk(KERN_ERR "%s: is_enabled() failed for %s: %d\n",
-                               __func__, rdev->desc->name, ret);
+                               __func__, rdev_get_name(rdev), ret);
                        return ret;
                }
                /* Fallthrough on positive return values - already enabled */
@@ -1279,7 +1325,7 @@ static int _regulator_disable(struct regulator_dev *rdev)
        if (WARN(rdev->use_count <= 0,
                        "unbalanced disables for %s\n",
-                        rdev->desc->name))
+                        rdev_get_name(rdev)))
                return -EIO;
        /* are we the last user and permitted to disable ? */
@@ -1292,7 +1338,7 @@ static int _regulator_disable(struct regulator_dev *rdev)
                        ret = rdev->desc->ops->disable(rdev);
                        if (ret < 0) {
                                printk(KERN_ERR "%s: failed to disable %s\n",
-                                       __func__, rdev->desc->name);
+                                       __func__, rdev_get_name(rdev));
                                return ret;
                        }
                }
@@ -1349,7 +1395,7 @@ static int _regulator_force_disable(struct regulator_dev *rdev)
                ret = rdev->desc->ops->disable(rdev);
                if (ret < 0) {
                        printk(KERN_ERR "%s: failed to force disable %s\n",
-                               __func__, rdev->desc->name);
+                               __func__, rdev_get_name(rdev));
                        return ret;
                }
                /* notify other consumers that power has been forced off */
@@ -1766,7 +1812,7 @@ int regulator_set_optimum_mode(struct regulator *regulator, int uA_load)
        output_uV = rdev->desc->ops->get_voltage(rdev);
        if (output_uV <= 0) {
                printk(KERN_ERR "%s: invalid output voltage found for %s\n",
-                        __func__, rdev->desc->name);
+                        __func__, rdev_get_name(rdev));
                goto out;
        }
@@ -1777,13 +1823,13 @@ int regulator_set_optimum_mode(struct regulator *regulator, int uA_load)
                input_uV = rdev->constraints->input_uV;
        if (input_uV <= 0) {
                printk(KERN_ERR "%s: invalid input voltage found for %s\n",
-                        __func__, rdev->desc->name);
+                        __func__, rdev_get_name(rdev));
                goto out;
        }
        /* calc total requested load for this regulator */
        list_for_each_entry(consumer, &rdev->consumer_list, list)
-            total_uA_load += consumer->uA_load;
+                total_uA_load += consumer->uA_load;
        mode = rdev->desc->ops->get_optimum_mode(rdev,
                                                 input_uV, output_uV,
@@ -1791,7 +1837,7 @@ int regulator_set_optimum_mode(struct regulator *regulator, int uA_load)
        ret = regulator_check_mode(rdev, mode);
        if (ret < 0) {
                printk(KERN_ERR "%s: failed to get optimum mode for %s @"
-                        " %d uA %d -> %d uV\n", __func__, rdev->desc->name,
+                        " %d uA %d -> %d uV\n", __func__, rdev_get_name(rdev),
                        total_uA_load, input_uV, output_uV);
                goto out;
        }
@@ -1799,7 +1845,7 @@ int regulator_set_optimum_mode(struct regulator *regulator, int uA_load)
        ret = rdev->desc->ops->set_mode(rdev, mode);
        if (ret < 0) {
                printk(KERN_ERR "%s: failed to set optimum mode %x for %s\n",
-                        __func__, mode, rdev->desc->name);
+                        __func__, mode, rdev_get_name(rdev));
                goto out;
        }
        ret = mode;
@@ -1852,9 +1898,9 @@ static void _notifier_call_chain(struct regulator_dev *rdev,
        /* now notify regulator we supply */
        list_for_each_entry(_rdev, &rdev->supply_list, slist) {
-          mutex_lock(&_rdev->mutex);
+                mutex_lock(&_rdev->mutex);
-          _notifier_call_chain(_rdev, event, data);
+                _notifier_call_chain(_rdev, event, data);
-          mutex_unlock(&_rdev->mutex);
+                mutex_unlock(&_rdev->mutex);
        }
 }
@@ -1885,9 +1931,9 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
                consumers[i].consumer = regulator_get(dev,
                                                      consumers[i].supply);
                if (IS_ERR(consumers[i].consumer)) {
-                        dev_err(dev, "Failed to get supply '%s'\n",
-                                consumers[i].supply);
                        ret = PTR_ERR(consumers[i].consumer);
+                        dev_err(dev, "Failed to get supply '%s': %d\n",
+                                consumers[i].supply, ret);
                        consumers[i].consumer = NULL;
                        goto err;
                }
@@ -1930,8 +1976,8 @@ int regulator_bulk_enable(int num_consumers,
        return 0;
 err:
-        printk(KERN_ERR "Failed to enable %s\n", consumers[i].supply);
+        printk(KERN_ERR "Failed to enable %s: %d\n", consumers[i].supply, ret);
-        for (i = 0; i < num_consumers; i++)
+        for (--i; i >= 0; --i)
                regulator_disable(consumers[i].consumer);
        return ret;
@@ -1965,8 +2011,9 @@ int regulator_bulk_disable(int num_consumers,
        return 0;
 err:
-        printk(KERN_ERR "Failed to disable %s\n", consumers[i].supply);
+        printk(KERN_ERR "Failed to disable %s: %d\n", consumers[i].supply,
-        for (i = 0; i < num_consumers; i++)
+               ret);
+        for (--i; i >= 0; --i)
                regulator_enable(consumers[i].consumer);
        return ret;
@@ -2316,7 +2363,7 @@ int regulator_suspend_prepare(suspend_state_t state)
                if (ret < 0) {
                        printk(KERN_ERR "%s: failed to prepare %s\n",
-                                __func__, rdev->desc->name);
+                                __func__, rdev_get_name(rdev));
                        goto out;
                }
        }
@@ -2429,12 +2476,7 @@ static int __init regulator_init_complete(void)
                ops = rdev->desc->ops;
                c = rdev->constraints;
-                if (c && c->name)
+                name = rdev_get_name(rdev);
-                        name = c->name;
-                else if (rdev->desc->name)
-                        name = rdev->desc->name;
-                else
-                        name = "regulator";
                if (!ops->disable || (c && c->always_on))
                        continue;
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index aa224d936e0d..f8c4661a7a81 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -331,7 +331,7 @@ static int da9034_get_ldo12_voltage(struct regulator_dev *rdev)
 static int da9034_list_ldo12_voltage(struct regulator_dev *rdev,
                                     unsigned selector)
 {
-        if (selector > ARRAY_SIZE(da9034_ldo12_data))
+        if (selector >= ARRAY_SIZE(da9034_ldo12_data))
                return -EINVAL;
        return da9034_ldo12_data[selector] * 1000;
 }
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
index 7803a320543b..76d08c282f9c 100644
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@ -446,8 +446,8 @@ static int setup_regulators(struct lp3971 *lp3971,
                lp3971->rdev[i] = regulator_register(&regulators[id],
                        lp3971->dev, pdata->regulators[i].initdata, lp3971);
-                err = IS_ERR(lp3971->rdev[i]);
+                if (IS_ERR(lp3971->rdev[i])) {
-                if (err) {
+                        err = PTR_ERR(lp3971->rdev[i]);
                        dev_err(lp3971->dev, "regulator init failed: %d\n",
                                err);
                        goto error;
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
new file mode 100644
index 000000000000..acc2fb7b6087
--- /dev/null
+++ b/drivers/regulator/max8660.c
@@ -0,0 +1,510 @@
+/*
+ * max8660.c  --  Voltage regulation for the Maxim 8660/8661
+ *
+ * based on max1586.c and wm8400-regulator.c
+ *
+ * Copyright (C) 2009 Wolfram Sang, Pengutronix e.K.
+ *
+ * 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; version 2 of the License.
+ *
+ * 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
+ *
+ * Some info:
+ *
+ * Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX8660-MAX8661.pdf
+ *
+ * This chip is a bit nasty because it is a write-only device. Thus, the driver
+ * uses shadow registers to keep track of its values. The main problem appears
+ * to be the initialization: When Linux boots up, we cannot know if the chip is
+ * in the default state or not, so we would have to pass such information in
+ * platform_data. As this adds a bit of complexity to the driver, this is left
+ * out for now until it is really needed.
+ *
+ * [A|S|M]DTV1 registers are currently not used, but [A|S|M]DTV2.
+ *
+ * If the driver is feature complete, it might be worth to check if one set of
+ * functions for V3-V7 is sufficient. For maximum flexibility during
+ * development, they are separated for now.
+ *
+ */
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/max8660.h>
+#define MAX8660_DCDC_MIN_UV      725000
+#define MAX8660_DCDC_MAX_UV     1800000
+#define MAX8660_DCDC_STEP         25000
+#define MAX8660_DCDC_MAX_SEL    0x2b
+#define MAX8660_LDO5_MIN_UV     1700000
+#define MAX8660_LDO5_MAX_UV     2000000
+#define MAX8660_LDO5_STEP         25000
+#define MAX8660_LDO5_MAX_SEL    0x0c
+#define MAX8660_LDO67_MIN_UV    1800000
+#define MAX8660_LDO67_MAX_UV    3300000
+#define MAX8660_LDO67_STEP       100000
+#define MAX8660_LDO67_MAX_SEL   0x0f
+enum {
+        MAX8660_OVER1,
+        MAX8660_OVER2,
+        MAX8660_VCC1,
+        MAX8660_ADTV1,
+        MAX8660_ADTV2,
+        MAX8660_SDTV1,
+        MAX8660_SDTV2,
+        MAX8660_MDTV1,
+        MAX8660_MDTV2,
+        MAX8660_L12VCR,
+        MAX8660_FPWM,
+        MAX8660_N_REGS, /* not a real register */
+};
+struct max8660 {
+        struct i2c_client *client;
+        u8 shadow_regs[MAX8660_N_REGS];         /* as chip is write only */
+        struct regulator_dev *rdev[];
+};
+static int max8660_write(struct max8660 *max8660, u8 reg, u8 mask, u8 val)
+{
+        static const u8 max8660_addresses[MAX8660_N_REGS] =
+          { 0x10, 0x12, 0x20, 0x23, 0x24, 0x29, 0x2a, 0x32, 0x33, 0x39, 0x80 };
+        int ret;
+        u8 reg_val = (max8660->shadow_regs[reg] & mask) | val;
+        dev_vdbg(&max8660->client->dev, "Writing reg %02x with %02x\n",
+                        max8660_addresses[reg], reg_val);
+        ret = i2c_smbus_write_byte_data(max8660->client,
+                        max8660_addresses[reg], reg_val);
+        if (ret == 0)
+                max8660->shadow_regs[reg] = reg_val;
+        return ret;
+}
+/*
+ * DCDC functions
+ */
+static int max8660_dcdc_is_enabled(struct regulator_dev *rdev)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 val = max8660->shadow_regs[MAX8660_OVER1];
+        u8 mask = (rdev_get_id(rdev) == MAX8660_V3) ? 1 : 4;
+        return !!(val & mask);
+}
+static int max8660_dcdc_enable(struct regulator_dev *rdev)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 bit = (rdev_get_id(rdev) == MAX8660_V3) ? 1 : 4;
+        return max8660_write(max8660, MAX8660_OVER1, 0xff, bit);
+}
+static int max8660_dcdc_disable(struct regulator_dev *rdev)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 mask = (rdev_get_id(rdev) == MAX8660_V3) ? ~1 : ~4;
+        return max8660_write(max8660, MAX8660_OVER1, mask, 0);
+}
+static int max8660_dcdc_list(struct regulator_dev *rdev, unsigned selector)
+{
+        if (selector > MAX8660_DCDC_MAX_SEL)
+                return -EINVAL;
+        return MAX8660_DCDC_MIN_UV + selector * MAX8660_DCDC_STEP;
+}
+static int max8660_dcdc_get(struct regulator_dev *rdev)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 reg = (rdev_get_id(rdev) == MAX8660_V3) ? MAX8660_ADTV2 : MAX8660_SDTV2;
+        u8 selector = max8660->shadow_regs[reg];
+        return MAX8660_DCDC_MIN_UV + selector * MAX8660_DCDC_STEP;
+}
+static int max8660_dcdc_set(struct regulator_dev *rdev, int min_uV, int max_uV)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 reg, selector, bits;
+        int ret;
+        if (min_uV < MAX8660_DCDC_MIN_UV || min_uV > MAX8660_DCDC_MAX_UV)
+                return -EINVAL;
+        if (max_uV < MAX8660_DCDC_MIN_UV || max_uV > MAX8660_DCDC_MAX_UV)
+                return -EINVAL;
+        selector = (min_uV - (MAX8660_DCDC_MIN_UV - MAX8660_DCDC_STEP + 1))
+                        / MAX8660_DCDC_STEP;
+        ret = max8660_dcdc_list(rdev, selector);
+        if (ret < 0 || ret > max_uV)
+                return -EINVAL;
+        reg = (rdev_get_id(rdev) == MAX8660_V3) ? MAX8660_ADTV2 : MAX8660_SDTV2;
+        ret = max8660_write(max8660, reg, 0, selector);
+        if (ret)
+                return ret;
+        /* Select target voltage register and activate regulation */
+        bits = (rdev_get_id(rdev) == MAX8660_V3) ? 0x03 : 0x30;
+        return max8660_write(max8660, MAX8660_VCC1, 0xff, bits);
+}
+static struct regulator_ops max8660_dcdc_ops = {
+        .is_enabled = max8660_dcdc_is_enabled,
+        .list_voltage = max8660_dcdc_list,
+        .set_voltage = max8660_dcdc_set,
+        .get_voltage = max8660_dcdc_get,
+};
+/*
+ * LDO5 functions
+ */
+static int max8660_ldo5_list(struct regulator_dev *rdev, unsigned selector)
+{
+        if (selector > MAX8660_LDO5_MAX_SEL)
+                return -EINVAL;
+        return MAX8660_LDO5_MIN_UV + selector * MAX8660_LDO5_STEP;
+}
+static int max8660_ldo5_get(struct regulator_dev *rdev)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 selector = max8660->shadow_regs[MAX8660_MDTV2];
+        return MAX8660_LDO5_MIN_UV + selector * MAX8660_LDO5_STEP;
+}
+static int max8660_ldo5_set(struct regulator_dev *rdev, int min_uV, int max_uV)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 selector;
+        int ret;
+        if (min_uV < MAX8660_LDO5_MIN_UV || min_uV > MAX8660_LDO5_MAX_UV)
+                return -EINVAL;
+        if (max_uV < MAX8660_LDO5_MIN_UV || max_uV > MAX8660_LDO5_MAX_UV)
+                return -EINVAL;
+        selector = (min_uV - (MAX8660_LDO5_MIN_UV - MAX8660_LDO5_STEP + 1))
+                        / MAX8660_LDO5_STEP;
+        ret = max8660_ldo5_list(rdev, selector);
+        if (ret < 0 || ret > max_uV)
+                return -EINVAL;
+        ret = max8660_write(max8660, MAX8660_MDTV2, 0, selector);
+        if (ret)
+                return ret;
+        /* Select target voltage register and activate regulation */
+        return max8660_write(max8660, MAX8660_VCC1, 0xff, 0xc0);
+}
+static struct regulator_ops max8660_ldo5_ops = {
+        .list_voltage = max8660_ldo5_list,
+        .set_voltage = max8660_ldo5_set,
+        .get_voltage = max8660_ldo5_get,
+};
+/*
+ * LDO67 functions
+ */
+static int max8660_ldo67_is_enabled(struct regulator_dev *rdev)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 val = max8660->shadow_regs[MAX8660_OVER2];
+        u8 mask = (rdev_get_id(rdev) == MAX8660_V6) ? 2 : 4;
+        return !!(val & mask);
+}
+static int max8660_ldo67_enable(struct regulator_dev *rdev)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 bit = (rdev_get_id(rdev) == MAX8660_V6) ? 2 : 4;
+        return max8660_write(max8660, MAX8660_OVER2, 0xff, bit);
+}
+static int max8660_ldo67_disable(struct regulator_dev *rdev)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 mask = (rdev_get_id(rdev) == MAX8660_V6) ? ~2 : ~4;
+        return max8660_write(max8660, MAX8660_OVER2, mask, 0);
+}
+static int max8660_ldo67_list(struct regulator_dev *rdev, unsigned selector)
+{
+        if (selector > MAX8660_LDO67_MAX_SEL)
+                return -EINVAL;
+        return MAX8660_LDO67_MIN_UV + selector * MAX8660_LDO67_STEP;
+}
+static int max8660_ldo67_get(struct regulator_dev *rdev)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 shift = (rdev_get_id(rdev) == MAX8660_V6) ? 0 : 4;
+        u8 selector = (max8660->shadow_regs[MAX8660_L12VCR] >> shift) & 0xf;
+        return MAX8660_LDO67_MIN_UV + selector * MAX8660_LDO67_STEP;
+}
+static int max8660_ldo67_set(struct regulator_dev *rdev, int min_uV, int max_uV)
+{
+        struct max8660 *max8660 = rdev_get_drvdata(rdev);
+        u8 selector;
+        int ret;
+        if (min_uV < MAX8660_LDO67_MIN_UV || min_uV > MAX8660_LDO67_MAX_UV)
+                return -EINVAL;
+        if (max_uV < MAX8660_LDO67_MIN_UV || max_uV > MAX8660_LDO67_MAX_UV)
+                return -EINVAL;
+        selector = (min_uV - (MAX8660_LDO67_MIN_UV - MAX8660_LDO67_STEP + 1))
+                        / MAX8660_LDO67_STEP;
+        ret = max8660_ldo67_list(rdev, selector);
+        if (ret < 0 || ret > max_uV)
+                return -EINVAL;
+        if (rdev_get_id(rdev) == MAX8660_V6)
+                return max8660_write(max8660, MAX8660_L12VCR, 0xf0, selector);
+        else
+                return max8660_write(max8660, MAX8660_L12VCR, 0x0f, selector << 4);
+}
+static struct regulator_ops max8660_ldo67_ops = {
+        .is_enabled = max8660_ldo67_is_enabled,
+        .enable = max8660_ldo67_enable,
+        .disable = max8660_ldo67_disable,
+        .list_voltage = max8660_ldo67_list,
+        .get_voltage = max8660_ldo67_get,
+        .set_voltage = max8660_ldo67_set,
+};
+static struct regulator_desc max8660_reg[] = {
+        {
+                .name = "V3(DCDC)",
+                .id = MAX8660_V3,
+                .ops = &max8660_dcdc_ops,
+                .type = REGULATOR_VOLTAGE,
+                .n_voltages = MAX8660_DCDC_MAX_SEL + 1,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "V4(DCDC)",
+                .id = MAX8660_V4,
+                .ops = &max8660_dcdc_ops,
+                .type = REGULATOR_VOLTAGE,
+                .n_voltages = MAX8660_DCDC_MAX_SEL + 1,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "V5(LDO)",
+                .id = MAX8660_V5,
+                .ops = &max8660_ldo5_ops,
+                .type = REGULATOR_VOLTAGE,
+                .n_voltages = MAX8660_LDO5_MAX_SEL + 1,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "V6(LDO)",
+                .id = MAX8660_V6,
+                .ops = &max8660_ldo67_ops,
+                .type = REGULATOR_VOLTAGE,
+                .n_voltages = MAX8660_LDO67_MAX_SEL + 1,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "V7(LDO)",
+                .id = MAX8660_V7,
+                .ops = &max8660_ldo67_ops,
+                .type = REGULATOR_VOLTAGE,
+                .n_voltages = MAX8660_LDO67_MAX_SEL + 1,
+                .owner = THIS_MODULE,
+        },
+};
+static int max8660_probe(struct i2c_client *client,
+                              const struct i2c_device_id *i2c_id)
+{
+        struct regulator_dev **rdev;
+        struct max8660_platform_data *pdata = client->dev.platform_data;
+        struct max8660 *max8660;
+        int boot_on, i, id, ret = -EINVAL;
+        if (pdata->num_subdevs > MAX8660_V_END) {
+                dev_err(&client->dev, "Too much regulators found!\n");
+                goto out;
+        }
+        max8660 = kzalloc(sizeof(struct max8660) +
+                        sizeof(struct regulator_dev *) * MAX8660_V_END,
+                        GFP_KERNEL);
+        if (!max8660) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        max8660->client = client;
+        rdev = max8660->rdev;
+        if (pdata->en34_is_high) {
+                /* Simulate always on */
+                max8660->shadow_regs[MAX8660_OVER1] = 5;
+        } else {
+                /* Otherwise devices can be toggled via software */
+                max8660_dcdc_ops.enable = max8660_dcdc_enable;
+                max8660_dcdc_ops.disable = max8660_dcdc_disable;
+        }
+        /*
+         * First, set up shadow registers to prevent glitches. As some
+         * registers are shared between regulators, everything must be properly
+         * set up for all regulators in advance.
+         */
+        max8660->shadow_regs[MAX8660_ADTV1] =
+                max8660->shadow_regs[MAX8660_ADTV2] =
+                max8660->shadow_regs[MAX8660_SDTV1] =
+                max8660->shadow_regs[MAX8660_SDTV2] = 0x1b;
+        max8660->shadow_regs[MAX8660_MDTV1] =
+                max8660->shadow_regs[MAX8660_MDTV2] = 0x04;
+        for (i = 0; i < pdata->num_subdevs; i++) {
+                if (!pdata->subdevs[i].platform_data)
+                        goto err_free;
+                boot_on = pdata->subdevs[i].platform_data->constraints.boot_on;
+                switch (pdata->subdevs[i].id) {
+                case MAX8660_V3:
+                        if (boot_on)
+                                max8660->shadow_regs[MAX8660_OVER1] |= 1;
+                        break;
+                case MAX8660_V4:
+                        if (boot_on)
+                                max8660->shadow_regs[MAX8660_OVER1] |= 4;
+                        break;
+                case MAX8660_V5:
+                        break;
+                case MAX8660_V6:
+                        if (boot_on)
+                                max8660->shadow_regs[MAX8660_OVER2] |= 2;
+                        break;
+                case MAX8660_V7:
+                        if (!strcmp(i2c_id->name, "max8661")) {
+                                dev_err(&client->dev, "Regulator not on this chip!\n");
+                                goto err_free;
+                        }
+                        if (boot_on)
+                                max8660->shadow_regs[MAX8660_OVER2] |= 4;
+                        break;
+                default:
+                        dev_err(&client->dev, "invalid regulator %s\n",
+                                 pdata->subdevs[i].name);
+                        goto err_free;
+                }
+        }
+        /* Finally register devices */
+        for (i = 0; i < pdata->num_subdevs; i++) {
+                id = pdata->subdevs[i].id;
+                rdev[i] = regulator_register(&max8660_reg[id], &client->dev,
+                                             pdata->subdevs[i].platform_data,
+                                             max8660);
+                if (IS_ERR(rdev[i])) {
+                        ret = PTR_ERR(rdev[i]);
+                        dev_err(&client->dev, "failed to register %s\n",
+                                max8660_reg[id].name);
+                        goto err_unregister;
+                }
+        }
+        i2c_set_clientdata(client, rdev);
+        dev_info(&client->dev, "Maxim 8660/8661 regulator driver loaded\n");
+        return 0;
+err_unregister:
+        while (--i >= 0)
+                regulator_unregister(rdev[i]);
+err_free:
+        kfree(max8660);
+out:
+        return ret;
+}
+static int max8660_remove(struct i2c_client *client)
+{
+        struct regulator_dev **rdev = i2c_get_clientdata(client);
+        int i;
+        for (i = 0; i < MAX8660_V_END; i++)
+                if (rdev[i])
+                        regulator_unregister(rdev[i]);
+        kfree(rdev);
+        i2c_set_clientdata(client, NULL);
+        return 0;
+}
+static const struct i2c_device_id max8660_id[] = {
+        { "max8660", 0 },
+        { "max8661", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, max8660_id);
+static struct i2c_driver max8660_driver = {
+        .probe = max8660_probe,
+        .remove = max8660_remove,
+        .driver         = {
+                .name   = "max8660",
+        },
+        .id_table       = max8660_id,
+};
+static int __init max8660_init(void)
+{
+        return i2c_add_driver(&max8660_driver);
+}
+subsys_initcall(max8660_init);
+static void __exit max8660_exit(void)
+{
+        i2c_del_driver(&max8660_driver);
+}
+module_exit(max8660_exit);
+/* Module information */
+MODULE_DESCRIPTION("MAXIM 8660/8661 voltage regulator driver");
+MODULE_AUTHOR("Wolfram Sang");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c
new file mode 100644
index 000000000000..39c495300045
--- /dev/null
+++ b/drivers/regulator/mc13783-regulator.c
@@ -0,0 +1,245 @@
+/*
+ * Regulator Driver for Freescale MC13783 PMIC
+ *
+ * Copyright (C) 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
+ *
+ * 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.
+ */
+#include <linux/mfd/mc13783.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/driver.h>
+#include <linux/platform_device.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#define MC13783_REG_SWITCHERS4                  28
+#define MC13783_REG_SWITCHERS4_PLLEN                    (1 << 18)
+#define MC13783_REG_SWITCHERS5                  29
+#define MC13783_REG_SWITCHERS5_SW3EN                    (1 << 20)
+#define MC13783_REG_REGULATORMODE0              32
+#define MC13783_REG_REGULATORMODE0_VAUDIOEN             (1 << 0)
+#define MC13783_REG_REGULATORMODE0_VIOHIEN              (1 << 3)
+#define MC13783_REG_REGULATORMODE0_VIOLOEN              (1 << 6)
+#define MC13783_REG_REGULATORMODE0_VDIGEN               (1 << 9)
+#define MC13783_REG_REGULATORMODE0_VGENEN               (1 << 12)
+#define MC13783_REG_REGULATORMODE0_VRFDIGEN             (1 << 15)
+#define MC13783_REG_REGULATORMODE0_VRFREFEN             (1 << 18)
+#define MC13783_REG_REGULATORMODE0_VRFCPEN              (1 << 21)
+#define MC13783_REG_REGULATORMODE1              33
+#define MC13783_REG_REGULATORMODE1_VSIMEN               (1 << 0)
+#define MC13783_REG_REGULATORMODE1_VESIMEN              (1 << 3)
+#define MC13783_REG_REGULATORMODE1_VCAMEN               (1 << 6)
+#define MC13783_REG_REGULATORMODE1_VRFBGEN              (1 << 9)
+#define MC13783_REG_REGULATORMODE1_VVIBEN               (1 << 11)
+#define MC13783_REG_REGULATORMODE1_VRF1EN               (1 << 12)
+#define MC13783_REG_REGULATORMODE1_VRF2EN               (1 << 15)
+#define MC13783_REG_REGULATORMODE1_VMMC1EN              (1 << 18)
+#define MC13783_REG_REGULATORMODE1_VMMC2EN              (1 << 21)
+#define MC13783_REG_POWERMISC                   34
+#define MC13783_REG_POWERMISC_GPO1EN                    (1 << 6)
+#define MC13783_REG_POWERMISC_GPO2EN                    (1 << 8)
+#define MC13783_REG_POWERMISC_GPO3EN                    (1 << 10)
+#define MC13783_REG_POWERMISC_GPO4EN                    (1 << 12)
+struct mc13783_regulator {
+        struct regulator_desc desc;
+        int reg;
+        int enable_bit;
+};
+static struct regulator_ops mc13783_regulator_ops;
+#define MC13783_DEFINE(prefix, _name, _reg)                             \
+        [MC13783_ ## prefix ## _ ## _name] = {                          \
+                .desc = {                                               \
+                        .name = #prefix "_" #_name,                     \
+                        .ops = &mc13783_regulator_ops,                  \
+                        .type = REGULATOR_VOLTAGE,                      \
+                        .id = MC13783_ ## prefix ## _ ## _name,         \
+                        .owner = THIS_MODULE,                           \
+                },                                                      \
+                .reg = MC13783_REG_ ## _reg,                            \
+                .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \
+        }
+#define MC13783_DEFINE_SW(_name, _reg) MC13783_DEFINE(SW, _name, _reg)
+#define MC13783_DEFINE_REGU(_name, _reg) MC13783_DEFINE(REGU, _name, _reg)
+static struct mc13783_regulator mc13783_regulators[] = {
+        MC13783_DEFINE_SW(SW3, SWITCHERS5),
+        MC13783_DEFINE_SW(PLL, SWITCHERS4),
+        MC13783_DEFINE_REGU(VAUDIO, REGULATORMODE0),
+        MC13783_DEFINE_REGU(VIOHI, REGULATORMODE0),
+        MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0),
+        MC13783_DEFINE_REGU(VDIG, REGULATORMODE0),
+        MC13783_DEFINE_REGU(VGEN, REGULATORMODE0),
+        MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0),
+        MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0),
+        MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0),
+        MC13783_DEFINE_REGU(VSIM, REGULATORMODE1),
+        MC13783_DEFINE_REGU(VESIM, REGULATORMODE1),
+        MC13783_DEFINE_REGU(VCAM, REGULATORMODE1),
+        MC13783_DEFINE_REGU(VRFBG, REGULATORMODE1),
+        MC13783_DEFINE_REGU(VVIB, REGULATORMODE1),
+        MC13783_DEFINE_REGU(VRF1, REGULATORMODE1),
+        MC13783_DEFINE_REGU(VRF2, REGULATORMODE1),
+        MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1),
+        MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1),
+        MC13783_DEFINE_REGU(GPO1, POWERMISC),
+        MC13783_DEFINE_REGU(GPO2, POWERMISC),
+        MC13783_DEFINE_REGU(GPO3, POWERMISC),
+        MC13783_DEFINE_REGU(GPO4, POWERMISC),
+};
+struct mc13783_regulator_priv {
+        struct mc13783 *mc13783;
+        struct regulator_dev *regulators[];
+};
+static int mc13783_regulator_enable(struct regulator_dev *rdev)
+{
+        struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev);
+        int id = rdev_get_id(rdev);
+        int ret;
+        dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
+        mc13783_lock(priv->mc13783);
+        ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg,
+                        mc13783_regulators[id].enable_bit,
+                        mc13783_regulators[id].enable_bit);
+        mc13783_unlock(priv->mc13783);
+        return ret;
+}
+static int mc13783_regulator_disable(struct regulator_dev *rdev)
+{
+        struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev);
+        int id = rdev_get_id(rdev);
+        int ret;
+        dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
+        mc13783_lock(priv->mc13783);
+        ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg,
+                        mc13783_regulators[id].enable_bit, 0);
+        mc13783_unlock(priv->mc13783);
+        return ret;
+}
+static int mc13783_regulator_is_enabled(struct regulator_dev *rdev)
+{
+        struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev);
+        int ret, id = rdev_get_id(rdev);
+        unsigned int val;
+        mc13783_lock(priv->mc13783);
+        ret = mc13783_reg_read(priv->mc13783, mc13783_regulators[id].reg, &val);
+        mc13783_unlock(priv->mc13783);
+        if (ret)
+                return ret;
+        return (val & mc13783_regulators[id].enable_bit) != 0;
+}
+static struct regulator_ops mc13783_regulator_ops = {
+        .enable = mc13783_regulator_enable,
+        .disable = mc13783_regulator_disable,
+        .is_enabled = mc13783_regulator_is_enabled,
+};
+static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
+{
+        struct mc13783_regulator_priv *priv;
+        struct mc13783 *mc13783 = dev_get_drvdata(pdev->dev.parent);
+        struct mc13783_regulator_platform_data *pdata =
+                dev_get_platdata(&pdev->dev);
+        struct mc13783_regulator_init_data *init_data;
+        int i, ret;
+        dev_dbg(&pdev->dev, "mc13783_regulator_probe id %d\n", pdev->id);
+        priv = kzalloc(sizeof(*priv) +
+                        pdata->num_regulators * sizeof(priv->regulators[0]),
+                        GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+        priv->mc13783 = mc13783;
+        for (i = 0; i < pdata->num_regulators; i++) {
+                init_data = &pdata->regulators[i];
+                priv->regulators[i] = regulator_register(
+                                &mc13783_regulators[init_data->id].desc,
+                                &pdev->dev, init_data->init_data, priv);
+                if (IS_ERR(priv->regulators[i])) {
+                        dev_err(&pdev->dev, "failed to register regulator %s\n",
+                                mc13783_regulators[i].desc.name);
+                        ret = PTR_ERR(priv->regulators[i]);
+                        goto err;
+                }
+        }
+        platform_set_drvdata(pdev, priv);
+        return 0;
+err:
+        while (--i >= 0)
+                regulator_unregister(priv->regulators[i]);
+        kfree(priv);
+        return ret;
+}
+static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
+{
+        struct mc13783_regulator_priv *priv = platform_get_drvdata(pdev);
+        struct mc13783_regulator_platform_data *pdata =
+                dev_get_platdata(&pdev->dev);
+        int i;
+        for (i = 0; i < pdata->num_regulators; i++)
+                regulator_unregister(priv->regulators[i]);
+        return 0;
+}
+static struct platform_driver mc13783_regulator_driver = {
+        .driver = {
+                .name   = "mc13783-regulator",
+                .owner  = THIS_MODULE,
+        },
+        .remove         = __devexit_p(mc13783_regulator_remove),
+        .probe          = mc13783_regulator_probe,
+};
+static int __init mc13783_regulator_init(void)
+{
+        return platform_driver_register(&mc13783_regulator_driver);
+}
+subsys_initcall(mc13783_regulator_init);
+static void __exit mc13783_regulator_exit(void)
+{
+        platform_driver_unregister(&mc13783_regulator_driver);
+}
+module_exit(mc13783_regulator_exit);
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de");
+MODULE_DESCRIPTION("Regulator Driver for Freescale MC13783 PMIC");
+MODULE_ALIAS("platform:mc13783-regulator");
diff --git a/drivers/regulator/mc13783.c b/drivers/regulator/mc13783.c
deleted file mode 100644
index 710211f67449..000000000000
--- a/drivers/regulator/mc13783.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Regulator Driver for Freescale MC13783 PMIC
- *
- * Copyright (C) 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
- *
- * 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.
- */
-#include <linux/mfd/mc13783-private.h>
-#include <linux/regulator/machine.h>
-#include <linux/regulator/driver.h>
-#include <linux/platform_device.h>
-#include <linux/mfd/mc13783.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/err.h>
-struct mc13783_regulator {
-        struct regulator_desc desc;
-        int reg;
-        int enable_bit;
-};
-static struct regulator_ops mc13783_regulator_ops;
-static struct mc13783_regulator mc13783_regulators[] = {
-        [MC13783_SW_SW3] = {
-                .desc = {
-                        .name   = "SW_SW3",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_SW_SW3,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_SWITCHERS_5,
-                .enable_bit = MC13783_SWCTRL_SW3_EN,
-        },
-        [MC13783_SW_PLL] = {
-                .desc = {
-                        .name   = "SW_PLL",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_SW_PLL,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_SWITCHERS_4,
-                .enable_bit = MC13783_SWCTRL_PLL_EN,
-        },
-        [MC13783_REGU_VAUDIO] = {
-                .desc = {
-                        .name   = "REGU_VAUDIO",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VAUDIO,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_0,
-                .enable_bit = MC13783_REGCTRL_VAUDIO_EN,
-        },
-        [MC13783_REGU_VIOHI] = {
-                .desc = {
-                        .name   = "REGU_VIOHI",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VIOHI,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_0,
-                .enable_bit = MC13783_REGCTRL_VIOHI_EN,
-        },
-        [MC13783_REGU_VIOLO] = {
-                .desc = {
-                        .name   = "REGU_VIOLO",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VIOLO,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_0,
-                .enable_bit = MC13783_REGCTRL_VIOLO_EN,
-        },
-        [MC13783_REGU_VDIG] = {
-                .desc = {
-                        .name   = "REGU_VDIG",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VDIG,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_0,
-                .enable_bit = MC13783_REGCTRL_VDIG_EN,
-        },
-        [MC13783_REGU_VGEN] = {
-                .desc = {
-                        .name   = "REGU_VGEN",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VGEN,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_0,
-                .enable_bit = MC13783_REGCTRL_VGEN_EN,
-        },
-        [MC13783_REGU_VRFDIG] = {
-                .desc = {
-                        .name   = "REGU_VRFDIG",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VRFDIG,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_0,
-                .enable_bit = MC13783_REGCTRL_VRFDIG_EN,
-        },
-        [MC13783_REGU_VRFREF] = {
-                .desc = {
-                        .name   = "REGU_VRFREF",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VRFREF,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_0,
-                .enable_bit = MC13783_REGCTRL_VRFREF_EN,
-        },
-        [MC13783_REGU_VRFCP] = {
-                .desc = {
-                        .name   = "REGU_VRFCP",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VRFCP,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_0,
-                .enable_bit = MC13783_REGCTRL_VRFCP_EN,
-        },
-        [MC13783_REGU_VSIM] = {
-                .desc = {
-                        .name   = "REGU_VSIM",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VSIM,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_1,
-                .enable_bit = MC13783_REGCTRL_VSIM_EN,
-        },
-        [MC13783_REGU_VESIM] = {
-                .desc = {
-                        .name   = "REGU_VESIM",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VESIM,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_1,
-                .enable_bit = MC13783_REGCTRL_VESIM_EN,
-        },
-        [MC13783_REGU_VCAM] = {
-                .desc = {
-                        .name   = "REGU_VCAM",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VCAM,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_1,
-                .enable_bit = MC13783_REGCTRL_VCAM_EN,
-        },
-        [MC13783_REGU_VRFBG] = {
-                .desc = {
-                        .name   = "REGU_VRFBG",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VRFBG,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_1,
-                .enable_bit = MC13783_REGCTRL_VRFBG_EN,
-        },
-        [MC13783_REGU_VVIB] = {
-                .desc = {
-                        .name   = "REGU_VVIB",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VVIB,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_1,
-                .enable_bit = MC13783_REGCTRL_VVIB_EN,
-        },
-        [MC13783_REGU_VRF1] = {
-                .desc = {
-                        .name   = "REGU_VRF1",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VRF1,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_1,
-                .enable_bit = MC13783_REGCTRL_VRF1_EN,
-        },
-        [MC13783_REGU_VRF2] = {
-                .desc = {
-                        .name   = "REGU_VRF2",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VRF2,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_1,
-                .enable_bit = MC13783_REGCTRL_VRF2_EN,
-        },
-        [MC13783_REGU_VMMC1] = {
-                .desc = {
-                        .name   = "REGU_VMMC1",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VMMC1,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_1,
-                .enable_bit = MC13783_REGCTRL_VMMC1_EN,
-        },
-        [MC13783_REGU_VMMC2] = {
-                .desc = {
-                        .name   = "REGU_VMMC2",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_VMMC2,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_REGULATOR_MODE_1,
-                .enable_bit = MC13783_REGCTRL_VMMC2_EN,
-        },
-        [MC13783_REGU_GPO1] = {
-                .desc = {
-                        .name   = "REGU_GPO1",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_GPO1,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_POWER_MISCELLANEOUS,
-                .enable_bit = MC13783_REGCTRL_GPO1_EN,
-        },
-        [MC13783_REGU_GPO2] = {
-                .desc = {
-                        .name   = "REGU_GPO2",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_GPO2,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_POWER_MISCELLANEOUS,
-                .enable_bit = MC13783_REGCTRL_GPO2_EN,
-        },
-        [MC13783_REGU_GPO3] = {
-                .desc = {
-                        .name   = "REGU_GPO3",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_GPO3,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_POWER_MISCELLANEOUS,
-                .enable_bit = MC13783_REGCTRL_GPO3_EN,
-        },
-        [MC13783_REGU_GPO4] = {
-                .desc = {
-                        .name   = "REGU_GPO4",
-                        .ops    = &mc13783_regulator_ops,
-                        .type   = REGULATOR_VOLTAGE,
-                        .id     = MC13783_REGU_GPO4,
-                        .owner  = THIS_MODULE,
-                },
-                .reg = MC13783_REG_POWER_MISCELLANEOUS,
-                .enable_bit = MC13783_REGCTRL_GPO4_EN,
-        },
-};
-struct mc13783_priv {
-        struct regulator_desc desc[ARRAY_SIZE(mc13783_regulators)];
-        struct mc13783 *mc13783;
-        struct regulator_dev *regulators[0];
-};
-static int mc13783_enable(struct regulator_dev *rdev)
-{
-        struct mc13783_priv *priv = rdev_get_drvdata(rdev);
-        int id = rdev_get_id(rdev);
-        dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
-        return mc13783_set_bits(priv->mc13783, mc13783_regulators[id].reg,
-                        mc13783_regulators[id].enable_bit,
-                        mc13783_regulators[id].enable_bit);
-}
-static int mc13783_disable(struct regulator_dev *rdev)
-{
-        struct mc13783_priv *priv = rdev_get_drvdata(rdev);
-        int id = rdev_get_id(rdev);
-        dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
-        return mc13783_set_bits(priv->mc13783, mc13783_regulators[id].reg,
-                        mc13783_regulators[id].enable_bit, 0);
-}
-static int mc13783_is_enabled(struct regulator_dev *rdev)
-{
-        struct mc13783_priv *priv = rdev_get_drvdata(rdev);
-        int ret, id = rdev_get_id(rdev);
-        unsigned int val;
-        ret = mc13783_reg_read(priv->mc13783, mc13783_regulators[id].reg, &val);
-        if (ret)
-                return ret;
-        return (val & mc13783_regulators[id].enable_bit) != 0;
-}
-static struct regulator_ops mc13783_regulator_ops = {
-        .enable         = mc13783_enable,
-        .disable        = mc13783_disable,
-        .is_enabled     = mc13783_is_enabled,
-};
-static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
-{
-        struct mc13783_priv *priv;
-        struct mc13783 *mc13783 = dev_get_drvdata(pdev->dev.parent);
-        struct mc13783_regulator_init_data *init_data;
-        int i, ret;
-        dev_dbg(&pdev->dev, "mc13783_regulator_probe id %d\n", pdev->id);
-        priv = kzalloc(sizeof(*priv) + mc13783->num_regulators * sizeof(void *),
-                        GFP_KERNEL);
-        if (!priv)
-                return -ENOMEM;
-        priv->mc13783 = mc13783;
-        for (i = 0; i < mc13783->num_regulators; i++) {
-                init_data = &mc13783->regulators[i];
-                priv->regulators[i] = regulator_register(
-                                &mc13783_regulators[init_data->id].desc,
-                                &pdev->dev, init_data->init_data, priv);
-                if (IS_ERR(priv->regulators[i])) {
-                        dev_err(&pdev->dev, "failed to register regulator %s\n",
-                                mc13783_regulators[i].desc.name);
-                        ret = PTR_ERR(priv->regulators[i]);
-                        goto err;
-                }
-        }
-        platform_set_drvdata(pdev, priv);
-        return 0;
-err:
-        while (--i >= 0)
-                regulator_unregister(priv->regulators[i]);
-        kfree(priv);
-        return ret;
-}
-static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
-{
-        struct mc13783_priv *priv = platform_get_drvdata(pdev);
-        struct mc13783 *mc13783 = priv->mc13783;
-        int i;
-        for (i = 0; i < mc13783->num_regulators; i++)
-                regulator_unregister(priv->regulators[i]);
-        return 0;
-}
-static struct platform_driver mc13783_regulator_driver = {
-        .driver = {
-                .name   = "mc13783-regulator",
-                .owner  = THIS_MODULE,
-        },
-        .remove         = __devexit_p(mc13783_regulator_remove),
-};
-static int __init mc13783_regulator_init(void)
-{
-        return platform_driver_probe(&mc13783_regulator_driver,
-                        mc13783_regulator_probe);
-}
-subsys_initcall(mc13783_regulator_init);
-static void __exit mc13783_regulator_exit(void)
-{
-        platform_driver_unregister(&mc13783_regulator_driver);
-}
-module_exit(mc13783_regulator_exit);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de");
-MODULE_DESCRIPTION("Regulator Driver for Freescale MC13783 PMIC");
-MODULE_ALIAS("platform:mc13783-regulator");
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 7ea1c3a31081..7e674859bd59 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
@@ -40,6 +41,12 @@ struct twlreg_info {
        u8                      table_len;
        const u16               *table;
+        /* regulator specific turn-on delay */
+        u16                     delay;
+        /* State REMAP default configuration */
+        u8                      remap;
        /* chip constraints on regulator behavior */
        u16                     min_mV;
@@ -128,6 +135,7 @@ static int twlreg_enable(struct regulator_dev *rdev)
 {
        struct twlreg_info      *info = rdev_get_drvdata(rdev);
        int                     grp;
+        int                     ret;
        grp = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_GRP);
        if (grp < 0)
@@ -138,7 +146,11 @@ static int twlreg_enable(struct regulator_dev *rdev)
        else
                grp |= P1_GRP_6030;
-        return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp);
+        ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp);
+        udelay(info->delay);
+        return ret;
 }
 static int twlreg_disable(struct regulator_dev *rdev)
@@ -151,9 +163,9 @@ static int twlreg_disable(struct regulator_dev *rdev)
                return grp;
        if (twl_class_is_4030())
-                grp &= ~P1_GRP_4030;
+                grp &= ~(P1_GRP_4030 | P2_GRP_4030 | P3_GRP_4030);
        else
-                grp &= ~P1_GRP_6030;
+                grp &= ~(P1_GRP_6030 | P2_GRP_6030 | P3_GRP_6030);
        return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp);
 }
@@ -294,6 +306,18 @@ static const u16 VSIM_VSEL_table[] = {
 static const u16 VDAC_VSEL_table[] = {
        1200, 1300, 1800, 1800,
 };
+static const u16 VDD1_VSEL_table[] = {
+        800, 1450,
+};
+static const u16 VDD2_VSEL_table[] = {
+        800, 1450, 1500,
+};
+static const u16 VIO_VSEL_table[] = {
+        1800, 1850,
+};
+static const u16 VINTANA2_VSEL_table[] = {
+        2500, 2750,
+};
 static const u16 VAUX1_6030_VSEL_table[] = {
        1000, 1300, 1800, 2500,
        2800, 2900, 3000, 3000,
@@ -414,20 +438,30 @@ static struct regulator_ops twlfixed_ops = {
 /*----------------------------------------------------------------------*/
-#define TWL4030_ADJUSTABLE_LDO(label, offset, num) \
+#define TWL4030_ADJUSTABLE_LDO(label, offset, num, turnon_delay, remap_conf) \
-                TWL_ADJUSTABLE_LDO(label, offset, num, TWL4030)
+                TWL_ADJUSTABLE_LDO(label, offset, num, turnon_delay, \
-#define TWL4030_FIXED_LDO(label, offset, mVolts, num) \
+                        remap_conf, TWL4030)
-                TWL_FIXED_LDO(label, offset, mVolts, num, TWL4030)
+#define TWL4030_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
-#define TWL6030_ADJUSTABLE_LDO(label, offset, num) \
+                        remap_conf) \
-                TWL_ADJUSTABLE_LDO(label, offset, num, TWL6030)
+                TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
-#define TWL6030_FIXED_LDO(label, offset, mVolts, num) \
+                        remap_conf, TWL4030)
-                TWL_FIXED_LDO(label, offset, mVolts, num, TWL6030)
+#define TWL6030_ADJUSTABLE_LDO(label, offset, num, turnon_delay, \
+                        remap_conf) \
-#define TWL_ADJUSTABLE_LDO(label, offset, num, family) { \
+                TWL_ADJUSTABLE_LDO(label, offset, num, turnon_delay, \
+                        remap_conf, TWL6030)
+#define TWL6030_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
+                        remap_conf) \
+                TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
+                        remap_conf, TWL6030)
+#define TWL_ADJUSTABLE_LDO(label, offset, num, turnon_delay, remap_conf, \
+                family) { \
        .base = offset, \
        .id = num, \
        .table_len = ARRAY_SIZE(label##_VSEL_table), \
        .table = label##_VSEL_table, \
+        .delay = turnon_delay, \
+        .remap = remap_conf, \
        .desc = { \
                .name = #label, \
                .id = family##_REG_##label, \
@@ -438,10 +472,13 @@ static struct regulator_ops twlfixed_ops = {
                }, \
        }
-#define TWL_FIXED_LDO(label, offset, mVolts, num, family) { \
+#define TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, remap_conf, \
+                family) { \
        .base = offset, \
        .id = num, \
        .min_mV = mVolts, \
+        .delay = turnon_delay, \
+        .remap = remap_conf, \
        .desc = { \
                .name = #label, \
                .id = family##_REG_##label, \
@@ -457,43 +494,41 @@ static struct regulator_ops twlfixed_ops = {
 * software control over them after boot.
 */
 static struct twlreg_info twl_regs[] = {
-        TWL4030_ADJUSTABLE_LDO(VAUX1, 0x17, 1),
+        TWL4030_ADJUSTABLE_LDO(VAUX1, 0x17, 1, 100, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VAUX2_4030, 0x1b, 2),
+        TWL4030_ADJUSTABLE_LDO(VAUX2_4030, 0x1b, 2, 100, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VAUX2, 0x1b, 2),
+        TWL4030_ADJUSTABLE_LDO(VAUX2, 0x1b, 2, 100, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VAUX3, 0x1f, 3),
+        TWL4030_ADJUSTABLE_LDO(VAUX3, 0x1f, 3, 100, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VAUX4, 0x23, 4),
+        TWL4030_ADJUSTABLE_LDO(VAUX4, 0x23, 4, 100, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VMMC1, 0x27, 5),
+        TWL4030_ADJUSTABLE_LDO(VMMC1, 0x27, 5, 100, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VMMC2, 0x2b, 6),
+        TWL4030_ADJUSTABLE_LDO(VMMC2, 0x2b, 6, 100, 0x08),
-        /*
+        TWL4030_ADJUSTABLE_LDO(VPLL1, 0x2f, 7, 100, 0x00),
-        TWL4030_ADJUSTABLE_LDO(VPLL1, 0x2f, 7),
+        TWL4030_ADJUSTABLE_LDO(VPLL2, 0x33, 8, 100, 0x08),
-        */
+        TWL4030_ADJUSTABLE_LDO(VSIM, 0x37, 9, 100, 0x00),
-        TWL4030_ADJUSTABLE_LDO(VPLL2, 0x33, 8),
+        TWL4030_ADJUSTABLE_LDO(VDAC, 0x3b, 10, 100, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VSIM, 0x37, 9),
+        TWL4030_FIXED_LDO(VINTANA1, 0x3f, 1500, 11, 100, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VDAC, 0x3b, 10),
+        TWL4030_ADJUSTABLE_LDO(VINTANA2, 0x43, 12, 100, 0x08),
-        /*
+        TWL4030_FIXED_LDO(VINTDIG, 0x47, 1500, 13, 100, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VINTANA1, 0x3f, 11),
+        TWL4030_ADJUSTABLE_LDO(VIO, 0x4b, 14, 1000, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VINTANA2, 0x43, 12),
+        TWL4030_ADJUSTABLE_LDO(VDD1, 0x55, 15, 1000, 0x08),
-        TWL4030_ADJUSTABLE_LDO(VINTDIG, 0x47, 13),
+        TWL4030_ADJUSTABLE_LDO(VDD2, 0x63, 16, 1000, 0x08),
-        TWL4030_SMPS(VIO, 0x4b, 14),
+        TWL4030_FIXED_LDO(VUSB1V5, 0x71, 1500, 17, 100, 0x08),
-        TWL4030_SMPS(VDD1, 0x55, 15),
+        TWL4030_FIXED_LDO(VUSB1V8, 0x74, 1800, 18, 100, 0x08),
-        TWL4030_SMPS(VDD2, 0x63, 16),
+        TWL4030_FIXED_LDO(VUSB3V1, 0x77, 3100, 19, 150, 0x08),
-         */
-        TWL4030_FIXED_LDO(VUSB1V5, 0x71, 1500, 17),
-        TWL4030_FIXED_LDO(VUSB1V8, 0x74, 1800, 18),
-        TWL4030_FIXED_LDO(VUSB3V1, 0x77, 3100, 19),
        /* VUSBCP is managed *only* by the USB subchip */
        /* 6030 REG with base as PMC Slave Misc : 0x0030 */
-        TWL6030_ADJUSTABLE_LDO(VAUX1_6030, 0x54, 1),
+        /* Turnon-delay and remap configuration values for 6030 are not
-        TWL6030_ADJUSTABLE_LDO(VAUX2_6030, 0x58, 2),
+           verified since the specification is not public */
-        TWL6030_ADJUSTABLE_LDO(VAUX3_6030, 0x5c, 3),
+        TWL6030_ADJUSTABLE_LDO(VAUX1_6030, 0x54, 1, 0, 0x08),
-        TWL6030_ADJUSTABLE_LDO(VMMC, 0x68, 4),
+        TWL6030_ADJUSTABLE_LDO(VAUX2_6030, 0x58, 2, 0, 0x08),
-        TWL6030_ADJUSTABLE_LDO(VPP, 0x6c, 5),
+        TWL6030_ADJUSTABLE_LDO(VAUX3_6030, 0x5c, 3, 0, 0x08),
-        TWL6030_ADJUSTABLE_LDO(VUSIM, 0x74, 7),
+        TWL6030_ADJUSTABLE_LDO(VMMC, 0x68, 4, 0, 0x08),
-        TWL6030_FIXED_LDO(VANA, 0x50, 2100, 15),
+        TWL6030_ADJUSTABLE_LDO(VPP, 0x6c, 5, 0, 0x08),
-        TWL6030_FIXED_LDO(VCXIO, 0x60, 1800, 16),
+        TWL6030_ADJUSTABLE_LDO(VUSIM, 0x74, 7, 0, 0x08),
-        TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 17),
+        TWL6030_FIXED_LDO(VANA, 0x50, 2100, 15, 0, 0x08),
-        TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 18)
+        TWL6030_FIXED_LDO(VCXIO, 0x60, 1800, 16, 0, 0x08),
+        TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 17, 0, 0x08),
+        TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 18, 0, 0x08)
 };
 static int twlreg_probe(struct platform_device *pdev)
@@ -525,6 +560,19 @@ static int twlreg_probe(struct platform_device *pdev)
        c->valid_ops_mask &= REGULATOR_CHANGE_VOLTAGE
                                | REGULATOR_CHANGE_MODE
                                | REGULATOR_CHANGE_STATUS;
+        switch (pdev->id) {
+        case TWL4030_REG_VIO:
+        case TWL4030_REG_VDD1:
+        case TWL4030_REG_VDD2:
+        case TWL4030_REG_VPLL1:
+        case TWL4030_REG_VINTANA1:
+        case TWL4030_REG_VINTANA2:
+        case TWL4030_REG_VINTDIG:
+                c->always_on = true;
+                break;
+        default:
+                break;
+        }
        rdev = regulator_register(&info->desc, &pdev->dev, initdata, info);
        if (IS_ERR(rdev)) {
@@ -534,6 +582,9 @@ static int twlreg_probe(struct platform_device *pdev)
        }
        platform_set_drvdata(pdev, rdev);
+        twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_REMAP,
+                                                info->remap);
        /* NOTE:  many regulators support short-circuit IRQs (presentable
         * as REGULATOR_OVER_CURRENT notifications?) configured via:
         *  - SC_CONFIG
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 2eefc1a0cf08..0a6577577e8d 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -19,6 +19,8 @@
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/gpio.h>
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/regulator.h>
@@ -39,6 +41,7 @@
 #define WM831X_DCDC_CONTROL_2     1
 #define WM831X_DCDC_ON_CONFIG     2
 #define WM831X_DCDC_SLEEP_CONTROL 3
+#define WM831X_DCDC_DVS_CONTROL   4
 /*
 * Shared
@@ -50,6 +53,10 @@ struct wm831x_dcdc {
        int base;
        struct wm831x *wm831x;
        struct regulator_dev *regulator;
+        int dvs_gpio;
+        int dvs_gpio_state;
+        int on_vsel;
+        int dvs_vsel;
 };
 static int wm831x_dcdc_is_enabled(struct regulator_dev *rdev)
@@ -240,11 +247,9 @@ static int wm831x_buckv_list_voltage(struct regulator_dev *rdev,
        return -EINVAL;
 }
-static int wm831x_buckv_set_voltage_int(struct regulator_dev *rdev, int reg,
+static int wm831x_buckv_select_min_voltage(struct regulator_dev *rdev,
-                                         int min_uV, int max_uV)
+                                           int min_uV, int max_uV)
 {
-        struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-        struct wm831x *wm831x = dcdc->wm831x;
        u16 vsel;
        if (min_uV < 600000)
@@ -257,39 +262,126 @@ static int wm831x_buckv_set_voltage_int(struct regulator_dev *rdev, int reg,
        if (wm831x_buckv_list_voltage(rdev, vsel) > max_uV)
                return -EINVAL;
-        return wm831x_set_bits(wm831x, reg, WM831X_DC1_ON_VSEL_MASK, vsel);
+        return vsel;
+}
+static int wm831x_buckv_select_max_voltage(struct regulator_dev *rdev,
+                                           int min_uV, int max_uV)
+{
+        u16 vsel;
+        if (max_uV < 600000 || max_uV > 1800000)
+                return -EINVAL;
+        vsel = ((max_uV - 600000) / 12500) + 8;
+        if (wm831x_buckv_list_voltage(rdev, vsel) < min_uV ||
+            wm831x_buckv_list_voltage(rdev, vsel) < max_uV)
+                return -EINVAL;
+        return vsel;
+}
+static int wm831x_buckv_set_dvs(struct regulator_dev *rdev, int state)
+{
+        struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
+        if (state == dcdc->dvs_gpio_state)
+                return 0;
+        dcdc->dvs_gpio_state = state;
+        gpio_set_value(dcdc->dvs_gpio, state);
+        /* Should wait for DVS state change to be asserted if we have
+         * a GPIO for it, for now assume the device is configured
+         * for the fastest possible transition.
+         */
+        return 0;
 }
 static int wm831x_buckv_set_voltage(struct regulator_dev *rdev,
-                                     int min_uV, int max_uV)
+                                    int min_uV, int max_uV)
 {
        struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-        u16 reg = dcdc->base + WM831X_DCDC_ON_CONFIG;
+        struct wm831x *wm831x = dcdc->wm831x;
+        int on_reg = dcdc->base + WM831X_DCDC_ON_CONFIG;
+        int dvs_reg = dcdc->base + WM831X_DCDC_DVS_CONTROL;
+        int vsel, ret;
+        vsel = wm831x_buckv_select_min_voltage(rdev, min_uV, max_uV);
+        if (vsel < 0)
+                return vsel;
+        /* If this value is already set then do a GPIO update if we can */
+        if (dcdc->dvs_gpio && dcdc->on_vsel == vsel)
+                return wm831x_buckv_set_dvs(rdev, 0);
+        if (dcdc->dvs_gpio && dcdc->dvs_vsel == vsel)
+                return wm831x_buckv_set_dvs(rdev, 1);
+        /* Always set the ON status to the minimum voltage */
+        ret = wm831x_set_bits(wm831x, on_reg, WM831X_DC1_ON_VSEL_MASK, vsel);
+        if (ret < 0)
+                return ret;
+        dcdc->on_vsel = vsel;
+        if (!dcdc->dvs_gpio)
+                return ret;
+        /* Kick the voltage transition now */
+        ret = wm831x_buckv_set_dvs(rdev, 0);
+        if (ret < 0)
+                return ret;
+        /* Set the high voltage as the DVS voltage.  This is optimised
+         * for CPUfreq usage, most processors will keep the maximum
+         * voltage constant and lower the minimum with the frequency. */
+        vsel = wm831x_buckv_select_max_voltage(rdev, min_uV, max_uV);
+        if (vsel < 0) {
+                /* This should never happen - at worst the same vsel
+                 * should be chosen */
+                WARN_ON(vsel < 0);
+                return 0;
+        }
+        /* Don't bother if it's the same VSEL we're already using */
+        if (vsel == dcdc->on_vsel)
+                return 0;
-        return wm831x_buckv_set_voltage_int(rdev, reg, min_uV, max_uV);
+        ret = wm831x_set_bits(wm831x, dvs_reg, WM831X_DC1_DVS_VSEL_MASK, vsel);
+        if (ret == 0)
+                dcdc->dvs_vsel = vsel;
+        else
+                dev_warn(wm831x->dev, "Failed to set DCDC DVS VSEL: %d\n",
+                         ret);
+        return 0;
 }
 static int wm831x_buckv_set_suspend_voltage(struct regulator_dev *rdev,
-                                             int uV)
+                                            int uV)
 {
        struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
+        struct wm831x *wm831x = dcdc->wm831x;
        u16 reg = dcdc->base + WM831X_DCDC_SLEEP_CONTROL;
+        int vsel;
+        vsel = wm831x_buckv_select_min_voltage(rdev, uV, uV);
+        if (vsel < 0)
+                return vsel;
-        return wm831x_buckv_set_voltage_int(rdev, reg, uV, uV);
+        return wm831x_set_bits(wm831x, reg, WM831X_DC1_SLP_VSEL_MASK, vsel);
 }
 static int wm831x_buckv_get_voltage(struct regulator_dev *rdev)
 {
        struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-        struct wm831x *wm831x = dcdc->wm831x;
-        u16 reg = dcdc->base + WM831X_DCDC_ON_CONFIG;
-        int val;
-        val = wm831x_reg_read(wm831x, reg);
+        if (dcdc->dvs_gpio && dcdc->dvs_gpio_state)
-        if (val < 0)
+                return wm831x_buckv_list_voltage(rdev, dcdc->dvs_vsel);
-                return val;
+        else
+                return wm831x_buckv_list_voltage(rdev, dcdc->on_vsel);
-        return wm831x_buckv_list_voltage(rdev, val & WM831X_DC1_ON_VSEL_MASK);
 }
 /* Current limit options */
@@ -346,6 +438,64 @@ static struct regulator_ops wm831x_buckv_ops = {
        .set_suspend_mode = wm831x_dcdc_set_suspend_mode,
 };
+/*
+ * Set up DVS control.  We just log errors since we can still run
+ * (with reduced performance) if we fail.
+ */
+static __devinit void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
+                                            struct wm831x_buckv_pdata *pdata)
+{
+        struct wm831x *wm831x = dcdc->wm831x;
+        int ret;
+        u16 ctrl;
+        if (!pdata || !pdata->dvs_gpio)
+                return;
+        switch (pdata->dvs_control_src) {
+        case 1:
+                ctrl = 2 << WM831X_DC1_DVS_SRC_SHIFT;
+                break;
+        case 2:
+                ctrl = 3 << WM831X_DC1_DVS_SRC_SHIFT;
+                break;
+        default:
+                dev_err(wm831x->dev, "Invalid DVS control source %d for %s\n",
+                        pdata->dvs_control_src, dcdc->name);
+                return;
+        }
+        ret = wm831x_set_bits(wm831x, dcdc->base + WM831X_DCDC_DVS_CONTROL,
+                              WM831X_DC1_DVS_SRC_MASK, ctrl);
+        if (ret < 0) {
+                dev_err(wm831x->dev, "Failed to set %s DVS source: %d\n",
+                        dcdc->name, ret);
+                return;
+        }
+        ret = gpio_request(pdata->dvs_gpio, "DCDC DVS");
+        if (ret < 0) {
+                dev_err(wm831x->dev, "Failed to get %s DVS GPIO: %d\n",
+                        dcdc->name, ret);
+                return;
+        }
+        /* gpiolib won't let us read the GPIO status so pick the higher
+         * of the two existing voltages so we take it as platform data.
+         */
+        dcdc->dvs_gpio_state = pdata->dvs_init_state;
+        ret = gpio_direction_output(pdata->dvs_gpio, dcdc->dvs_gpio_state);
+        if (ret < 0) {
+                dev_err(wm831x->dev, "Failed to enable %s DVS GPIO: %d\n",
+                        dcdc->name, ret);
+                gpio_free(pdata->dvs_gpio);
+                return;
+        }
+        dcdc->dvs_gpio = pdata->dvs_gpio;
+}
 static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
 {
        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
@@ -384,6 +534,23 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
        dcdc->desc.ops = &wm831x_buckv_ops;
        dcdc->desc.owner = THIS_MODULE;
+        ret = wm831x_reg_read(wm831x, dcdc->base + WM831X_DCDC_ON_CONFIG);
+        if (ret < 0) {
+                dev_err(wm831x->dev, "Failed to read ON VSEL: %d\n", ret);
+                goto err;
+        }
+        dcdc->on_vsel = ret & WM831X_DC1_ON_VSEL_MASK;
+        ret = wm831x_reg_read(wm831x, dcdc->base + WM831X_DCDC_ON_CONFIG);
+        if (ret < 0) {
+                dev_err(wm831x->dev, "Failed to read DVS VSEL: %d\n", ret);
+                goto err;
+        }
+        dcdc->dvs_vsel = ret & WM831X_DC1_DVS_VSEL_MASK;
+        if (pdata->dcdc[id])
+                wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data);
        dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev,
                                             pdata->dcdc[id], dcdc);
        if (IS_ERR(dcdc->regulator)) {
@@ -422,6 +589,8 @@ err_uv:
 err_regulator:
        regulator_unregister(dcdc->regulator);
 err:
+        if (dcdc->dvs_gpio)
+                gpio_free(dcdc->dvs_gpio);
        kfree(dcdc);
        return ret;
 }
@@ -434,6 +603,8 @@ static __devexit int wm831x_buckv_remove(struct platform_device *pdev)
        wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "HC"), dcdc);
        wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "UV"), dcdc);
        regulator_unregister(dcdc->regulator);
+        if (dcdc->dvs_gpio)
+                gpio_free(dcdc->dvs_gpio);
        kfree(dcdc);
        return 0;
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 902db56ce099..61e02ac2fda3 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -470,7 +470,7 @@ static unsigned int wm831x_aldo_get_mode(struct regulator_dev *rdev)
        struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
        struct wm831x *wm831x = ldo->wm831x;
        int on_reg = ldo->base + WM831X_LDO_ON_CONTROL;
-        unsigned int ret;
+        int ret;
        ret = wm831x_reg_read(wm831x, on_reg);
        if (ret < 0)
diff --git a/drivers/staging/iio/ring_sw.h b/drivers/staging/iio/ring_sw.h
index f0b86f02cd80..fd677f008365 100644
--- a/drivers/staging/iio/ring_sw.h
+++ b/drivers/staging/iio/ring_sw.h
@@ -29,7 +29,6 @@
 * driver requests - some may support multiple options */
-#include <linux/autoconf.h>
 #include "iio.h"
 #include "ring_generic.h"
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 4ce399b6d237..f98a52448eae 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -55,7 +55,7 @@
 #include <linux/list.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/io.h>
 #include <asm/uaccess.h>
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index 2051c9dc813b..b7687c55fe16 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -2245,9 +2245,6 @@ static int ext_setcolreg(unsigned int regno, unsigned int red,
        if (regno > 255)
                return 1;
-        if (regno > 255)
-                return 1;
        switch (external_card_type) {
        case IS_VGA:
                OUTB(0x3c8, regno);
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index f72914db2a11..756f831cbdd5 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -118,6 +118,7 @@ header-y += mtio.h
 header-y += ncp_no.h
 header-y += neighbour.h
 header-y += net_dropmon.h
+header-y += net_tstamp.h
 header-y += netfilter_arp.h
 header-y += netrom.h
 header-y += nfs2.h
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index 415c228743d5..fd322aca33ba 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -41,6 +41,23 @@ struct wm831x_battery_pdata {
        int timeout;        /** Charge cycle timeout, in minutes */
 };
+/**
+ * Configuration for the WM831x DC-DC BuckWise convertors.  This
+ * should be passed as driver_data in the regulator_init_data.
+ *
+ * Currently all the configuration is for the fast DVS switching
+ * support of the devices.  This allows MFPs on the device to be
+ * configured as an input to switch between two output voltages,
+ * allowing voltage transitions without the expense of an access over
+ * I2C or SPI buses.
+ */
+struct wm831x_buckv_pdata {
+        int dvs_gpio;        /** CPU GPIO to use for DVS switching */
+        int dvs_control_src; /** Hardware DVS source to use (1 or 2) */
+        int dvs_init_state;  /** DVS state to expect on startup */
+        int dvs_state_gpio;  /** CPU GPIO to use for monitoring status */
+};
 /* Sources for status LED configuration.  Values are register values
 * plus 1 to allow for a zero default for preserve.
 */
diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h
index 8a5509877192..ee24ef8ab616 100644
--- a/include/linux/mmdebug.h
+++ b/include/linux/mmdebug.h
@@ -1,8 +1,6 @@
 #ifndef LINUX_MM_DEBUG_H
 #define LINUX_MM_DEBUG_H 1
-#include <linux/autoconf.h>
 #ifdef CONFIG_DEBUG_VM
 #define VM_BUG_ON(cond) BUG_ON(cond)
 #else
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 6f7561730d88..30fe668c2542 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -15,7 +15,7 @@
 #include <linux/seqlock.h>
 #include <linux/nodemask.h>
 #include <linux/pageblock-flags.h>
-#include <linux/bounds.h>
+#include <generated/bounds.h>
 #include <asm/atomic.h>
 #include <asm/page.h>
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index feee2ba8d06a..5b59f35dcb8f 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -8,7 +8,7 @@
 #include <linux/types.h>
 #ifndef __GENERATING_BOUNDS_H
 #include <linux/mm_types.h>
-#include <linux/bounds.h>
+#include <generated/bounds.h>
 #endif /* !__GENERATING_BOUNDS_H */
 /*
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 490c5b37b6d7..030d92255c7a 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -35,6 +35,8 @@
 #ifndef __LINUX_REGULATOR_CONSUMER_H_
 #define __LINUX_REGULATOR_CONSUMER_H_
+#include <linux/device.h>
 /*
 * Regulator operating modes.
 *
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 87f5f176d4ef..234a8476cba8 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -43,16 +43,20 @@ struct regulator;
 /**
 * struct regulator_state - regulator state during low power system states
 *
- * This describes a regulators state during a system wide low power state.
+ * This describes a regulators state during a system wide low power
+ * state.  One of enabled or disabled must be set for the
+ * configuration to be applied.
 *
 * @uV: Operating voltage during suspend.
 * @mode: Operating mode during suspend.
 * @enabled: Enabled during suspend.
+ * @disabled: Disabled during suspend.
 */
 struct regulator_state {
        int uV; /* suspend voltage */
        unsigned int mode; /* suspend regulator operating mode */
        int enabled; /* is regulator enabled in this suspend state */
+        int disabled; /* is the regulator disbled in this suspend state */
 };
 /**
diff --git a/include/linux/regulator/max8660.h b/include/linux/regulator/max8660.h
new file mode 100644
index 000000000000..9936763621c7
--- /dev/null
+++ b/include/linux/regulator/max8660.h
@@ -0,0 +1,57 @@
+/*
+ * max8660.h  --  Voltage regulation for the Maxim 8660/8661
+ *
+ * Copyright (C) 2009 Wolfram Sang, Pengutronix e.K.
+ *
+ * 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; version 2 of the License.
+ *
+ * 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
+ */
+#ifndef __LINUX_REGULATOR_MAX8660_H
+#define __LINUX_REGULATOR_MAX8660_H
+#include <linux/regulator/machine.h>
+enum {
+        MAX8660_V3,
+        MAX8660_V4,
+        MAX8660_V5,
+        MAX8660_V6,
+        MAX8660_V7,
+        MAX8660_V_END,
+};
+/**
+ * max8660_subdev_data - regulator subdev data
+ * @id: regulator id
+ * @name: regulator name
+ * @platform_data: regulator init data
+ */
+struct max8660_subdev_data {
+        int                             id;
+        char                            *name;
+        struct regulator_init_data      *platform_data;
+};
+/**
+ * max8660_platform_data - platform data for max8660
+ * @num_subdevs: number of regulators used
+ * @subdevs: pointer to regulators used
+ * @en34_is_high: if EN34 is driven high, regulators cannot be en-/disabled.
+ */
+struct max8660_platform_data {
+        int num_subdevs;
+        struct max8660_subdev_data *subdevs;
+        unsigned en34_is_high:1;
+};
+#endif
diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
index 79b9837d9ca0..cf97b5b9d1fe 100644
--- a/include/linux/vermagic.h
+++ b/include/linux/vermagic.h
@@ -1,4 +1,4 @@
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/module.h>
 /* Simply sanity version stamp for modules. */
diff --git a/init/Makefile b/init/Makefile
index 4a243df426f7..0bf677aa0872 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -15,12 +15,8 @@ mounts-$(CONFIG_BLK_DEV_RAM)	+= do_mounts_rd.o
 mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o
 mounts-$(CONFIG_BLK_DEV_MD)     += do_mounts_md.o
-# files to be removed upon make clean
-clean-files := ../include/linux/compile.h
 # dependencies on generated files need to be listed explicitly
+$(obj)/version.o: include/generated/compile.h
-$(obj)/version.o: include/linux/compile.h
 # compile.h changes depending on hostname, generation number, etc,
 # so we regenerate it always.
@@ -30,7 +26,7 @@ $(obj)/version.o: include/linux/compile.h
       chk_compile.h = :
 quiet_chk_compile.h = echo '  CHK     $@'
 silent_chk_compile.h = :
-include/linux/compile.h: FORCE
+include/generated/compile.h: FORCE
        @$($(quiet)chk_compile.h)
        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
        "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
diff --git a/init/version.c b/init/version.c
index 52a8b98642b8..adff586401a5 100644
--- a/init/version.c
+++ b/init/version.c
@@ -6,11 +6,11 @@
 *  May be freely distributed as part of Linux.
 */
-#include <linux/compile.h>
+#include <generated/compile.h>
 #include <linux/module.h>
 #include <linux/uts.h>
 #include <linux/utsname.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/version.h>
 #ifndef CONFIG_KALLSYMS
diff --git a/kernel/bounds.c b/kernel/bounds.c
index 3c5301381837..98a51f26c136 100644
--- a/kernel/bounds.c
+++ b/kernel/bounds.c
@@ -12,7 +12,7 @@
 void foo(void)
 {
-        /* The enum constants to put into include/linux/bounds.h */
+        /* The enum constants to put into include/generated/bounds.h */
        DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS);
        DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES);
        /* End of constants */
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 433e9fcc1fc5..a9a93d9ee7a7 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -21,7 +21,7 @@
 #include <linux/hardirq.h>
 #include <linux/elf.h>
 #include <linux/elfcore.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/utsname.h>
 #include <linux/numa.h>
 #include <linux/suspend.h>
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 06ba26747d7e..8b9f20ab8eed 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -12,7 +12,7 @@
 *  Copyright (C) 2004 William Lee Irwin III
 */
 #include <linux/ring_buffer.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/stacktrace.h>
 #include <linux/writeback.h>
 #include <linux/kallsyms.h>
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c67e73ecd5be..ed2773edfe71 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -149,6 +149,12 @@ ld-option = $(call try-run,\
 # $(Q)$(MAKE) $(build)=dir
 build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
+###
+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.modbuiltin obj=
+# Usage:
+# $(Q)$(MAKE) $(modbuiltin)=dir
+modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin obj
 # Prefix -I with $(srctree) if it is not an absolute path.
 # skip if -I has no parameter
 addtree = $(if $(patsubst -I%,%,$(1)), \
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 224d85e72ef1..cd815ac2a50b 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -213,7 +213,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
 # Bzip2 and LZMA do not include size in file... so we have to fake that;
 # append the size as a 32-bit littleendian number as gzip does.
-size_append = /bin/echo -ne $(shell                                     \
+size_append = printf $(shell                                            \
 dec_size=0;                                                             \
 for F in $1; do                                                         \
        fsize=$$(stat -c "%s" $$F);                                     \
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
new file mode 100644
index 000000000000..102a276f6eea
--- /dev/null
+++ b/scripts/Makefile.modbuiltin
@@ -0,0 +1,55 @@
+# ==========================================================================
+# Generating modules.builtin
+# ==========================================================================
+src := $(obj)
+PHONY := __modbuiltin
+__modbuiltin:
+-include include/config/auto.conf
+# tristate.conf sets tristate variables to uppercase 'Y' or 'M'
+# That way, we get the list of built-in modules in obj-Y
+-include include/config/tristate.conf
+include scripts/Kbuild.include
+# The filename Kbuild has precedence over Makefile
+kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
+kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
+include $(kbuild-file)
+include scripts/Makefile.lib
+__subdir-Y     := $(patsubst %/,%,$(filter %/, $(obj-Y)))
+subdir-Y       += $(__subdir-Y)
+subdir-ym      := $(sort $(subdir-y) $(subdir-Y) $(subdir-m))
+subdir-ym      := $(addprefix $(obj)/,$(subdir-ym))
+obj-Y          := $(addprefix $(obj)/,$(obj-Y))
+modbuiltin-subdirs := $(patsubst %,%/modules.builtin, $(subdir-ym))
+modbuiltin-mods    := $(filter %.ko, $(obj-Y:.o=.ko))
+modbuiltin-target  := $(obj)/modules.builtin
+__modbuiltin: $(modbuiltin-target) $(subdir-ym)
+        @:
+$(modbuiltin-target): $(subdir-ym) FORCE
+        $(Q)(for m in $(modbuiltin-mods); do echo kernel/$$m; done;     \
+        cat /dev/null $(modbuiltin-subdirs)) > $@
+PHONY += FORCE
+FORCE:
+# Descending
+# ---------------------------------------------------------------------------
+PHONY += $(subdir-ym)
+$(subdir-ym):
+        $(Q)$(MAKE) $(modbuiltin)=$@
+# 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/basic/fixdep.c b/scripts/basic/fixdep.c
index 6bf21f83837d..ea26b23de082 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -16,15 +16,15 @@
 * tells make when to remake a file.
 *
 * To use this list as-is however has the drawback that virtually
- * every file in the kernel includes <linux/autoconf.h>.
+ * every file in the kernel includes autoconf.h.
 *
- * If the user re-runs make *config, linux/autoconf.h will be
+ * If the user re-runs make *config, autoconf.h will be
 * regenerated.  make notices that and will rebuild every file which
 * includes autoconf.h, i.e. basically all files. This is extremely
 * annoying if the user just changed CONFIG_HIS_DRIVER from n to m.
 *
 * So we play the same trick that "mkdep" played before. We replace
- * the dependency on linux/autoconf.h by a dependency on every config
+ * the dependency on autoconf.h by a dependency on every config
 * option which is mentioned in any of the listed prequisites.
 *
 * kconfig populates a tree in include/config/ with an empty file
@@ -73,7 +73,7 @@
 *   cmd_<target> = <cmdline>
 *
 * and then basically copies the .<target>.d file to stdout, in the
- * process filtering out the dependency on linux/autoconf.h and adding
+ * process filtering out the dependency on autoconf.h and adding
 * dependencies on include/config/my/option.h for every
 * CONFIG_MY_OPTION encountered in any of the prequisites.
 *
@@ -324,7 +324,7 @@ static void parse_dep_file(void *map, size_t len)
                        p++;
                }
                memcpy(s, m, p-m); s[p-m] = 0;
-                if (strrcmp(s, "include/linux/autoconf.h") &&
+                if (strrcmp(s, "include/generated/autoconf.h") &&
                    strrcmp(s, "arch/um/include/uml-config.h") &&
                    strrcmp(s, ".ver")) {
                        printf("  %s \\\n", s);
diff --git a/scripts/genksyms/keywords.c_shipped b/scripts/genksyms/keywords.c_shipped
index 287467a2e8c7..8060e06798b3 100644
--- a/scripts/genksyms/keywords.c_shipped
+++ b/scripts/genksyms/keywords.c_shipped
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
+/* ANSI-C code produced by gperf version 3.0.4 */
 /* Command-line: gperf -L ANSI-C -a -C -E -g -H is_reserved_hash -k '1,3,$' -N is_reserved_word -p -t scripts/genksyms/keywords.gperf  */
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -34,7 +34,7 @@ struct resword;
 static const struct resword *is_reserved_word(register const char *str, register unsigned int len);
 #line 5 "scripts/genksyms/keywords.gperf"
 struct resword { const char *name; int token; };
-/* maximum key range = 62, duplicates = 0 */
+/* maximum key range = 64, duplicates = 0 */
 #ifdef __GNUC__
 __inline
@@ -48,39 +48,39 @@ is_reserved_hash (register const char *str, register unsigned int len)
 {
  static const unsigned char asso_values[] =
    {
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65,  5,
+      67, 67, 67, 67, 67, 67, 67, 67, 67,  0,
-      65, 65, 65, 65, 65, 65, 35, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 15, 67, 67, 67,
-       0, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+       0, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65,  0, 65,  0, 65,  5,
+      67, 67, 67, 67, 67,  0, 67,  0, 67,  5,
-      20, 15, 10, 30, 65, 15, 65, 65, 20,  0,
+      25, 20, 15, 30, 67, 15, 67, 67, 10,  0,
-      10, 35, 20, 65, 10,  5,  0, 10,  5, 65,
+      10, 40, 20, 67, 10,  5,  0, 10, 15, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      65, 65, 65, 65, 65, 65
+      67, 67, 67, 67, 67, 67
    };
  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];
 }
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
@@ -89,116 +89,119 @@ is_reserved_word (register const char *str, register unsigned int len)
 {
  enum
    {
-      TOTAL_KEYWORDS = 43,
+      TOTAL_KEYWORDS = 45,
      MIN_WORD_LENGTH = 3,
      MAX_WORD_LENGTH = 24,
      MIN_HASH_VALUE = 3,
-      MAX_HASH_VALUE = 64
+      MAX_HASH_VALUE = 66
    };
  static const struct resword wordlist[] =
    {
      {""}, {""}, {""},
-#line 28 "scripts/genksyms/keywords.gperf"
+#line 30 "scripts/genksyms/keywords.gperf"
      {"asm", ASM_KEYW},
      {""},
-#line 10 "scripts/genksyms/keywords.gperf"
+#line 12 "scripts/genksyms/keywords.gperf"
      {"__asm", ASM_KEYW},
      {""},
-#line 11 "scripts/genksyms/keywords.gperf"
+#line 13 "scripts/genksyms/keywords.gperf"
      {"__asm__", ASM_KEYW},
      {""}, {""},
-#line 54 "scripts/genksyms/keywords.gperf"
+#line 56 "scripts/genksyms/keywords.gperf"
      {"__typeof__", TYPEOF_KEYW},
      {""},
-#line 14 "scripts/genksyms/keywords.gperf"
+#line 16 "scripts/genksyms/keywords.gperf"
      {"__const", CONST_KEYW},
-#line 13 "scripts/genksyms/keywords.gperf"
-      {"__attribute__", ATTRIBUTE_KEYW},
 #line 15 "scripts/genksyms/keywords.gperf"
+      {"__attribute__", ATTRIBUTE_KEYW},
+#line 17 "scripts/genksyms/keywords.gperf"
      {"__const__", CONST_KEYW},
-#line 20 "scripts/genksyms/keywords.gperf"
+#line 22 "scripts/genksyms/keywords.gperf"
      {"__signed__", SIGNED_KEYW},
-#line 46 "scripts/genksyms/keywords.gperf"
+#line 48 "scripts/genksyms/keywords.gperf"
      {"static", STATIC_KEYW},
-#line 22 "scripts/genksyms/keywords.gperf"
+      {""},
-      {"__volatile__", VOLATILE_KEYW},
+#line 43 "scripts/genksyms/keywords.gperf"
-#line 41 "scripts/genksyms/keywords.gperf"
      {"int", INT_KEYW},
-#line 34 "scripts/genksyms/keywords.gperf"
+#line 36 "scripts/genksyms/keywords.gperf"
      {"char", CHAR_KEYW},
-#line 35 "scripts/genksyms/keywords.gperf"
+#line 37 "scripts/genksyms/keywords.gperf"
      {"const", CONST_KEYW},
-#line 47 "scripts/genksyms/keywords.gperf"
+#line 49 "scripts/genksyms/keywords.gperf"
      {"struct", STRUCT_KEYW},
-#line 26 "scripts/genksyms/keywords.gperf"
+#line 28 "scripts/genksyms/keywords.gperf"
      {"__restrict__", RESTRICT_KEYW},
-#line 27 "scripts/genksyms/keywords.gperf"
+#line 29 "scripts/genksyms/keywords.gperf"
      {"restrict", RESTRICT_KEYW},
-#line 25 "scripts/genksyms/keywords.gperf"
+#line 9 "scripts/genksyms/keywords.gperf"
-      {"_restrict", RESTRICT_KEYW},
+      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},
-#line 18 "scripts/genksyms/keywords.gperf"
+#line 20 "scripts/genksyms/keywords.gperf"
      {"__inline__", INLINE_KEYW},
-#line 12 "scripts/genksyms/keywords.gperf"
-      {"__attribute", ATTRIBUTE_KEYW},
      {""},
-#line 16 "scripts/genksyms/keywords.gperf"
+#line 24 "scripts/genksyms/keywords.gperf"
+      {"__volatile__", VOLATILE_KEYW},
+#line 7 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},
+#line 27 "scripts/genksyms/keywords.gperf"
+      {"_restrict", RESTRICT_KEYW},
+      {""},
+#line 14 "scripts/genksyms/keywords.gperf"
+      {"__attribute", ATTRIBUTE_KEYW},
+#line 8 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
+#line 18 "scripts/genksyms/keywords.gperf"
      {"__extension__", EXTENSION_KEYW},
-#line 37 "scripts/genksyms/keywords.gperf"
+#line 39 "scripts/genksyms/keywords.gperf"
      {"enum", ENUM_KEYW},
-#line 21 "scripts/genksyms/keywords.gperf"
+#line 10 "scripts/genksyms/keywords.gperf"
-      {"__volatile", VOLATILE_KEYW},
+      {"EXPORT_UNUSED_SYMBOL", EXPORT_SYMBOL_KEYW},
-#line 38 "scripts/genksyms/keywords.gperf"
+#line 40 "scripts/genksyms/keywords.gperf"
      {"extern", EXTERN_KEYW},
      {""},
-#line 19 "scripts/genksyms/keywords.gperf"
+#line 21 "scripts/genksyms/keywords.gperf"
      {"__signed", SIGNED_KEYW},
-#line 9 "scripts/genksyms/keywords.gperf"
+#line 11 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},
+      {"EXPORT_UNUSED_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
-      {""},
+#line 51 "scripts/genksyms/keywords.gperf"
-#line 53 "scripts/genksyms/keywords.gperf"
+      {"union", UNION_KEYW},
+#line 55 "scripts/genksyms/keywords.gperf"
      {"typeof", TYPEOF_KEYW},
-#line 48 "scripts/genksyms/keywords.gperf"
+#line 50 "scripts/genksyms/keywords.gperf"
      {"typedef", TYPEDEF_KEYW},
-#line 17 "scripts/genksyms/keywords.gperf"
+#line 19 "scripts/genksyms/keywords.gperf"
      {"__inline", INLINE_KEYW},
-#line 33 "scripts/genksyms/keywords.gperf"
+#line 35 "scripts/genksyms/keywords.gperf"
      {"auto", AUTO_KEYW},
-#line 49 "scripts/genksyms/keywords.gperf"
+#line 23 "scripts/genksyms/keywords.gperf"
-      {"union", UNION_KEYW},
+      {"__volatile", VOLATILE_KEYW},
-      {""}, {""},
-#line 50 "scripts/genksyms/keywords.gperf"
-      {"unsigned", UNSIGNED_KEYW},
-#line 51 "scripts/genksyms/keywords.gperf"
-      {"void", VOID_KEYW},
-#line 44 "scripts/genksyms/keywords.gperf"
-      {"short", SHORT_KEYW},
      {""}, {""},
 #line 52 "scripts/genksyms/keywords.gperf"
-      {"volatile", VOLATILE_KEYW},
+      {"unsigned", UNSIGNED_KEYW},
-      {""},
-#line 39 "scripts/genksyms/keywords.gperf"
-      {"float", FLOAT_KEYW},
-#line 36 "scripts/genksyms/keywords.gperf"
-      {"double", DOUBLE_KEYW},
      {""},
-#line 7 "scripts/genksyms/keywords.gperf"
+#line 46 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},
+      {"short", SHORT_KEYW},
-      {""}, {""},
+#line 42 "scripts/genksyms/keywords.gperf"
-#line 40 "scripts/genksyms/keywords.gperf"
      {"inline", INLINE_KEYW},
-#line 8 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
-#line 43 "scripts/genksyms/keywords.gperf"
-      {"register", REGISTER_KEYW},
      {""},
-#line 24 "scripts/genksyms/keywords.gperf"
+#line 54 "scripts/genksyms/keywords.gperf"
+      {"volatile", VOLATILE_KEYW},
+#line 44 "scripts/genksyms/keywords.gperf"
+      {"long", LONG_KEYW},
+#line 26 "scripts/genksyms/keywords.gperf"
      {"_Bool", BOOL_KEYW},
-#line 45 "scripts/genksyms/keywords.gperf"
-      {"signed", SIGNED_KEYW},
      {""}, {""},
-#line 42 "scripts/genksyms/keywords.gperf"
+#line 45 "scripts/genksyms/keywords.gperf"
-      {"long", LONG_KEYW}
+      {"register", REGISTER_KEYW},
+#line 53 "scripts/genksyms/keywords.gperf"
+      {"void", VOID_KEYW},
+#line 41 "scripts/genksyms/keywords.gperf"
+      {"float", FLOAT_KEYW},
+#line 38 "scripts/genksyms/keywords.gperf"
+      {"double", DOUBLE_KEYW},
+      {""}, {""}, {""}, {""},
+#line 47 "scripts/genksyms/keywords.gperf"
+      {"signed", SIGNED_KEYW}
    };
  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/scripts/genksyms/keywords.gperf b/scripts/genksyms/keywords.gperf
index 8fe977a4d57b..e6349acb6f2f 100644
--- a/scripts/genksyms/keywords.gperf
+++ b/scripts/genksyms/keywords.gperf
@@ -7,6 +7,8 @@ struct resword { const char *name; int token; }
 EXPORT_SYMBOL, EXPORT_SYMBOL_KEYW
 EXPORT_SYMBOL_GPL, EXPORT_SYMBOL_KEYW
 EXPORT_SYMBOL_GPL_FUTURE, EXPORT_SYMBOL_KEYW
+EXPORT_UNUSED_SYMBOL, EXPORT_SYMBOL_KEYW
+EXPORT_UNUSED_SYMBOL_GPL, EXPORT_SYMBOL_KEYW
 __asm, ASM_KEYW
 __asm__, ASM_KEYW
 __attribute, ATTRIBUTE_KEYW
diff --git a/scripts/headers.sh b/scripts/headers.sh
index 0308ecc10d5b..1ddcdd38d97f 100755
--- a/scripts/headers.sh
+++ b/scripts/headers.sh
@@ -8,8 +8,6 @@ do_command()
 {
        if [ -f ${srctree}/arch/$2/include/asm/Kbuild ]; then
                make ARCH=$2 KBUILD_HEADERS=$1 headers_$1
-        elif [ -f ${srctree}/include/asm-$2/Kbuild ]; then
-                make ARCH=$2 KBUILD_HEADERS=$1 headers_$1
        else
                printf "Ignoring arch: %s\n" ${arch}
        fi
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 80599e3a7994..999e8a7d5bf7 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -27,6 +27,7 @@ oldconfig: $(obj)/conf
        $< -o $(Kconfig)
 silentoldconfig: $(obj)/conf
+        $(Q)mkdir -p include/generated
        $< -s $(Kconfig)
 localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index b55e72ff2fc6..c4dec80cfd8e 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -677,7 +677,7 @@ int conf_write_autoconf(void)
        struct symbol *sym;
        const char *str;
        const char *name;
-        FILE *out, *out_h;
+        FILE *out, *tristate, *out_h;
        time_t now;
        int i, l;
@@ -692,9 +692,16 @@ int conf_write_autoconf(void)
        if (!out)
                return 1;
+        tristate = fopen(".tmpconfig_tristate", "w");
+        if (!tristate) {
+                fclose(out);
+                return 1;
+        }
        out_h = fopen(".tmpconfig.h", "w");
        if (!out_h) {
                fclose(out);
+                fclose(tristate);
                return 1;
        }
@@ -707,6 +714,9 @@ int conf_write_autoconf(void)
                     "# %s"
                     "#\n",
                     sym_get_string_value(sym), ctime(&now));
+        fprintf(tristate, "#\n"
+                          "# Automatically generated - do not edit\n"
+                          "\n");
        fprintf(out_h, "/*\n"
                       " * Automatically generated C config: don't edit\n"
                       " * Linux kernel version: %s\n"
@@ -727,10 +737,14 @@ int conf_write_autoconf(void)
                                break;
                        case mod:
                                fprintf(out, "CONFIG_%s=m\n", sym->name);
+                                fprintf(tristate, "CONFIG_%s=M\n", sym->name);
                                fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
                                break;
                        case yes:
                                fprintf(out, "CONFIG_%s=y\n", sym->name);
+                                if (sym->type == S_TRISTATE)
+                                        fprintf(tristate, "CONFIG_%s=Y\n",
+                                                        sym->name);
                                fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
                                break;
                        }
@@ -772,13 +786,19 @@ int conf_write_autoconf(void)
                }
        }
        fclose(out);
+        fclose(tristate);
        fclose(out_h);
        name = getenv("KCONFIG_AUTOHEADER");
        if (!name)
-                name = "include/linux/autoconf.h";
+                name = "include/generated/autoconf.h";
        if (rename(".tmpconfig.h", name))
                return 1;
+        name = getenv("KCONFIG_TRISTATE");
+        if (!name)
+                name = "include/config/tristate.conf";
+        if (rename(".tmpconfig_tristate", name))
+                return 1;
        name = conf_get_autoconfig_name();
        /*
         * This must be the last step, kbuild has a dependency on auto.conf
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index bce3d0fe6fbd..23dbad80cce9 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -14,7 +14,7 @@ vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; }
 # So "sudo make install" won't change the "compiled by <user>"
 # do "compiled by root"
-if [ -r $TARGET -a ! -O include/linux/autoconf.h ]; then
+if [ -r $TARGET -a ! -O include/generated/autoconf.h ]; then
  vecho "  SKIPPED $TARGET"
  exit 0
 fi
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 6c4ffc767b91..20923613467c 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "modpost.h"
-#include "../../include/linux/autoconf.h"
+#include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
 /* Some toolchains use a `_' prefix for all user symbols. */
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index f67cc885c807..62fcc3a7f4d3 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -77,9 +77,27 @@ clean-files += $(objtree)/binkernel.spec
 # Deb target
 # ---------------------------------------------------------------------------
+quiet_cmd_builddeb = BUILDDEB
+      cmd_builddeb = set -e; \
+        test `id -u` = 0 || \
+        test -n "$(KBUILD_PKG_ROOTCMD)" || { \
+                which fakeroot >/dev/null 2>&1 && \
+                KBUILD_PKG_ROOTCMD="fakeroot -u"; \
+        } || { \
+                echo; \
+                echo "builddeb must be run as root (or using fakeroot)."; \
+                echo "KBUILD_PKG_ROOTCMD is unset and fakeroot not found."; \
+                echo "Try setting KBUILD_PKG_ROOTCMD to a command to acquire"; \
+                echo "root privileges (e.g., 'fakeroot -u' or 'sudo')."; \
+                false; \
+        } && \
+        \
+        $$KBUILD_PKG_ROOTCMD $(CONFIG_SHELL) \
+                $(srctree)/scripts/package/builddeb
 deb-pkg: FORCE
        $(MAKE) KBUILD_SRC=
-        $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
+        $(call cmd,builddeb)
 clean-dirs += $(objtree)/debian/
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index b1fd48db1640..51b2aa0acb82 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -101,7 +101,11 @@ esac
 #
 (
        cd "${tmpdir}"
-        tar cf - . | ${compress} > "${tarball}${file_ext}"
+        opts=
+        if tar --owner=root --group=root --help >/dev/null 2>&1; then
+                opts="--owner=root --group=root"
+        fi
+        tar cf - . $opts | ${compress} > "${tarball}${file_ext}"
 )
 echo "Tarball successfully created in ${tarball}${file_ext}"
diff --git a/scripts/tags.sh b/scripts/tags.sh
index d52f7a01557c..1a0c44d7c4a7 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -89,7 +89,13 @@ all_defconfigs()
 docscope()
 {
-        (echo \-k; echo \-q; all_sources) > cscope.files
+        # always use absolute paths for cscope, as recommended by cscope
+        # upstream
+        case "$tree" in
+                /*) ;;
+                *) tree=$PWD/$tree ;;
+        esac
+        (cd /; echo \-k; echo \-q; all_sources) > cscope.files
        cscope -b -f cscope.out
 }
diff --git a/scripts/unifdef.c b/scripts/unifdef.c
index 30d459fb0709..44d39785e50d 100644
--- a/scripts/unifdef.c
+++ b/scripts/unifdef.c
@@ -1,13 +1,5 @@
 /*
- * Copyright (c) 2002 - 2005 Tony Finch <dot@dotat.at>.  All rights reserved.
+ * Copyright (c) 2002 - 2009 Tony Finch <dot@dotat.at>
- *
- * This code is derived from software contributed to Berkeley by Dave Yost.
- * It was rewritten to support ANSI C by Tony Finch. The original version of
- * unifdef carried the following copyright notice. None of its code remains
- * in this version (though some of the names remain).
- *
- * Copyright (c) 1985, 1993
- *      The Regents of the University of California.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -31,23 +23,20 @@
 * SUCH DAMAGE.
 */
-#include <sys/cdefs.h>
+/*
+ * This code was derived from software contributed to Berkeley by Dave Yost.
+ * It was rewritten to support ANSI C by Tony Finch. The original version
+ * of unifdef carried the 4-clause BSD copyright licence. None of its code
+ * remains in this version (though some of the names remain) so it now
+ * carries a more liberal licence.
+ *
+ * The latest version is available from http://dotat.at/prog/unifdef
+ */
-#ifndef lint
+static const char * const copyright[] = {
-#if 0
+    "@(#) Copyright (c) 2002 - 2009 Tony Finch <dot@dotat.at>\n",
-static const char copyright[] =
+    "$dotat: unifdef/unifdef.c,v 1.190 2009/11/27 17:21:26 fanf2 Exp $",
-"@(#) Copyright (c) 1985, 1993\n\
+};
-        The Regents of the University of California.  All rights reserved.\n";
-#endif
-#ifdef __IDSTRING
-__IDSTRING(Berkeley, "@(#)unifdef.c     8.1 (Berkeley) 6/6/93");
-__IDSTRING(NetBSD, "$NetBSD: unifdef.c,v 1.8 2000/07/03 02:51:36 matt Exp $");
-__IDSTRING(dotat, "$dotat: things/unifdef.c,v 1.171 2005/03/08 12:38:48 fanf2 Exp $");
-#endif
-#endif /* not lint */
-#ifdef __FBSDID
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/unifdef/unifdef.c,v 1.20 2005/05/21 09:55:09 ru Exp $");
-#endif
 /*
 * unifdef - remove ifdef'ed lines
@@ -72,8 +61,6 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/unifdef/unifdef.c,v 1.20 2005/05
 #include <string.h>
 #include <unistd.h>
-size_t strlcpy(char *dst, const char *src, size_t siz);
 /* types of input lines: */
 typedef enum {
        LT_TRUEI,               /* a true #if with ignore flag */
@@ -90,6 +77,7 @@ typedef enum {
        LT_DODGY_LAST = LT_DODGY + LT_ENDIF,
        LT_PLAIN,               /* ordinary line */
        LT_EOF,                 /* end of file */
+        LT_ERROR,               /* unevaluable #if */
        LT_COUNT
 } Linetype;
@@ -100,7 +88,7 @@ static char const * const linetype_name[] = {
        "DODGY IF", "DODGY TRUE", "DODGY FALSE",
        "DODGY ELIF", "DODGY ELTRUE", "DODGY ELFALSE",
        "DODGY ELSE", "DODGY ENDIF",
-        "PLAIN", "EOF"
+        "PLAIN", "EOF", "ERROR"
 };
 /* state of #if processing */
@@ -168,11 +156,13 @@ static char const * const linestate_name[] = {
 * Globals.
 */
+static bool             compblank;              /* -B: compress blank lines */
+static bool             lnblank;                /* -b: blank deleted lines */
 static bool             complement;             /* -c: do the complement */
 static bool             debugging;              /* -d: debugging reports */
 static bool             iocccok;                /* -e: fewer IOCCC errors */
+static bool             strictlogic;            /* -K: keep ambiguous #ifs */
 static bool             killconsts;             /* -k: eval constant #ifs */
-static bool             lnblank;                /* -l: blank deleted lines */
 static bool             lnnum;                  /* -n: add #line directives */
 static bool             symlist;                /* -s: output symbol list */
 static bool             text;                   /* -t: this is a text file */
@@ -196,7 +186,9 @@ static bool             ignoring[MAXDEPTH];	/* ignore comments state */
 static int              stifline[MAXDEPTH];     /* start of current #if */
 static int              depth;                  /* current #if nesting */
 static int              delcount;               /* count of deleted lines */
-static bool             keepthis;               /* don't delete constant #if */
+static unsigned         blankcount;             /* count of blank lines */
+static unsigned         blankmax;               /* maximum recent blankcount */
+static bool             constexpr;              /* constant #if expression */
 static int              exitstat;               /* program exit status */
@@ -206,13 +198,14 @@ static void             done(void);
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         get_line(void);
+static Linetype         parseline(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
 static void             keywordedit(const char *);
 static void             nest(void);
 static void             process(void);
+static const char      *skipargs(const char *);
 static const char      *skipcomment(const char *);
 static const char      *skipsym(const char *);
 static void             state(Ifstate);
@@ -220,7 +213,7 @@ static int              strlcmp(const char *, const char *, size_t);
 static void             unnest(void);
 static void             usage(void);
-#define endsym(c) (!isalpha((unsigned char)c) && !isdigit((unsigned char)c) && c != '_')
+#define endsym(c) (!isalnum((unsigned char)c) && c != '_')
 /*
 * The main program.
@@ -230,7 +223,7 @@ main(int argc, char *argv[])
 {
        int opt;
-        while ((opt = getopt(argc, argv, "i:D:U:I:cdeklnst")) != -1)
+        while ((opt = getopt(argc, argv, "i:D:U:I:BbcdeKklnst")) != -1)
                switch (opt) {
                case 'i': /* treat stuff controlled by these symbols as text */
                        /*
@@ -255,6 +248,13 @@ main(int argc, char *argv[])
                case 'I':
                        /* no-op for compatibility with cpp */
                        break;
+                case 'B': /* compress blank lines around removed section */
+                        compblank = true;
+                        break;
+                case 'b': /* blank deleted lines instead of omitting them */
+                case 'l': /* backwards compatibility */
+                        lnblank = true;
+                        break;
                case 'c': /* treat -D as -U and vice versa */
                        complement = true;
                        break;
@@ -264,12 +264,12 @@ main(int argc, char *argv[])
                case 'e': /* fewer errors from dodgy lines */
                        iocccok = true;
                        break;
+                case 'K': /* keep ambiguous #ifs */
+                        strictlogic = true;
+                        break;
                case 'k': /* process constant #ifs */
                        killconsts = true;
                        break;
-                case 'l': /* blank deleted lines instead of omitting them */
-                        lnblank = true;
-                        break;
                case 'n': /* add #line directive after deleted lines */
                        lnnum = true;
                        break;
@@ -284,6 +284,8 @@ main(int argc, char *argv[])
                }
        argc -= optind;
        argv += optind;
+        if (compblank && lnblank)
+                errx(2, "-B and -b are mutually exclusive");
        if (argc > 1) {
                errx(2, "can only do one file");
        } else if (argc == 1 && strcmp(*argv, "-") != 0) {
@@ -302,7 +304,7 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
-        fprintf(stderr, "usage: unifdef [-cdeklnst] [-Ipath]"
+        fprintf(stderr, "usage: unifdef [-BbcdeKknst] [-Ipath]"
            " [-Dsym[=val]] [-Usym] [-iDsym[=val]] [-iUsym] ... [file]\n");
        exit(2);
 }
@@ -383,46 +385,46 @@ static state_fn * const trans_table[IS_COUNT][LT_COUNT] = {
 /* IS_OUTSIDE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Eelif, Eelif, Eelif, Eelse, Eendif,
  Oiffy, Oiffy, Fpass, Oif,   Oif,   Eelif, Eelif, Eelif, Eelse, Eendif,
-  print, done },
+  print, done,  abort },
 /* IS_FALSE_PREFIX */
 { Idrop, Idrop, Fdrop, Fdrop, Fdrop, Mpass, Strue, Sfalse,Selse, Dendif,
  Idrop, Idrop, Fdrop, Fdrop, Fdrop, Mpass, Eioccc,Eioccc,Eioccc,Eioccc,
-  drop,  Eeof },
+  drop,  Eeof,  abort },
 /* IS_TRUE_PREFIX */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Dfalse,Dfalse,Dfalse,Delse, Dendif,
  Oiffy, Oiffy, Fpass, Oif,   Oif,   Eioccc,Eioccc,Eioccc,Eioccc,Eioccc,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_PASS_MIDDLE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Pelif, Mtrue, Delif, Pelse, Pendif,
  Oiffy, Oiffy, Fpass, Oif,   Oif,   Pelif, Oelif, Oelif, Pelse, Pendif,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_FALSE_MIDDLE */
 { Idrop, Idrop, Fdrop, Fdrop, Fdrop, Pelif, Mtrue, Delif, Pelse, Pendif,
  Idrop, Idrop, Fdrop, Fdrop, Fdrop, Eioccc,Eioccc,Eioccc,Eioccc,Eioccc,
-  drop,  Eeof },
+  drop,  Eeof,  abort },
 /* IS_TRUE_MIDDLE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Melif, Melif, Melif, Melse, Pendif,
  Oiffy, Oiffy, Fpass, Oif,   Oif,   Eioccc,Eioccc,Eioccc,Eioccc,Pendif,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_PASS_ELSE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Eelif, Eelif, Eelif, Eelse, Pendif,
  Oiffy, Oiffy, Fpass, Oif,   Oif,   Eelif, Eelif, Eelif, Eelse, Pendif,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_FALSE_ELSE */
 { Idrop, Idrop, Fdrop, Fdrop, Fdrop, Eelif, Eelif, Eelif, Eelse, Dendif,
  Idrop, Idrop, Fdrop, Fdrop, Fdrop, Eelif, Eelif, Eelif, Eelse, Eioccc,
-  drop,  Eeof },
+  drop,  Eeof,  abort },
 /* IS_TRUE_ELSE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Eelif, Eelif, Eelif, Eelse, Dendif,
  Oiffy, Oiffy, Fpass, Oif,   Oif,   Eelif, Eelif, Eelif, Eelse, Eioccc,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_FALSE_TRAILER */
 { Idrop, Idrop, Fdrop, Fdrop, Fdrop, Dfalse,Dfalse,Dfalse,Delse, Dendif,
  Idrop, Idrop, Fdrop, Fdrop, Fdrop, Dfalse,Dfalse,Dfalse,Delse, Eioccc,
-  drop,  Eeof }
+  drop,  Eeof,  abort }
 /*TRUEI  FALSEI IF     TRUE   FALSE  ELIF   ELTRUE ELFALSE ELSE  ENDIF
  TRUEI  FALSEI IF     TRUE   FALSE  ELIF   ELTRUE ELFALSE ELSE  ENDIF (DODGY)
-  PLAIN  EOF */
+  PLAIN  EOF    ERROR */
 };
 /*
@@ -463,9 +465,11 @@ keywordedit(const char *replacement)
 static void
 nest(void)
 {
-        depth += 1;
+        if (depth > MAXDEPTH-1)
-        if (depth >= MAXDEPTH)
+                abort(); /* bug */
+        if (depth == MAXDEPTH-1)
                error("Too many levels of nesting");
+        depth += 1;
        stifline[depth] = linenum;
 }
 static void
@@ -490,15 +494,23 @@ flushline(bool keep)
        if (symlist)
                return;
        if (keep ^ complement) {
-                if (lnnum && delcount > 0)
+                bool blankline = tline[strspn(tline, " \t\n")] == '\0';
-                        printf("#line %d\n", linenum);
+                if (blankline && compblank && blankcount != blankmax) {
-                fputs(tline, stdout);
+                        delcount += 1;
-                delcount = 0;
+                        blankcount += 1;
+                } else {
+                        if (lnnum && delcount > 0)
+                                printf("#line %d\n", linenum);
+                        fputs(tline, stdout);
+                        delcount = 0;
+                        blankmax = blankcount = blankline ? blankcount + 1 : 0;
+                }
        } else {
                if (lnblank)
                        putc('\n', stdout);
                exitstat = 1;
                delcount += 1;
+                blankcount = 0;
        }
 }
@@ -510,9 +522,12 @@ process(void)
 {
        Linetype lineval;
+        /* When compressing blank lines, act as if the file
+           is preceded by a large number of blank lines. */
+        blankmax = blankcount = 1000;
        for (;;) {
                linenum++;
-                lineval = get_line();
+                lineval = parseline();
                trans_table[ifstate[depth]][lineval]();
                debug("process %s -> %s depth %d",
                    linetype_name[lineval],
@@ -526,7 +541,7 @@ process(void)
 * help from skipcomment().
 */
 static Linetype
-get_line(void)
+parseline(void)
 {
        const char *cp;
        int cursym;
@@ -595,9 +610,21 @@ get_line(void)
                        if (incomment)
                                linestate = LS_DIRTY;
                }
-                /* skipcomment should have changed the state */
+                /* skipcomment normally changes the state, except
-                if (linestate == LS_HASH)
+                   if the last line of the file lacks a newline, or
-                        abort(); /* bug */
+                   if there is too much whitespace in a directive */
+                if (linestate == LS_HASH) {
+                        size_t len = cp - tline;
+                        if (fgets(tline + len, MAXLINE - len, input) == NULL) {
+                                /* append the missing newline */
+                                tline[len+0] = '\n';
+                                tline[len+1] = '\0';
+                                cp++;
+                                linestate = LS_START;
+                        } else {
+                                linestate = LS_DIRTY;
+                        }
+                }
        }
        if (linestate == LS_DIRTY) {
                while (*cp != '\0')
@@ -610,17 +637,40 @@ get_line(void)
 /*
 * These are the binary operators that are supported by the expression
- * evaluator. Note that if support for division is added then we also
+ * evaluator.
- * need short-circuiting booleans because of divide-by-zero.
 */
-static int op_lt(int a, int b) { return (a < b); }
+static Linetype op_strict(int *p, int v, Linetype at, Linetype bt) {
-static int op_gt(int a, int b) { return (a > b); }
+        if(at == LT_IF || bt == LT_IF) return (LT_IF);
-static int op_le(int a, int b) { return (a <= b); }
+        return (*p = v, v ? LT_TRUE : LT_FALSE);
-static int op_ge(int a, int b) { return (a >= b); }
+}
-static int op_eq(int a, int b) { return (a == b); }
+static Linetype op_lt(int *p, Linetype at, int a, Linetype bt, int b) {
-static int op_ne(int a, int b) { return (a != b); }
+        return op_strict(p, a < b, at, bt);
-static int op_or(int a, int b) { return (a || b); }
+}
-static int op_and(int a, int b) { return (a && b); }
+static Linetype op_gt(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a > b, at, bt);
+}
+static Linetype op_le(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a <= b, at, bt);
+}
+static Linetype op_ge(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a >= b, at, bt);
+}
+static Linetype op_eq(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a == b, at, bt);
+}
+static Linetype op_ne(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a != b, at, bt);
+}
+static Linetype op_or(int *p, Linetype at, int a, Linetype bt, int b) {
+        if (!strictlogic && (at == LT_TRUE || bt == LT_TRUE))
+                return (*p = 1, LT_TRUE);
+        return op_strict(p, a || b, at, bt);
+}
+static Linetype op_and(int *p, Linetype at, int a, Linetype bt, int b) {
+        if (!strictlogic && (at == LT_FALSE || bt == LT_FALSE))
+                return (*p = 0, LT_FALSE);
+        return op_strict(p, a && b, at, bt);
+}
 /*
 * An evaluation function takes three arguments, as follows: (1) a pointer to
@@ -629,8 +679,8 @@ static int op_and(int a, int b) { return (a && b); }
 * value of the expression; and (3) a pointer to a char* that points to the
 * expression to be evaluated and that is updated to the end of the expression
 * when evaluation is complete. The function returns LT_FALSE if the value of
- * the expression is zero, LT_TRUE if it is non-zero, or LT_IF if the
+ * the expression is zero, LT_TRUE if it is non-zero, LT_IF if the expression
- * expression could not be evaluated.
+ * depends on an unknown symbol, or LT_ERROR if there is a parse failure.
 */
 struct ops;
@@ -649,7 +699,7 @@ static const struct ops {
        eval_fn *inner;
        struct op {
                const char *str;
-                int (*fn)(int, int);
+                Linetype (*fn)(int *, Linetype, int, Linetype, int);
        } op[5];
 } eval_ops[] = {
        { eval_table, { { "||", op_or } } },
@@ -664,8 +714,8 @@ static const struct ops {
 /*
 * Function for evaluating the innermost parts of expressions,
- * viz. !expr (expr) defined(symbol) symbol number
+ * viz. !expr (expr) number defined(symbol) symbol
- * We reset the keepthis flag when we find a non-constant subexpression.
+ * We reset the constexpr flag in the last two cases.
 */
 static Linetype
 eval_unary(const struct ops *ops, int *valp, const char **cpp)
@@ -673,68 +723,83 @@ eval_unary(const struct ops *ops, int *valp, const char **cpp)
        const char *cp;
        char *ep;
        int sym;
+        bool defparen;
+        Linetype lt;
        cp = skipcomment(*cpp);
        if (*cp == '!') {
                debug("eval%d !", ops - eval_ops);
                cp++;
-                if (eval_unary(ops, valp, &cp) == LT_IF) {
+                lt = eval_unary(ops, valp, &cp);
-                        *cpp = cp;
+                if (lt == LT_ERROR)
-                        return (LT_IF);
+                        return (LT_ERROR);
+                if (lt != LT_IF) {
+                        *valp = !*valp;
+                        lt = *valp ? LT_TRUE : LT_FALSE;
                }
-                *valp = !*valp;
        } else if (*cp == '(') {
                cp++;
                debug("eval%d (", ops - eval_ops);
-                if (eval_table(eval_ops, valp, &cp) == LT_IF)
+                lt = eval_table(eval_ops, valp, &cp);
-                        return (LT_IF);
+                if (lt == LT_ERROR)
+                        return (LT_ERROR);
                cp = skipcomment(cp);
                if (*cp++ != ')')
-                        return (LT_IF);
+                        return (LT_ERROR);
        } else if (isdigit((unsigned char)*cp)) {
                debug("eval%d number", ops - eval_ops);
                *valp = strtol(cp, &ep, 0);
+                if (ep == cp)
+                        return (LT_ERROR);
+                lt = *valp ? LT_TRUE : LT_FALSE;
                cp = skipsym(cp);
        } else if (strncmp(cp, "defined", 7) == 0 && endsym(cp[7])) {
                cp = skipcomment(cp+7);
                debug("eval%d defined", ops - eval_ops);
-                if (*cp++ != '(')
+                if (*cp == '(') {
-                        return (LT_IF);
+                        cp = skipcomment(cp+1);
-                cp = skipcomment(cp);
+                        defparen = true;
+                } else {
+                        defparen = false;
+                }
                sym = findsym(cp);
-                cp = skipsym(cp);
+                if (sym < 0) {
-                cp = skipcomment(cp);
+                        lt = LT_IF;
-                if (*cp++ != ')')
+                } else {
-                        return (LT_IF);
-                if (sym >= 0)
                        *valp = (value[sym] != NULL);
-                else {
+                        lt = *valp ? LT_TRUE : LT_FALSE;
-                        *cpp = cp;
-                        return (LT_IF);
                }
-                keepthis = false;
+                cp = skipsym(cp);
+                cp = skipcomment(cp);
+                if (defparen && *cp++ != ')')
+                        return (LT_ERROR);
+                constexpr = false;
        } else if (!endsym(*cp)) {
                debug("eval%d symbol", ops - eval_ops);
                sym = findsym(cp);
-                if (sym < 0)
+                cp = skipsym(cp);
-                        return (LT_IF);
+                if (sym < 0) {
-                if (value[sym] == NULL)
+                        lt = LT_IF;
+                        cp = skipargs(cp);
+                } else if (value[sym] == NULL) {
                        *valp = 0;
-                else {
+                        lt = LT_FALSE;
+                } else {
                        *valp = strtol(value[sym], &ep, 0);
                        if (*ep != '\0' || ep == value[sym])
-                                return (LT_IF);
+                                return (LT_ERROR);
+                        lt = *valp ? LT_TRUE : LT_FALSE;
+                        cp = skipargs(cp);
                }
-                cp = skipsym(cp);
+                constexpr = false;
-                keepthis = false;
        } else {
                debug("eval%d bad expr", ops - eval_ops);
-                return (LT_IF);
+                return (LT_ERROR);
        }
        *cpp = cp;
        debug("eval%d = %d", ops - eval_ops, *valp);
-        return (*valp ? LT_TRUE : LT_FALSE);
+        return (lt);
 }
 /*
@@ -746,11 +811,13 @@ eval_table(const struct ops *ops, int *valp, const char **cpp)
        const struct op *op;
        const char *cp;
        int val;
-        Linetype lhs, rhs;
+        Linetype lt, rt;
        debug("eval%d", ops - eval_ops);
        cp = *cpp;
-        lhs = ops->inner(ops+1, valp, &cp);
+        lt = ops->inner(ops+1, valp, &cp);
+        if (lt == LT_ERROR)
+                return (LT_ERROR);
        for (;;) {
                cp = skipcomment(cp);
                for (op = ops->op; op->str != NULL; op++)
@@ -760,32 +827,16 @@ eval_table(const struct ops *ops, int *valp, const char **cpp)
                        break;
                cp += strlen(op->str);
                debug("eval%d %s", ops - eval_ops, op->str);
-                rhs = ops->inner(ops+1, &val, &cp);
+                rt = ops->inner(ops+1, &val, &cp);
-                if (op->fn == op_and && (lhs == LT_FALSE || rhs == LT_FALSE)) {
+                if (rt == LT_ERROR)
-                        debug("eval%d: and always false", ops - eval_ops);
+                        return (LT_ERROR);
-                        if (lhs == LT_IF)
+                lt = op->fn(valp, lt, *valp, rt, val);
-                                *valp = val;
-                        lhs = LT_FALSE;
-                        continue;
-                }
-                if (op->fn == op_or && (lhs == LT_TRUE || rhs == LT_TRUE)) {
-                        debug("eval%d: or always true", ops - eval_ops);
-                        if (lhs == LT_IF)
-                                *valp = val;
-                        lhs = LT_TRUE;
-                        continue;
-                }
-                if (rhs == LT_IF)
-                        lhs = LT_IF;
-                if (lhs != LT_IF)
-                        *valp = op->fn(*valp, val);
        }
        *cpp = cp;
        debug("eval%d = %d", ops - eval_ops, *valp);
-        if (lhs != LT_IF)
+        debug("eval%d lt = %s", ops - eval_ops, linetype_name[lt]);
-                lhs = (*valp ? LT_TRUE : LT_FALSE);
+        return (lt);
-        return lhs;
 }
 /*
@@ -796,17 +847,14 @@ eval_table(const struct ops *ops, int *valp, const char **cpp)
 static Linetype
 ifeval(const char **cpp)
 {
-        const char *cp = *cpp;
        int ret;
-        int val;
+        int val = 0;
        debug("eval %s", *cpp);
-        keepthis = killconsts ? false : true;
+        constexpr = killconsts ? false : true;
-        ret = eval_table(eval_ops, &val, &cp);
+        ret = eval_table(eval_ops, &val, cpp);
-        if (ret != LT_IF)
-                *cpp = cp;
        debug("eval = %d", val);
-        return (keepthis ? LT_IF : ret);
+        return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
 }
 /*
@@ -918,6 +966,31 @@ skipcomment(const char *cp)
 }
 /*
+ * Skip macro arguments.
+ */
+static const char *
+skipargs(const char *cp)
+{
+        const char *ocp = cp;
+        int level = 0;
+        cp = skipcomment(cp);
+        if (*cp != '(')
+                return (cp);
+        do {
+                if (*cp == '(')
+                        level++;
+                if (*cp == ')')
+                        level--;
+                cp = skipcomment(cp+1);
+        } while (level != 0 && *cp != '\0');
+        if (level == 0)
+                return (cp);
+        else
+        /* Rewind and re-detect the syntax error later. */
+                return (ocp);
+}
+/*
 * Skip over an identifier.
 */
 static const char *
@@ -929,7 +1002,7 @@ skipsym(const char *cp)
 }
 /*
- * Look for the symbol in the symbol table. If is is found, we return
+ * Look for the symbol in the symbol table. If it is found, we return
 * the symbol table index, else we return -1.
 */
 static int
diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index 83b3dde1a83b..b2b3c2d1cf8b 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -354,7 +354,10 @@ static int cpio_mkfile(const char *name, const char *location,
                push_pad();
                if (size) {
-                        fwrite(filebuf, size, 1, stdout);
+                        if (fwrite(filebuf, size, 1, stdout) != 1) {
+                                fprintf(stderr, "writing filebuf failed\n");
+                                goto error;
+                        }
                        offset += size;
                        push_pad();
                }