Merge 3.7-rc1 usb-linus

Sync up to a known-good point in Linus's tree to build on.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

306 files changed, 11509 insertions, 6823 deletions

diff --git a/.gitignore b/.gitignore
index 57af07cf7e68..0f2f40f71915 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,10 @@
 *.o.*
 *.a
 *.s
+*.ko.unsigned
+*.ko.stripped
+*.ko.stripped.dig
+*.ko.stripped.sig
 *.ko
 *.so
 *.so.dbg
@@ -84,3 +88,13 @@ GTAGS
 *.orig
 *~
 \#*#
+
+#
+# Leavings from module signing
+#
+extra_certificates
+signing_key.priv
+signing_key.x509
+signing_key.x509.keyid
+signing_key.x509.signer
+x509.genkey
diff --git a/Documentation/crypto/asymmetric-keys.txt b/Documentation/crypto/asymmetric-keys.txt
new file mode 100644
index 000000000000..b7675904a747
--- /dev/null
+++ b/Documentation/crypto/asymmetric-keys.txt
@@ -0,0 +1,312 @@
+                =============================================
+                ASYMMETRIC / PUBLIC-KEY CRYPTOGRAPHY KEY TYPE
+                =============================================
+
+Contents:
+
+  - Overview.
+  - Key identification.
+  - Accessing asymmetric keys.
+    - Signature verification.
+  - Asymmetric key subtypes.
+  - Instantiation data parsers.
+
+
+========
+OVERVIEW
+========
+
+The "asymmetric" key type is designed to be a container for the keys used in
+public-key cryptography, without imposing any particular restrictions on the
+form or mechanism of the cryptography or form of the key.
+
+The asymmetric key is given a subtype that defines what sort of data is
+associated with the key and provides operations to describe and destroy it.
+However, no requirement is made that the key data actually be stored in the
+key.
+
+A completely in-kernel key retention and operation subtype can be defined, but
+it would also be possible to provide access to cryptographic hardware (such as
+a TPM) that might be used to both retain the relevant key and perform
+operations using that key.  In such a case, the asymmetric key would then
+merely be an interface to the TPM driver.
+
+Also provided is the concept of a data parser.  Data parsers are responsible
+for extracting information from the blobs of data passed to the instantiation
+function.  The first data parser that recognises the blob gets to set the
+subtype of the key and define the operations that can be done on that key.
+
+A data parser may interpret the data blob as containing the bits representing a
+key, or it may interpret it as a reference to a key held somewhere else in the
+system (for example, a TPM).
+
+
+==================
+KEY IDENTIFICATION
+==================
+
+If a key is added with an empty name, the instantiation data parsers are given
+the opportunity to pre-parse a key and to determine the description the key
+should be given from the content of the key.
+
+This can then be used to refer to the key, either by complete match or by
+partial match.  The key type may also use other criteria to refer to a key.
+
+The asymmetric key type's match function can then perform a wider range of
+comparisons than just the straightforward comparison of the description with
+the criterion string:
+
+ (1) If the criterion string is of the form "id:<hexdigits>" then the match
+     function will examine a key's fingerprint to see if the hex digits given
+     after the "id:" match the tail.  For instance:
+
+        keyctl search @s asymmetric id:5acc2142
+
+     will match a key with fingerprint:
+
+        1A00 2040 7601 7889 DE11  882C 3823 04AD 5ACC 2142
+
+ (2) If the criterion string is of the form "<subtype>:<hexdigits>" then the
+     match will match the ID as in (1), but with the added restriction that
+     only keys of the specified subtype (e.g. tpm) will be matched.  For
+     instance:
+
+        keyctl search @s asymmetric tpm:5acc2142
+
+Looking in /proc/keys, the last 8 hex digits of the key fingerprint are
+displayed, along with the subtype:
+
+        1a39e171 I-----     1 perm 3f010000     0     0 asymmetri modsign.0: DSA 5acc2142 []
+
+
+=========================
+ACCESSING ASYMMETRIC KEYS
+=========================
+
+For general access to asymmetric keys from within the kernel, the following
+inclusion is required:
+
+        #include <crypto/public_key.h>
+
+This gives access to functions for dealing with asymmetric / public keys.
+Three enums are defined there for representing public-key cryptography
+algorithms:
+
+        enum pkey_algo
+
+digest algorithms used by those:
+
+        enum pkey_hash_algo
+
+and key identifier representations:
+
+        enum pkey_id_type
+
+Note that the key type representation types are required because key
+identifiers from different standards aren't necessarily compatible.  For
+instance, PGP generates key identifiers by hashing the key data plus some
+PGP-specific metadata, whereas X.509 has arbitrary certificate identifiers.
+
+The operations defined upon a key are:
+
+ (1) Signature verification.
+
+Other operations are possible (such as encryption) with the same key data
+required for verification, but not currently supported, and others
+(eg. decryption and signature generation) require extra key data.
+
+
+SIGNATURE VERIFICATION
+----------------------
+
+An operation is provided to perform cryptographic signature verification, using
+an asymmetric key to provide or to provide access to the public key.
+
+        int verify_signature(const struct key *key,
+                             const struct public_key_signature *sig);
+
+The caller must have already obtained the key from some source and can then use
+it to check the signature.  The caller must have parsed the signature and
+transferred the relevant bits to the structure pointed to by sig.
+
+        struct public_key_signature {
+                u8 *digest;
+                u8 digest_size;
+                enum pkey_hash_algo pkey_hash_algo : 8;
+                u8 nr_mpi;
+                union {
+                        MPI mpi[2];
+                        ...
+                };
+        };
+
+The algorithm used must be noted in sig->pkey_hash_algo, and all the MPIs that
+make up the actual signature must be stored in sig->mpi[] and the count of MPIs
+placed in sig->nr_mpi.
+
+In addition, the data must have been digested by the caller and the resulting
+hash must be pointed to by sig->digest and the size of the hash be placed in
+sig->digest_size.
+
+The function will return 0 upon success or -EKEYREJECTED if the signature
+doesn't match.
+
+The function may also return -ENOTSUPP if an unsupported public-key algorithm
+or public-key/hash algorithm combination is specified or the key doesn't
+support the operation; -EBADMSG or -ERANGE if some of the parameters have weird
+data; or -ENOMEM if an allocation can't be performed.  -EINVAL can be returned
+if the key argument is the wrong type or is incompletely set up.
+
+
+=======================
+ASYMMETRIC KEY SUBTYPES
+=======================
+
+Asymmetric keys have a subtype that defines the set of operations that can be
+performed on that key and that determines what data is attached as the key
+payload.  The payload format is entirely at the whim of the subtype.
+
+The subtype is selected by the key data parser and the parser must initialise
+the data required for it.  The asymmetric key retains a reference on the
+subtype module.
+
+The subtype definition structure can be found in:
+
+        #include <keys/asymmetric-subtype.h>
+
+and looks like the following:
+
+        struct asymmetric_key_subtype {
+                struct module           *owner;
+                const char              *name;
+
+                void (*describe)(const struct key *key, struct seq_file *m);
+                void (*destroy)(void *payload);
+                int (*verify_signature)(const struct key *key,
+                                        const struct public_key_signature *sig);
+        };
+
+Asymmetric keys point to this with their type_data[0] member.
+
+The owner and name fields should be set to the owning module and the name of
+the subtype.  Currently, the name is only used for print statements.
+
+There are a number of operations defined by the subtype:
+
+ (1) describe().
+
+     Mandatory.  This allows the subtype to display something in /proc/keys
+     against the key.  For instance the name of the public key algorithm type
+     could be displayed.  The key type will display the tail of the key
+     identity string after this.
+
+ (2) destroy().
+
+     Mandatory.  This should free the memory associated with the key.  The
+     asymmetric key will look after freeing the fingerprint and releasing the
+     reference on the subtype module.
+
+ (3) verify_signature().
+
+     Optional.  These are the entry points for the key usage operations.
+     Currently there is only the one defined.  If not set, the caller will be
+     given -ENOTSUPP.  The subtype may do anything it likes to implement an
+     operation, including offloading to hardware.
+
+
+==========================
+INSTANTIATION DATA PARSERS
+==========================
+
+The asymmetric key type doesn't generally want to store or to deal with a raw
+blob of data that holds the key data.  It would have to parse it and error
+check it each time it wanted to use it.  Further, the contents of the blob may
+have various checks that can be performed on it (eg. self-signatures, validity
+dates) and may contain useful data about the key (identifiers, capabilities).
+
+Also, the blob may represent a pointer to some hardware containing the key
+rather than the key itself.
+
+Examples of blob formats for which parsers could be implemented include:
+
+ - OpenPGP packet stream [RFC 4880].
+ - X.509 ASN.1 stream.
+ - Pointer to TPM key.
+ - Pointer to UEFI key.
+
+During key instantiation each parser in the list is tried until one doesn't
+return -EBADMSG.
+
+The parser definition structure can be found in:
+
+        #include <keys/asymmetric-parser.h>
+
+and looks like the following:
+
+        struct asymmetric_key_parser {
+                struct module   *owner;
+                const char      *name;
+
+                int (*parse)(struct key_preparsed_payload *prep);
+        };
+
+The owner and name fields should be set to the owning module and the name of
+the parser.
+
+There is currently only a single operation defined by the parser, and it is
+mandatory:
+
+ (1) parse().
+
+     This is called to preparse the key from the key creation and update paths.
+     In particular, it is called during the key creation _before_ a key is
+     allocated, and as such, is permitted to provide the key's description in
+     the case that the caller declines to do so.
+
+     The caller passes a pointer to the following struct with all of the fields
+     cleared, except for data, datalen and quotalen [see
+     Documentation/security/keys.txt].
+
+        struct key_preparsed_payload {
+                char            *description;
+                void            *type_data[2];
+                void            *payload;
+                const void      *data;
+                size_t          datalen;
+                size_t          quotalen;
+        };
+
+     The instantiation data is in a blob pointed to by data and is datalen in
+     size.  The parse() function is not permitted to change these two values at
+     all, and shouldn't change any of the other values _unless_ they are
+     recognise the blob format and will not return -EBADMSG to indicate it is
+     not theirs.
+
+     If the parser is happy with the blob, it should propose a description for
+     the key and attach it to ->description, ->type_data[0] should be set to
+     point to the subtype to be used, ->payload should be set to point to the
+     initialised data for that subtype, ->type_data[1] should point to a hex
+     fingerprint and quotalen should be updated to indicate how much quota this
+     key should account for.
+
+     When clearing up, the data attached to ->type_data[1] and ->description
+     will be kfree()'d and the data attached to ->payload will be passed to the
+     subtype's ->destroy() method to be disposed of.  A module reference for
+     the subtype pointed to by ->type_data[0] will be put.
+
+
+     If the data format is not recognised, -EBADMSG should be returned.  If it
+     is recognised, but the key cannot for some reason be set up, some other
+     negative error code should be returned.  On success, 0 should be returned.
+
+     The key's fingerprint string may be partially matched upon.  For a
+     public-key algorithm such as RSA and DSA this will likely be a printable
+     hex version of the key's fingerprint.
+
+Functions are provided to register and unregister parsers:
+
+        int register_asymmetric_key_parser(struct asymmetric_key_parser *parser);
+        void unregister_asymmetric_key_parser(struct asymmetric_key_parser *subtype);
+
+Parsers may not have the same name.  The names are otherwise only used for
+displaying in debugging messages.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e2ed3360b708..9776f068306b 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1593,6 +1593,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         log everything. Information is printed at KERN_DEBUG
                         so loglevel=8 may also need to be specified.
 
+        module.sig_enforce
+                        [KNL] When CONFIG_MODULE_SIG is set, this means that
+                        modules without (valid) signatures will fail to load.
+                        Note that if CONFIG_MODULE_SIG_ENFORCE is set, that
+                        is always true, so this option does nothing.
+
         mousedev.tap_time=
                         [MOUSE] Maximum time between finger touching and
                         leaving touchpad surface for touch to be considered
diff --git a/Documentation/security/keys.txt b/Documentation/security/keys.txt
index aa0dbd74b71b..7d9ca92022d8 100644
--- a/Documentation/security/keys.txt
+++ b/Documentation/security/keys.txt
@@ -412,6 +412,10 @@ The main syscalls are:
      to the keyring. In this case, an error will be generated if the process
      does not have permission to write to the keyring.
 
+     If the key type supports it, if the description is NULL or an empty
+     string, the key type will try and generate a description from the content
+     of the payload.
+
      The payload is optional, and the pointer can be NULL if not required by
      the type. The payload is plen in size, and plen can be zero for an empty
      payload.
@@ -1114,12 +1118,53 @@ The structure has a number of fields, some of which are mandatory:
      it should return 0.
 
 
- (*) int (*instantiate)(struct key *key, const void *data, size_t datalen);
+ (*) int (*preparse)(struct key_preparsed_payload *prep);
+
+     This optional method permits the key type to attempt to parse payload
+     before a key is created (add key) or the key semaphore is taken (update or
+     instantiate key).  The structure pointed to by prep looks like:
+
+        struct key_preparsed_payload {
+                char            *description;
+                void            *type_data[2];
+                void            *payload;
+                const void      *data;
+                size_t          datalen;
+                size_t          quotalen;
+        };
+
+     Before calling the method, the caller will fill in data and datalen with
+     the payload blob parameters; quotalen will be filled in with the default
+     quota size from the key type and the rest will be cleared.
+
+     If a description can be proposed from the payload contents, that should be
+     attached as a string to the description field.  This will be used for the
+     key description if the caller of add_key() passes NULL or "".
+
+     The method can attach anything it likes to type_data[] and payload.  These
+     are merely passed along to the instantiate() or update() operations.
+
+     The method should return 0 if success ful or a negative error code
+     otherwise.
+
+     
+ (*) void (*free_preparse)(struct key_preparsed_payload *prep);
+
+     This method is only required if the preparse() method is provided,
+     otherwise it is unused.  It cleans up anything attached to the
+     description, type_data and payload fields of the key_preparsed_payload
+     struct as filled in by the preparse() method.
+
+
+ (*) int (*instantiate)(struct key *key, struct key_preparsed_payload *prep);
 
      This method is called to attach a payload to a key during construction.
      The payload attached need not bear any relation to the data passed to this
      function.
 
+     The prep->data and prep->datalen fields will define the original payload
+     blob.  If preparse() was supplied then other fields may be filled in also.
+
      If the amount of data attached to the key differs from the size in
      keytype->def_datalen, then key_payload_reserve() should be called.
 
@@ -1135,6 +1180,9 @@ The structure has a number of fields, some of which are mandatory:
      If this type of key can be updated, then this method should be provided.
      It is called to update a key's payload from the blob of data provided.
 
+     The prep->data and prep->datalen fields will define the original payload
+     blob.  If preparse() was supplied then other fields may be filled in also.
+
      key_payload_reserve() should be called if the data length might change
      before any changes are actually made. Note that if this succeeds, the type
      is committed to changing the key because it's already been altered, so all
diff --git a/Makefile b/Makefile
index 5d8e7f258388..5be2ee8c90e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
-PATCHLEVEL = 6
+PATCHLEVEL = 7
 SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -rc1
 NAME = Terrified Chipmunk
 
 # *DOCUMENTATION*
@@ -997,7 +997,10 @@ CLEAN_DIRS  += $(MODVERDIR)
 MRPROPER_DIRS  += include/config usr/include include/generated          \
                   arch/*/include/generated
 MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
-                  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
+                  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
+                  signing_key.priv signing_key.x509 x509.genkey         \
+                  extra_certificates signing_key.x509.keyid             \
+                  signing_key.x509.signer
 
 # clean - Delete most, but leave enough to build external modules
 #
@@ -1241,6 +1244,7 @@ clean: $(clean-dirs)
         $(call cmd,rmfiles)
         @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
                 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
+                -o -name '*.ko.*' \
                 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
                 -o -name '*.symtypes' -o -name 'modules.order' \
                 -o -name modules.builtin -o -name '.tmp_*.o.*' \
diff --git a/arch/Kconfig b/arch/Kconfig
index a79a1ad8bb96..366ec06a5185 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -322,4 +322,23 @@ config HAVE_IRQ_TIME_ACCOUNTING
 config HAVE_ARCH_TRANSPARENT_HUGEPAGE
         bool
 
+config HAVE_MOD_ARCH_SPECIFIC
+        bool
+        help
+          The arch uses struct mod_arch_specific to store data.  Many arches
+          just need a simple module loader without arch specific data - those
+          should not enable this.
+
+config MODULES_USE_ELF_RELA
+        bool
+        help
+          Modules only use ELF RELA relocations.  Modules with ELF REL
+          relocations will give an error.
+
+config MODULES_USE_ELF_REL
+        bool
+        help
+          Modules only use ELF REL relocations.  Modules with ELF RELA
+          relocations will give an error.
+
 source "kernel/gcov/Kconfig"
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 7a08cfb80ee8..5dd7f5db24d4 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -22,6 +22,8 @@ config ALPHA
         select GENERIC_STRNLEN_USER
         select GENERIC_KERNEL_THREAD
         select GENERIC_KERNEL_EXECVE
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
         help
           The Alpha is a 64-bit general-purpose processor designed and
           marketed by the Digital Equipment Corporation of blessed memory,
diff --git a/arch/alpha/include/asm/module.h b/arch/alpha/include/asm/module.h
index 7b63743c534a..9cd13b55155f 100644
--- a/arch/alpha/include/asm/module.h
+++ b/arch/alpha/include/asm/module.h
@@ -1,19 +1,13 @@
 #ifndef _ALPHA_MODULE_H
 #define _ALPHA_MODULE_H
 
+#include <asm-generic/module.h>
+
 struct mod_arch_specific
 {
         unsigned int gotsecindex;
 };
 
-#define Elf_Sym Elf64_Sym
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Ehdr Elf64_Ehdr
-#define Elf_Phdr Elf64_Phdr
-#define Elf_Dyn Elf64_Dyn
-#define Elf_Rel Elf64_Rel
-#define Elf_Rela Elf64_Rela
-
 #define ARCH_SHF_SMALL SHF_ALPHA_GPREL
 
 #ifdef MODULE
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 431c3753145a..73067efd4845 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1,59 +1,60 @@
 config ARM
         bool
         default y
+        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select ARCH_HAVE_CUSTOM_GPIO_H
-        select HAVE_AOUT
-        select HAVE_DMA_API_DEBUG
-        select HAVE_IDE if PCI || ISA || PCMCIA
-        select HAVE_DMA_ATTRS
-        select HAVE_DMA_CONTIGUOUS if MMU
-        select HAVE_MEMBLOCK
-        select RTC_LIB
-        select SYS_SUPPORTS_APM_EMULATION
+        select ARCH_WANT_IPC_PARSE_VERSION
+        select CPU_PM if (SUSPEND || CPU_IDLE)
+        select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
         select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
-        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
-        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
+        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+        select GENERIC_IRQ_PROBE
+        select GENERIC_IRQ_SHOW
+        select GENERIC_KERNEL_THREAD
+        select GENERIC_KERNEL_EXECVE
+        select GENERIC_PCI_IOMAP
+        select GENERIC_SMP_IDLE_THREAD
+        select GENERIC_STRNCPY_FROM_USER
+        select GENERIC_STRNLEN_USER
+        select HARDIRQS_SW_RESEND
+        select HAVE_AOUT
         select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
         select HAVE_ARCH_KGDB
         select HAVE_ARCH_TRACEHOOK
-        select HAVE_SYSCALL_TRACEPOINTS
-        select HAVE_KPROBES if !XIP_KERNEL
-        select HAVE_KRETPROBES if (HAVE_KPROBES)
-        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
-        select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
+        select HAVE_BPF_JIT
+        select HAVE_C_RECORDMCOUNT
+        select HAVE_DEBUG_KMEMLEAK
+        select HAVE_DMA_API_DEBUG
+        select HAVE_DMA_ATTRS
+        select HAVE_DMA_CONTIGUOUS if MMU
         select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)
+        select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
         select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
-        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
         select HAVE_GENERIC_DMA_COHERENT
-        select HAVE_DEBUG_KMEMLEAK
+        select HAVE_GENERIC_HARDIRQS
+        select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
+        select HAVE_IDE if PCI || ISA || PCMCIA
+        select HAVE_IRQ_WORK
         select HAVE_KERNEL_GZIP
-        select HAVE_KERNEL_LZO
         select HAVE_KERNEL_LZMA
+        select HAVE_KERNEL_LZO
         select HAVE_KERNEL_XZ
-        select HAVE_IRQ_WORK
+        select HAVE_KPROBES if !XIP_KERNEL
+        select HAVE_KRETPROBES if (HAVE_KPROBES)
+        select HAVE_MEMBLOCK
+        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
         select HAVE_PERF_EVENTS
-        select PERF_USE_VMALLOC
         select HAVE_REGS_AND_STACK_ACCESS_API
-        select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
-        select HAVE_C_RECORDMCOUNT
-        select HAVE_GENERIC_HARDIRQS
-        select HARDIRQS_SW_RESEND
-        select GENERIC_IRQ_PROBE
-        select GENERIC_IRQ_SHOW
+        select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_UID16
-        select ARCH_WANT_IPC_PARSE_VERSION
-        select HARDIRQS_SW_RESEND
-        select CPU_PM if (SUSPEND || CPU_IDLE)
-        select GENERIC_PCI_IOMAP
-        select HAVE_BPF_JIT
-        select GENERIC_SMP_IDLE_THREAD
         select KTIME_SCALAR
-        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
-        select GENERIC_STRNCPY_FROM_USER
-        select GENERIC_STRNLEN_USER
-        select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
-        select GENERIC_KERNEL_THREAD
-        select GENERIC_KERNEL_EXECVE
+        select PERF_USE_VMALLOC
+        select RTC_LIB
+        select SYS_SUPPORTS_APM_EMULATION
+        select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
+        select MODULES_USE_ELF_REL
         help
           The ARM series is a line of low-power-consumption RISC chip designs
           licensed by ARM Ltd and targeted at embedded applications and
@@ -69,9 +70,9 @@ config NEED_SG_DMA_LENGTH
         bool
 
 config ARM_DMA_USE_IOMMU
-        select NEED_SG_DMA_LENGTH
-        select ARM_HAS_SG_CHAIN
         bool
+        select ARM_HAS_SG_CHAIN
+        select NEED_SG_DMA_LENGTH
 
 config HAVE_PWM
         bool
@@ -263,69 +264,69 @@ choice
 
 config ARCH_MULTIPLATFORM
         bool "Allow multiple platforms to be selected"
+        depends on MMU
         select ARM_PATCH_PHYS_VIRT
         select AUTO_ZRELADDR
         select COMMON_CLK
         select MULTI_IRQ_HANDLER
         select SPARSE_IRQ
         select USE_OF
-        depends on MMU
 
 config ARCH_INTEGRATOR
         bool "ARM Ltd. Integrator family"
-        select ARM_AMBA
         select ARCH_HAS_CPUFREQ
+        select ARM_AMBA
         select COMMON_CLK
         select COMMON_CLK_VERSATILE
+        select GENERIC_CLOCKEVENTS
         select HAVE_TCM
         select ICST
-        select GENERIC_CLOCKEVENTS
+        select MULTI_IRQ_HANDLER
+        select NEED_MACH_MEMORY_H
         select PLAT_VERSATILE
         select PLAT_VERSATILE_FPGA_IRQ
-        select NEED_MACH_MEMORY_H
         select SPARSE_IRQ
-        select MULTI_IRQ_HANDLER
         help
           Support for ARM's Integrator platform.
 
 config ARCH_REALVIEW
         bool "ARM Ltd. RealView family"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_AMBA
+        select ARM_TIMER_SP804
         select COMMON_CLK
         select COMMON_CLK_VERSATILE
-        select ICST
         select GENERIC_CLOCKEVENTS
-        select ARCH_WANT_OPTIONAL_GPIOLIB
-        select PLAT_VERSATILE
-        select PLAT_VERSATILE_CLCD
-        select ARM_TIMER_SP804
         select GPIO_PL061 if GPIOLIB
+        select ICST
         select NEED_MACH_MEMORY_H
+        select PLAT_VERSATILE
+        select PLAT_VERSATILE_CLCD
         help
           This enables support for ARM Ltd RealView boards.
 
 config ARCH_VERSATILE
         bool "ARM Ltd. Versatile family"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_AMBA
+        select ARM_TIMER_SP804
         select ARM_VIC
         select CLKDEV_LOOKUP
+        select GENERIC_CLOCKEVENTS
         select HAVE_MACH_CLKDEV
         select ICST
-        select GENERIC_CLOCKEVENTS
-        select ARCH_WANT_OPTIONAL_GPIOLIB
         select PLAT_VERSATILE
-        select PLAT_VERSATILE_CLOCK
         select PLAT_VERSATILE_CLCD
+        select PLAT_VERSATILE_CLOCK
         select PLAT_VERSATILE_FPGA_IRQ
-        select ARM_TIMER_SP804
         help
           This enables support for ARM Ltd Versatile board.
 
 config ARCH_AT91
         bool "Atmel AT91"
         select ARCH_REQUIRE_GPIOLIB
-        select HAVE_CLK
         select CLKDEV_LOOKUP
+        select HAVE_CLK
         select IRQ_DOMAIN
         select NEED_MACH_GPIO_H
         select NEED_MACH_IO_H if PCCARD
@@ -350,43 +351,43 @@ config ARCH_BCM2835
           This enables support for the Broadcom BCM2835 SoC. This SoC is
           use in the Raspberry Pi, and Roku 2 devices.
 
-config ARCH_CLPS711X
-        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
-        select CPU_ARM720T
-        select ARCH_USES_GETTIMEOFFSET
-        select COMMON_CLK
-        select CLKDEV_LOOKUP
-        select NEED_MACH_MEMORY_H
-        help
-          Support for Cirrus Logic 711x/721x/731x based boards.
-
 config ARCH_CNS3XXX
         bool "Cavium Networks CNS3XXX family"
+        select ARM_GIC
         select CPU_V6K
         select GENERIC_CLOCKEVENTS
-        select ARM_GIC
         select MIGHT_HAVE_CACHE_L2X0
         select MIGHT_HAVE_PCI
         select PCI_DOMAINS if PCI
         help
           Support for Cavium Networks CNS3XXX platform.
 
+config ARCH_CLPS711X
+        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
+        select ARCH_USES_GETTIMEOFFSET
+        select CLKDEV_LOOKUP
+        select COMMON_CLK
+        select CPU_ARM720T
+        select NEED_MACH_MEMORY_H
+        help
+          Support for Cirrus Logic 711x/721x/731x based boards.
+
 config ARCH_GEMINI
         bool "Cortina Systems Gemini"
-        select CPU_FA526
         select ARCH_REQUIRE_GPIOLIB
         select ARCH_USES_GETTIMEOFFSET
+        select CPU_FA526
         help
           Support for the Cortina Systems Gemini family SoCs
 
 config ARCH_SIRF
         bool "CSR SiRF"
-        select NO_IOPORT
         select ARCH_REQUIRE_GPIOLIB
-        select GENERIC_CLOCKEVENTS
         select COMMON_CLK
+        select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
         select MIGHT_HAVE_CACHE_L2X0
+        select NO_IOPORT
         select PINCTRL
         select PINCTRL_SIRF
         select USE_OF
@@ -395,12 +396,12 @@ config ARCH_SIRF
 
 config ARCH_EBSA110
         bool "EBSA-110"
+        select ARCH_USES_GETTIMEOFFSET
         select CPU_SA110
         select ISA
-        select NO_IOPORT
-        select ARCH_USES_GETTIMEOFFSET
         select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
+        select NO_IOPORT
         help
           This is an evaluation board for the StrongARM processor available
           from Digital. It has limited hardware on-board, including an
@@ -409,13 +410,13 @@ config ARCH_EBSA110
 
 config ARCH_EP93XX
         bool "EP93xx-based"
-        select CPU_ARM920T
+        select ARCH_HAS_HOLES_MEMORYMODEL
+        select ARCH_REQUIRE_GPIOLIB
+        select ARCH_USES_GETTIMEOFFSET
         select ARM_AMBA
         select ARM_VIC
         select CLKDEV_LOOKUP
-        select ARCH_REQUIRE_GPIOLIB
-        select ARCH_HAS_HOLES_MEMORYMODEL
-        select ARCH_USES_GETTIMEOFFSET
+        select CPU_ARM920T
         select NEED_MACH_MEMORY_H
         help
           This enables support for the Cirrus EP93xx series of CPUs.
@@ -434,10 +435,10 @@ config ARCH_FOOTBRIDGE
 
 config ARCH_MXC
         bool "Freescale MXC/iMX-based"
-        select GENERIC_CLOCKEVENTS
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
+        select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
         select MULTI_IRQ_HANDLER
         select SPARSE_IRQ
@@ -447,11 +448,11 @@ config ARCH_MXC
 
 config ARCH_MXS
         bool "Freescale MXS-based"
-        select GENERIC_CLOCKEVENTS
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
         select COMMON_CLK
+        select GENERIC_CLOCKEVENTS
         select HAVE_CLK_PREPARE
         select MULTI_IRQ_HANDLER
         select PINCTRL
@@ -462,43 +463,43 @@ config ARCH_MXS
 
 config ARCH_NETX
         bool "Hilscher NetX based"
+        select ARM_VIC
         select CLKSRC_MMIO
         select CPU_ARM926T
-        select ARM_VIC
         select GENERIC_CLOCKEVENTS
         help
           This enables support for systems based on the Hilscher NetX Soc
 
 config ARCH_H720X
         bool "Hynix HMS720x-based"
+        select ARCH_USES_GETTIMEOFFSET
         select CPU_ARM720T
         select ISA_DMA_API
-        select ARCH_USES_GETTIMEOFFSET
         help
           This enables support for systems based on the Hynix HMS720x
 
 config ARCH_IOP13XX
         bool "IOP13xx-based"
         depends on MMU
-        select CPU_XSC3
-        select PLAT_IOP
-        select PCI
         select ARCH_SUPPORTS_MSI
-        select VMSPLIT_1G
+        select CPU_XSC3
         select NEED_MACH_MEMORY_H
         select NEED_RET_TO_USER
+        select PCI
+        select PLAT_IOP
+        select VMSPLIT_1G
         help
           Support for Intel's IOP13XX (XScale) family of processors.
 
 config ARCH_IOP32X
         bool "IOP32x-based"
         depends on MMU
+        select ARCH_REQUIRE_GPIOLIB
         select CPU_XSCALE
         select NEED_MACH_GPIO_H
         select NEED_RET_TO_USER
-        select PLAT_IOP
         select PCI
-        select ARCH_REQUIRE_GPIOLIB
+        select PLAT_IOP
         help
           Support for Intel's 80219 and IOP32X (XScale) family of
           processors.
@@ -506,12 +507,12 @@ config ARCH_IOP32X
 config ARCH_IOP33X
         bool "IOP33x-based"
         depends on MMU
+        select ARCH_REQUIRE_GPIOLIB
         select CPU_XSCALE
         select NEED_MACH_GPIO_H
         select NEED_RET_TO_USER
-        select PLAT_IOP
         select PCI
-        select ARCH_REQUIRE_GPIOLIB
+        select PLAT_IOP
         help
           Support for Intel's IOP33X (XScale) family of processors.
 
@@ -519,20 +520,20 @@ config ARCH_IXP4XX
         bool "IXP4xx-based"
         depends on MMU
         select ARCH_HAS_DMA_SET_COHERENT_MASK
+        select ARCH_REQUIRE_GPIOLIB
         select CLKSRC_MMIO
         select CPU_XSCALE
-        select ARCH_REQUIRE_GPIOLIB
+        select DMABOUNCE if PCI
         select GENERIC_CLOCKEVENTS
         select MIGHT_HAVE_PCI
         select NEED_MACH_IO_H
-        select DMABOUNCE if PCI
         help
           Support for Intel's IXP4XX (XScale) family of processors.
 
 config ARCH_DOVE
         bool "Marvell Dove"
-        select CPU_V7
         select ARCH_REQUIRE_GPIOLIB
+        select CPU_V7
         select GENERIC_CLOCKEVENTS
         select MIGHT_HAVE_PCI
         select PLAT_ORION_LEGACY
@@ -542,36 +543,21 @@ config ARCH_DOVE
 
 config ARCH_KIRKWOOD
         bool "Marvell Kirkwood"
-        select CPU_FEROCEON
-        select PCI
         select ARCH_REQUIRE_GPIOLIB
+        select CPU_FEROCEON
         select GENERIC_CLOCKEVENTS
+        select PCI
         select PLAT_ORION_LEGACY
         help
           Support for the following Marvell Kirkwood series SoCs:
           88F6180, 88F6192 and 88F6281.
 
-config ARCH_LPC32XX
-        bool "NXP LPC32XX"
-        select CLKSRC_MMIO
-        select CPU_ARM926T
-        select ARCH_REQUIRE_GPIOLIB
-        select HAVE_IDE
-        select ARM_AMBA
-        select USB_ARCH_HAS_OHCI
-        select CLKDEV_LOOKUP
-        select GENERIC_CLOCKEVENTS
-        select USE_OF
-        select HAVE_PWM
-        help
-          Support for the NXP LPC32XX family of processors
-
 config ARCH_MV78XX0
         bool "Marvell MV78xx0"
-        select CPU_FEROCEON
-        select PCI
         select ARCH_REQUIRE_GPIOLIB
+        select CPU_FEROCEON
         select GENERIC_CLOCKEVENTS
+        select PCI
         select PLAT_ORION_LEGACY
         help
           Support for the following Marvell MV78xx0 series SoCs:
@@ -580,10 +566,10 @@ config ARCH_MV78XX0
 config ARCH_ORION5X
         bool "Marvell Orion"
         depends on MMU
-        select CPU_FEROCEON
-        select PCI
         select ARCH_REQUIRE_GPIOLIB
+        select CPU_FEROCEON
         select GENERIC_CLOCKEVENTS
+        select PCI
         select PLAT_ORION_LEGACY
         help
           Support for the following Marvell Orion 5x series SoCs:
@@ -595,33 +581,33 @@ config ARCH_MMP
         depends on MMU
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
+        select GENERIC_ALLOCATOR
         select GENERIC_CLOCKEVENTS
         select GPIO_PXA
         select IRQ_DOMAIN
+        select NEED_MACH_GPIO_H
         select PLAT_PXA
         select SPARSE_IRQ
-        select GENERIC_ALLOCATOR
-        select NEED_MACH_GPIO_H
         help
           Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.
 
 config ARCH_KS8695
         bool "Micrel/Kendin KS8695"
-        select CPU_ARM922T
         select ARCH_REQUIRE_GPIOLIB
-        select NEED_MACH_MEMORY_H
         select CLKSRC_MMIO
+        select CPU_ARM922T
         select GENERIC_CLOCKEVENTS
+        select NEED_MACH_MEMORY_H
         help
           Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
           System-on-Chip devices.
 
 config ARCH_W90X900
         bool "Nuvoton W90X900 CPU"
-        select CPU_ARM926T
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
+        select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
         help
           Support for Nuvoton (Winbond logic dept.) ARM9 processor,
@@ -632,18 +618,33 @@ config ARCH_W90X900
           <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
                 ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
 
+config ARCH_LPC32XX
+        bool "NXP LPC32XX"
+        select ARCH_REQUIRE_GPIOLIB
+        select ARM_AMBA
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
+        select CPU_ARM926T
+        select GENERIC_CLOCKEVENTS
+        select HAVE_IDE
+        select HAVE_PWM
+        select USB_ARCH_HAS_OHCI
+        select USE_OF
+        help
+          Support for the NXP LPC32XX family of processors
+
 config ARCH_TEGRA
         bool "NVIDIA Tegra"
+        select ARCH_HAS_CPUFREQ
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
+        select COMMON_CLK
         select GENERIC_CLOCKEVENTS
         select GENERIC_GPIO
         select HAVE_CLK
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
-        select ARCH_HAS_CPUFREQ
         select USE_OF
-        select COMMON_CLK
         help
           This enables support for NVIDIA Tegra based systems (Tegra APX,
           Tegra 6xx and Tegra 2 series).
@@ -651,29 +652,29 @@ config ARCH_TEGRA
 config ARCH_PXA
         bool "PXA2xx/PXA3xx-based"
         depends on MMU
-        select ARCH_MTD_XIP
         select ARCH_HAS_CPUFREQ
+        select ARCH_MTD_XIP
+        select ARCH_REQUIRE_GPIOLIB
+        select ARM_CPU_SUSPEND if PM
+        select AUTO_ZRELADDR
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
-        select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
         select GPIO_PXA
-        select PLAT_PXA
-        select SPARSE_IRQ
-        select AUTO_ZRELADDR
-        select MULTI_IRQ_HANDLER
-        select ARM_CPU_SUSPEND if PM
         select HAVE_IDE
+        select MULTI_IRQ_HANDLER
         select NEED_MACH_GPIO_H
+        select PLAT_PXA
+        select SPARSE_IRQ
         help
           Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 
 config ARCH_MSM
         bool "Qualcomm MSM"
-        select HAVE_CLK
-        select GENERIC_CLOCKEVENTS
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
         help
           Support for Qualcomm MSM/QSD based systems.  This runs on the
           apps processor of the MSM/QSD and depends on a shared memory
@@ -683,50 +684,50 @@ config ARCH_MSM
 
 config ARCH_SHMOBILE
         bool "Renesas SH-Mobile / R-Mobile"
-        select HAVE_CLK
         select CLKDEV_LOOKUP
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
         select HAVE_MACH_CLKDEV
         select HAVE_SMP
-        select GENERIC_CLOCKEVENTS
         select MIGHT_HAVE_CACHE_L2X0
-        select NO_IOPORT
-        select SPARSE_IRQ
         select MULTI_IRQ_HANDLER
-        select PM_GENERIC_DOMAINS if PM
         select NEED_MACH_MEMORY_H
+        select NO_IOPORT
+        select PM_GENERIC_DOMAINS if PM
+        select SPARSE_IRQ
         help
           Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
 
 config ARCH_RPC
         bool "RiscPC"
         select ARCH_ACORN
-        select FIQ
         select ARCH_MAY_HAVE_PC_FDC
-        select HAVE_PATA_PLATFORM
-        select ISA_DMA_API
-        select NO_IOPORT
         select ARCH_SPARSEMEM_ENABLE
         select ARCH_USES_GETTIMEOFFSET
+        select FIQ
         select HAVE_IDE
+        select HAVE_PATA_PLATFORM
+        select ISA_DMA_API
         select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
+        select NO_IOPORT
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
           CD-ROM interface, serial and parallel port, and the floppy drive.
 
 config ARCH_SA1100
         bool "SA1100-based"
-        select CLKSRC_MMIO
-        select CPU_SA1100
-        select ISA
-        select ARCH_SPARSEMEM_ENABLE
-        select ARCH_MTD_XIP
         select ARCH_HAS_CPUFREQ
+        select ARCH_MTD_XIP
+        select ARCH_REQUIRE_GPIOLIB
+        select ARCH_SPARSEMEM_ENABLE
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         select CPU_FREQ
+        select CPU_SA1100
         select GENERIC_CLOCKEVENTS
-        select CLKDEV_LOOKUP
-        select ARCH_REQUIRE_GPIOLIB
         select HAVE_IDE
+        select ISA
         select NEED_MACH_GPIO_H
         select NEED_MACH_MEMORY_H
         select SPARSE_IRQ
@@ -735,14 +736,14 @@ config ARCH_SA1100
 
 config ARCH_S3C24XX
         bool "Samsung S3C24XX SoCs"
-        select GENERIC_GPIO
         select ARCH_HAS_CPUFREQ
-        select HAVE_CLK
-        select CLKDEV_LOOKUP
         select ARCH_USES_GETTIMEOFFSET
+        select CLKDEV_LOOKUP
+        select GENERIC_GPIO
+        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C_RTC if RTC_CLASS
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
         select NEED_MACH_GPIO_H
         select NEED_MACH_IO_H
         help
@@ -753,38 +754,38 @@ config ARCH_S3C24XX
 
 config ARCH_S3C64XX
         bool "Samsung S3C64XX"
-        select PLAT_SAMSUNG
-        select CPU_V6
+        select ARCH_HAS_CPUFREQ
+        select ARCH_REQUIRE_GPIOLIB
+        select ARCH_USES_GETTIMEOFFSET
         select ARM_VIC
+        select CLKDEV_LOOKUP
+        select CPU_V6
         select HAVE_CLK
+        select HAVE_S3C2410_I2C if I2C
+        select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_TCM
-        select CLKDEV_LOOKUP
+        select NEED_MACH_GPIO_H
         select NO_IOPORT
-        select ARCH_USES_GETTIMEOFFSET
-        select ARCH_HAS_CPUFREQ
-        select ARCH_REQUIRE_GPIOLIB
+        select PLAT_SAMSUNG
+        select S3C_DEV_NAND
+        select S3C_GPIO_TRACK
         select SAMSUNG_CLKSRC
+        select SAMSUNG_GPIOLIB_4BIT
         select SAMSUNG_IRQ_VIC_TIMER
-        select S3C_GPIO_TRACK
-        select S3C_DEV_NAND
         select USB_ARCH_HAS_OHCI
-        select SAMSUNG_GPIOLIB_4BIT
-        select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
-        select NEED_MACH_GPIO_H
         help
           Samsung S3C64XX series based systems
 
 config ARCH_S5P64X0
         bool "Samsung S5P6440 S5P6450"
-        select CPU_V6
-        select GENERIC_GPIO
-        select HAVE_CLK
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select CPU_V6
         select GENERIC_CLOCKEVENTS
+        select GENERIC_GPIO
+        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
+        select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_S3C_RTC if RTC_CLASS
         select NEED_MACH_GPIO_H
         help
@@ -793,50 +794,50 @@ config ARCH_S5P64X0
 
 config ARCH_S5PC100
         bool "Samsung S5PC100"
-        select GENERIC_GPIO
-        select HAVE_CLK
+        select ARCH_USES_GETTIMEOFFSET
         select CLKDEV_LOOKUP
         select CPU_V7
-        select ARCH_USES_GETTIMEOFFSET
+        select GENERIC_GPIO
+        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C_RTC if RTC_CLASS
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
         select NEED_MACH_GPIO_H
         help
           Samsung S5PC100 series based systems
 
 config ARCH_S5PV210
         bool "Samsung S5PV210/S5PC110"
-        select CPU_V7
-        select ARCH_SPARSEMEM_ENABLE
+        select ARCH_HAS_CPUFREQ
         select ARCH_HAS_HOLES_MEMORYMODEL
-        select GENERIC_GPIO
-        select HAVE_CLK
+        select ARCH_SPARSEMEM_ENABLE
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
-        select ARCH_HAS_CPUFREQ
+        select CPU_V7
         select GENERIC_CLOCKEVENTS
+        select GENERIC_GPIO
+        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C_RTC if RTC_CLASS
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
         select NEED_MACH_GPIO_H
         select NEED_MACH_MEMORY_H
         help
           Samsung S5PV210/S5PC110 series based systems
 
 config ARCH_EXYNOS
-        bool "SAMSUNG EXYNOS"
-        select CPU_V7
-        select ARCH_SPARSEMEM_ENABLE
+        bool "Samsung EXYNOS"
+        select ARCH_HAS_CPUFREQ
         select ARCH_HAS_HOLES_MEMORYMODEL
-        select GENERIC_GPIO
-        select HAVE_CLK
+        select ARCH_SPARSEMEM_ENABLE
         select CLKDEV_LOOKUP
-        select ARCH_HAS_CPUFREQ
+        select CPU_V7
         select GENERIC_CLOCKEVENTS
-        select HAVE_S3C_RTC if RTC_CLASS
+        select GENERIC_GPIO
+        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
         select NEED_MACH_GPIO_H
         select NEED_MACH_MEMORY_H
         help
@@ -844,13 +845,13 @@ config ARCH_EXYNOS
 
 config ARCH_SHARK
         bool "Shark"
+        select ARCH_USES_GETTIMEOFFSET
         select CPU_SA110
         select ISA
         select ISA_DMA
-        select ZONE_DMA
-        select PCI
-        select ARCH_USES_GETTIMEOFFSET
         select NEED_MACH_MEMORY_H
+        select PCI
+        select ZONE_DMA
         help
           Support for the StrongARM based Digital DNARD machine, also known
           as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -858,17 +859,17 @@ config ARCH_SHARK
 config ARCH_U300
         bool "ST-Ericsson U300 Series"
         depends on MMU
-        select CLKSRC_MMIO
-        select CPU_ARM926T
-        select HAVE_TCM
+        select ARCH_REQUIRE_GPIOLIB
         select ARM_AMBA
         select ARM_PATCH_PHYS_VIRT
         select ARM_VIC
-        select GENERIC_CLOCKEVENTS
         select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         select COMMON_CLK
+        select CPU_ARM926T
+        select GENERIC_CLOCKEVENTS
         select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
+        select HAVE_TCM
         select SPARSE_IRQ
         help
           Support for ST-Ericsson U300 series mobile platforms.
@@ -876,12 +877,12 @@ config ARCH_U300
 config ARCH_U8500
         bool "ST-Ericsson U8500 Series"
         depends on MMU
-        select CPU_V7
+        select ARCH_HAS_CPUFREQ
+        select ARCH_REQUIRE_GPIOLIB
         select ARM_AMBA
-        select GENERIC_CLOCKEVENTS
         select CLKDEV_LOOKUP
-        select ARCH_REQUIRE_GPIOLIB
-        select ARCH_HAS_CPUFREQ
+        select CPU_V7
+        select GENERIC_CLOCKEVENTS
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
         help
@@ -889,78 +890,78 @@ config ARCH_U8500
 
 config ARCH_NOMADIK
         bool "STMicroelectronics Nomadik"
+        select ARCH_REQUIRE_GPIOLIB
         select ARM_AMBA
         select ARM_VIC
-        select CPU_ARM926T
         select COMMON_CLK
+        select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
+        select MIGHT_HAVE_CACHE_L2X0
         select PINCTRL
         select PINCTRL_STN8815
-        select MIGHT_HAVE_CACHE_L2X0
-        select ARCH_REQUIRE_GPIOLIB
         help
           Support for the Nomadik platform by ST-Ericsson
 
+config PLAT_SPEAR
+        bool "ST SPEAr"
+        select ARCH_REQUIRE_GPIOLIB
+        select ARM_AMBA
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
+        select COMMON_CLK
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
+        help
+          Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
+
 config ARCH_DAVINCI
         bool "TI DaVinci"
-        select GENERIC_CLOCKEVENTS
+        select ARCH_HAS_HOLES_MEMORYMODEL
         select ARCH_REQUIRE_GPIOLIB
-        select ZONE_DMA
-        select HAVE_IDE
         select CLKDEV_LOOKUP
         select GENERIC_ALLOCATOR
+        select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
-        select ARCH_HAS_HOLES_MEMORYMODEL
+        select HAVE_IDE
         select NEED_MACH_GPIO_H
+        select ZONE_DMA
         help
           Support for TI's DaVinci platform.
 
 config ARCH_OMAP
         bool "TI OMAP"
         depends on MMU
-        select HAVE_CLK
-        select ARCH_REQUIRE_GPIOLIB
         select ARCH_HAS_CPUFREQ
-        select CLKSRC_MMIO
-        select GENERIC_CLOCKEVENTS
         select ARCH_HAS_HOLES_MEMORYMODEL
-        select NEED_MACH_GPIO_H
-        help
-          Support for TI's OMAP platform (OMAP1/2/3/4).
-
-config PLAT_SPEAR
-        bool "ST SPEAr"
-        select ARM_AMBA
         select ARCH_REQUIRE_GPIOLIB
-        select CLKDEV_LOOKUP
-        select COMMON_CLK
         select CLKSRC_MMIO
         select GENERIC_CLOCKEVENTS
         select HAVE_CLK
+        select NEED_MACH_GPIO_H
         help
-          Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
+          Support for TI's OMAP platform (OMAP1/2/3/4).
 
 config ARCH_VT8500
         bool "VIA/WonderMedia 85xx"
-        select CPU_ARM926T
-        select GENERIC_GPIO
         select ARCH_HAS_CPUFREQ
-        select GENERIC_CLOCKEVENTS
         select ARCH_REQUIRE_GPIOLIB
-        select USE_OF
+        select CLKDEV_LOOKUP
         select COMMON_CLK
+        select CPU_ARM926T
+        select GENERIC_CLOCKEVENTS
+        select GENERIC_GPIO
         select HAVE_CLK
-        select CLKDEV_LOOKUP
+        select USE_OF
         help
           Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
 
 config ARCH_ZYNQ
         bool "Xilinx Zynq ARM Cortex A9 Platform"
+        select ARM_AMBA
+        select ARM_GIC
+        select CLKDEV_LOOKUP
         select CPU_V7
         select GENERIC_CLOCKEVENTS
-        select CLKDEV_LOOKUP
-        select ARM_GIC
-        select ARM_AMBA
         select ICST
         select MIGHT_HAVE_CACHE_L2X0
         select USE_OF
@@ -975,33 +976,33 @@ comment "CPU Core family selection"
 
 config ARCH_MULTI_V4
         bool "ARMv4 based platforms (FA526, StrongARM)"
-        select ARCH_MULTI_V4_V5
         depends on !ARCH_MULTI_V6_V7
+        select ARCH_MULTI_V4_V5
 
 config ARCH_MULTI_V4T
         bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"
-        select ARCH_MULTI_V4_V5
         depends on !ARCH_MULTI_V6_V7
+        select ARCH_MULTI_V4_V5
 
 config ARCH_MULTI_V5
         bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)"
-        select ARCH_MULTI_V4_V5
         depends on !ARCH_MULTI_V6_V7
+        select ARCH_MULTI_V4_V5
 
 config ARCH_MULTI_V4_V5
         bool
 
 config ARCH_MULTI_V6
         bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
-        select CPU_V6
         select ARCH_MULTI_V6_V7
+        select CPU_V6
 
 config ARCH_MULTI_V7
         bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
-        select CPU_V7
-        select ARCH_VEXPRESS
         default y
         select ARCH_MULTI_V6_V7
+        select ARCH_VEXPRESS
+        select CPU_V7
 
 config ARCH_MULTI_V6_V7
         bool
@@ -1138,9 +1139,9 @@ config PLAT_IOP
 config PLAT_ORION
         bool
         select CLKSRC_MMIO
+        select COMMON_CLK
         select GENERIC_IRQ_CHIP
         select IRQ_DOMAIN
-        select COMMON_CLK
 
 config PLAT_ORION_LEGACY
         bool
@@ -1498,8 +1499,8 @@ config SMP
         depends on GENERIC_CLOCKEVENTS
         depends on HAVE_SMP
         depends on MMU
-        select USE_GENERIC_SMP_HELPERS
         select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
+        select USE_GENERIC_SMP_HELPERS
         help
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
@@ -1858,9 +1859,9 @@ menu "Boot options"
 
 config USE_OF
         bool "Flattened Device Tree support"
+        select IRQ_DOMAIN
         select OF
         select OF_EARLY_FLATTREE
-        select IRQ_DOMAIN
         help
           Include support for flattened device tree machine descriptions.
 
@@ -2142,8 +2143,8 @@ config CPU_FREQ_PXA
         bool
         depends on CPU_FREQ && ARCH_PXA && PXA25x
         default y
-        select CPU_FREQ_TABLE
         select CPU_FREQ_DEFAULT_GOV_USERSPACE
+        select CPU_FREQ_TABLE
 
 config CPU_FREQ_S3C
         bool
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 283fa1d804f4..45ceeb0e93e0 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -1,15 +1,15 @@
 config ARM_GIC
+        bool
         select IRQ_DOMAIN
         select MULTI_IRQ_HANDLER
-        bool
 
 config GIC_NON_BANKED
         bool
 
 config ARM_VIC
+        bool
         select IRQ_DOMAIN
         select MULTI_IRQ_HANDLER
-        bool
 
 config ARM_VIC_NR
         int
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index 8a7196ca5106..f70ae175a3d6 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -1,6 +1,4 @@
-include include/asm-generic/Kbuild.asm
 
-header-y += hwcap.h
 
 generic-y += auxvec.h
 generic-y += bitsperlong.h
diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h
index 917626128a1d..6ff56eca3f1f 100644
--- a/arch/arm/include/asm/hwcap.h
+++ b/arch/arm/include/asm/hwcap.h
@@ -1,31 +1,8 @@
 #ifndef __ASMARM_HWCAP_H
 #define __ASMARM_HWCAP_H
 
-/*
- * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
- */
-#define HWCAP_SWP       (1 << 0)
-#define HWCAP_HALF      (1 << 1)
-#define HWCAP_THUMB     (1 << 2)
-#define HWCAP_26BIT     (1 << 3)        /* Play it safe */
-#define HWCAP_FAST_MULT (1 << 4)
-#define HWCAP_FPA       (1 << 5)
-#define HWCAP_VFP       (1 << 6)
-#define HWCAP_EDSP      (1 << 7)
-#define HWCAP_JAVA      (1 << 8)
-#define HWCAP_IWMMXT    (1 << 9)
-#define HWCAP_CRUNCH    (1 << 10)
-#define HWCAP_THUMBEE   (1 << 11)
-#define HWCAP_NEON      (1 << 12)
-#define HWCAP_VFPv3     (1 << 13)
-#define HWCAP_VFPv3D16  (1 << 14)
-#define HWCAP_TLS       (1 << 15)
-#define HWCAP_VFPv4     (1 << 16)
-#define HWCAP_IDIVA     (1 << 17)
-#define HWCAP_IDIVT     (1 << 18)
-#define HWCAP_IDIV      (HWCAP_IDIVA | HWCAP_IDIVT)
+#include <uapi/asm/hwcap.h>
 
-#if defined(__KERNEL__)
 #if !defined(__ASSEMBLY__)
 /*
  * This yields a mask that user programs can use to figure out what
@@ -35,5 +12,3 @@
 extern unsigned int elf_hwcap;
 #endif
 #endif
-
-#endif
diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h
index 6c6809f982f1..0d3a28dbc8e5 100644
--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
@@ -1,9 +1,7 @@
 #ifndef _ASM_ARM_MODULE_H
 #define _ASM_ARM_MODULE_H
 
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
+#include <asm-generic/module.h>
 
 struct unwind_table;
 
@@ -16,13 +14,11 @@ enum {
         ARM_SEC_DEVEXIT,
         ARM_SEC_MAX,
 };
-#endif
 
 struct mod_arch_specific {
-#ifdef CONFIG_ARM_UNWIND
         struct unwind_table *unwind[ARM_SEC_MAX];
-#endif
 };
+#endif
 
 /*
  * Add the ARM architecture version to the version magic string
diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
index 142d6ae41231..3d52ee1bfb31 100644
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -10,133 +10,12 @@
 #ifndef __ASM_ARM_PTRACE_H
 #define __ASM_ARM_PTRACE_H
 
-#include <asm/hwcap.h>
-
-#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS        14
-#define PTRACE_SETFPREGS        15
-/* PTRACE_ATTACH is 16 */
-/* PTRACE_DETACH is 17 */
-#define PTRACE_GETWMMXREGS      18
-#define PTRACE_SETWMMXREGS      19
-/* 20 is unused */
-#define PTRACE_OLDSETOPTIONS    21
-#define PTRACE_GET_THREAD_AREA  22
-#define PTRACE_SET_SYSCALL      23
-/* PTRACE_SYSCALL is 24 */
-#define PTRACE_GETCRUNCHREGS    25
-#define PTRACE_SETCRUNCHREGS    26
-#define PTRACE_GETVFPREGS       27
-#define PTRACE_SETVFPREGS       28
-#define PTRACE_GETHBPREGS       29
-#define PTRACE_SETHBPREGS       30
-
-/*
- * PSR bits
- */
-#define USR26_MODE      0x00000000
-#define FIQ26_MODE      0x00000001
-#define IRQ26_MODE      0x00000002
-#define SVC26_MODE      0x00000003
-#define USR_MODE        0x00000010
-#define FIQ_MODE        0x00000011
-#define IRQ_MODE        0x00000012
-#define SVC_MODE        0x00000013
-#define ABT_MODE        0x00000017
-#define HYP_MODE        0x0000001a
-#define UND_MODE        0x0000001b
-#define SYSTEM_MODE     0x0000001f
-#define MODE32_BIT      0x00000010
-#define MODE_MASK       0x0000001f
-#define PSR_T_BIT       0x00000020
-#define PSR_F_BIT       0x00000040
-#define PSR_I_BIT       0x00000080
-#define PSR_A_BIT       0x00000100
-#define PSR_E_BIT       0x00000200
-#define PSR_J_BIT       0x01000000
-#define PSR_Q_BIT       0x08000000
-#define PSR_V_BIT       0x10000000
-#define PSR_C_BIT       0x20000000
-#define PSR_Z_BIT       0x40000000
-#define PSR_N_BIT       0x80000000
-
-/*
- * Groups of PSR bits
- */
-#define PSR_f           0xff000000      /* Flags                */
-#define PSR_s           0x00ff0000      /* Status               */
-#define PSR_x           0x0000ff00      /* Extension            */
-#define PSR_c           0x000000ff      /* Control              */
-
-/*
- * ARMv7 groups of PSR bits
- */
-#define APSR_MASK       0xf80f0000      /* N, Z, C, V, Q and GE flags */
-#define PSR_ISET_MASK   0x01000010      /* ISA state (J, T) mask */
-#define PSR_IT_MASK     0x0600fc00      /* If-Then execution state mask */
-#define PSR_ENDIAN_MASK 0x00000200      /* Endianness state mask */
-
-/*
- * Default endianness state
- */
-#ifdef CONFIG_CPU_ENDIAN_BE8
-#define PSR_ENDSTATE    PSR_E_BIT
-#else
-#define PSR_ENDSTATE    0
-#endif
-
-/* 
- * These are 'magic' values for PTRACE_PEEKUSR that return info about where a
- * process is located in memory.
- */
-#define PT_TEXT_ADDR            0x10000
-#define PT_DATA_ADDR            0x10004
-#define PT_TEXT_END_ADDR        0x10008
+#include <uapi/asm/ptrace.h>
 
 #ifndef __ASSEMBLY__
-
-/*
- * This struct defines the way the registers are stored on the
- * stack during a system call.  Note that sizeof(struct pt_regs)
- * has to be a multiple of 8.
- */
-#ifndef __KERNEL__
-struct pt_regs {
-        long uregs[18];
-};
-#else /* __KERNEL__ */
 struct pt_regs {
         unsigned long uregs[18];
 };
-#endif /* __KERNEL__ */
-
-#define ARM_cpsr        uregs[16]
-#define ARM_pc          uregs[15]
-#define ARM_lr          uregs[14]
-#define ARM_sp          uregs[13]
-#define ARM_ip          uregs[12]
-#define ARM_fp          uregs[11]
-#define ARM_r10         uregs[10]
-#define ARM_r9          uregs[9]
-#define ARM_r8          uregs[8]
-#define ARM_r7          uregs[7]
-#define ARM_r6          uregs[6]
-#define ARM_r5          uregs[5]
-#define ARM_r4          uregs[4]
-#define ARM_r3          uregs[3]
-#define ARM_r2          uregs[2]
-#define ARM_r1          uregs[1]
-#define ARM_r0          uregs[0]
-#define ARM_ORIG_r0     uregs[17]
-
-/*
- * The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
- * and core dumps.
- */
-#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
-
-#ifdef __KERNEL__
 
 #define user_mode(regs) \
         (((regs)->ARM_cpsr & 0xf) == 0)
@@ -260,9 +139,5 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)
         (struct pt_regs *)((sp | (THREAD_SIZE - 1)) - 7) - 1;   \
 })
 
-#endif /* __KERNEL__ */
-
 #endif /* __ASSEMBLY__ */
-
 #endif
-
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 24d284a1bfc7..c50f05609501 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -14,176 +14,8 @@
 #ifndef __ASMARM_SETUP_H
 #define __ASMARM_SETUP_H
 
-#include <linux/types.h>
+#include <uapi/asm/setup.h>
 
-#define COMMAND_LINE_SIZE 1024
-
-/* The list ends with an ATAG_NONE node. */
-#define ATAG_NONE       0x00000000
-
-struct tag_header {
-        __u32 size;
-        __u32 tag;
-};
-
-/* The list must start with an ATAG_CORE node */
-#define ATAG_CORE       0x54410001
-
-struct tag_core {
-        __u32 flags;            /* bit 0 = read-only */
-        __u32 pagesize;
-        __u32 rootdev;
-};
-
-/* it is allowed to have multiple ATAG_MEM nodes */
-#define ATAG_MEM        0x54410002
-
-struct tag_mem32 {
-        __u32   size;
-        __u32   start;  /* physical start address */
-};
-
-/* VGA text type displays */
-#define ATAG_VIDEOTEXT  0x54410003
-
-struct tag_videotext {
-        __u8            x;
-        __u8            y;
-        __u16           video_page;
-        __u8            video_mode;
-        __u8            video_cols;
-        __u16           video_ega_bx;
-        __u8            video_lines;
-        __u8            video_isvga;
-        __u16           video_points;
-};
-
-/* describes how the ramdisk will be used in kernel */
-#define ATAG_RAMDISK    0x54410004
-
-struct tag_ramdisk {
-        __u32 flags;    /* bit 0 = load, bit 1 = prompt */
-        __u32 size;     /* decompressed ramdisk size in _kilo_ bytes */
-        __u32 start;    /* starting block of floppy-based RAM disk image */
-};
-
-/* describes where the compressed ramdisk image lives (virtual address) */
-/*
- * this one accidentally used virtual addresses - as such,
- * it's deprecated.
- */
-#define ATAG_INITRD     0x54410005
-
-/* describes where the compressed ramdisk image lives (physical address) */
-#define ATAG_INITRD2    0x54420005
-
-struct tag_initrd {
-        __u32 start;    /* physical start address */
-        __u32 size;     /* size of compressed ramdisk image in bytes */
-};
-
-/* board serial number. "64 bits should be enough for everybody" */
-#define ATAG_SERIAL     0x54410006
-
-struct tag_serialnr {
-        __u32 low;
-        __u32 high;
-};
-
-/* board revision */
-#define ATAG_REVISION   0x54410007
-
-struct tag_revision {
-        __u32 rev;
-};
-
-/* initial values for vesafb-type framebuffers. see struct screen_info
- * in include/linux/tty.h
- */
-#define ATAG_VIDEOLFB   0x54410008
-
-struct tag_videolfb {
-        __u16           lfb_width;
-        __u16           lfb_height;
-        __u16           lfb_depth;
-        __u16           lfb_linelength;
-        __u32           lfb_base;
-        __u32           lfb_size;
-        __u8            red_size;
-        __u8            red_pos;
-        __u8            green_size;
-        __u8            green_pos;
-        __u8            blue_size;
-        __u8            blue_pos;
-        __u8            rsvd_size;
-        __u8            rsvd_pos;
-};
-
-/* command line: \0 terminated string */
-#define ATAG_CMDLINE    0x54410009
-
-struct tag_cmdline {
-        char    cmdline[1];     /* this is the minimum size */
-};
-
-/* acorn RiscPC specific information */
-#define ATAG_ACORN      0x41000101
-
-struct tag_acorn {
-        __u32 memc_control_reg;
-        __u32 vram_pages;
-        __u8 sounddefault;
-        __u8 adfsdrives;
-};
-
-/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
-#define ATAG_MEMCLK     0x41000402
-
-struct tag_memclk {
-        __u32 fmemclk;
-};
-
-struct tag {
-        struct tag_header hdr;
-        union {
-                struct tag_core         core;
-                struct tag_mem32        mem;
-                struct tag_videotext    videotext;
-                struct tag_ramdisk      ramdisk;
-                struct tag_initrd       initrd;
-                struct tag_serialnr     serialnr;
-                struct tag_revision     revision;
-                struct tag_videolfb     videolfb;
-                struct tag_cmdline      cmdline;
-
-                /*
-                 * Acorn specific
-                 */
-                struct tag_acorn        acorn;
-
-                /*
-                 * DC21285 specific
-                 */
-                struct tag_memclk       memclk;
-        } u;
-};
-
-struct tagtable {
-        __u32 tag;
-        int (*parse)(const struct tag *);
-};
-
-#define tag_member_present(tag,member)                          \
-        ((unsigned long)(&((struct tag *)0L)->member + 1)       \
-                <= (tag)->hdr.size * 4)
-
-#define tag_next(t)     ((struct tag *)((__u32 *)(t) + (t)->hdr.size))
-#define tag_size(type)  ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
-
-#define for_each_tag(t,base)            \
-        for (t = base; t->hdr.size; t = tag_next(t))
-
-#ifdef __KERNEL__
 
 #define __tag __used __attribute__((__section__(".taglist.init")))
 #define __tagtable(tag, fn) \
@@ -221,6 +53,4 @@ extern int arm_add_memory(phys_addr_t start, phys_addr_t size);
 extern void early_print(const char *str, ...);
 extern void dump_machine_table(void);
 
-#endif  /*  __KERNEL__  */
-
 #endif
diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h
index 43ba0fb1c8ad..5a7963dbd3fb 100644
--- a/arch/arm/include/asm/signal.h
+++ b/arch/arm/include/asm/signal.h
@@ -1,12 +1,8 @@
 #ifndef _ASMARM_SIGNAL_H
 #define _ASMARM_SIGNAL_H
 
-#include <linux/types.h>
+#include <uapi/asm/signal.h>
 
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-
-#ifdef __KERNEL__
 /* Most things should be clean enough to redefine this at will, if care
    is taken to make libc match.  */
 
@@ -20,100 +16,6 @@ typedef struct {
         unsigned long sig[_NSIG_WORDS];
 } sigset_t;
 
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-#define NSIG            32
-typedef unsigned long sigset_t;
-
-#endif /* __KERNEL__ */
-
-#define SIGHUP           1
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-#define SIGUNUSED       31
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        _NSIG
-
-#define SIGSWI          32
-
-/*
- * SA_FLAGS values:
- *
- * SA_NOCLDSTOP         flag to turn off SIGCHLD when children stop.
- * SA_NOCLDWAIT         flag on SIGCHLD to inhibit zombies.
- * SA_SIGINFO           deliver the signal with SIGINFO structs
- * SA_THIRTYTWO         delivers the signal in 32-bit mode, even if the task 
- *                      is running in 26-bit.
- * SA_ONSTACK           allows alternate signal stacks (see sigaltstack(2)).
- * SA_RESTART           flag to get restarting signals (which were the default long ago)
- * SA_NODEFER           prevents the current signal from being masked in the handler.
- * SA_RESETHAND         clears the handler when the signal is delivered.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001
-#define SA_NOCLDWAIT    0x00000002
-#define SA_SIGINFO      0x00000004
-#define SA_THIRTYTWO    0x02000000
-#define SA_RESTORER     0x04000000
-#define SA_ONSTACK      0x08000000
-#define SA_RESTART      0x10000000
-#define SA_NODEFER      0x40000000
-#define SA_RESETHAND    0x80000000
-
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-
-
-/* 
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-
-#include <asm-generic/signal-defs.h>
-
-#ifdef __KERNEL__
 struct old_sigaction {
         __sighandler_t sa_handler;
         old_sigset_t sa_mask;
@@ -132,33 +34,6 @@ struct k_sigaction {
         struct sigaction sa;
 };
 
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-
-#endif /* __KERNEL__ */
-
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-
-#ifdef __KERNEL__
 #include <asm/sigcontext.h>
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #endif
-
-#endif
diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h
index b859d82e30ca..537fc9b91889 100644
--- a/arch/arm/include/asm/swab.h
+++ b/arch/arm/include/asm/swab.h
@@ -15,14 +15,8 @@
 #ifndef __ASM_ARM_SWAB_H
 #define __ASM_ARM_SWAB_H
 
-#include <linux/compiler.h>
-#include <linux/types.h>
+#include <uapi/asm/swab.h>
 
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __SWAB_64_THRU_32__
-#endif
-
-#if defined(__KERNEL__)
 #if __LINUX_ARM_ARCH__ >= 6
 
 static inline __attribute_const__ __u32 __arch_swahb32(__u32 x)
@@ -42,32 +36,3 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
 
 #endif
 #endif
-
-#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6
-static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
-{
-        __u32 t;
-
-#ifndef __thumb__
-        if (!__builtin_constant_p(x)) {
-                /*
-                 * The compiler needs a bit of a hint here to always do the
-                 * right thing and not screw it up to different degrees
-                 * depending on the gcc version.
-                 */
-                asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
-        } else
-#endif
-                t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */
-
-        x = (x << 24) | (x >> 8);               /* mov r0,r0,ror #8      */
-        t &= ~0x00FF0000;                       /* bic r1,r1,#0x00FF0000 */
-        x ^= (t >> 8);                          /* eor r0,r0,r1,lsr #8   */
-
-        return x;
-}
-#define __arch_swab32 __arch_swab32
-
-#endif
-
-#endif
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 91819ad54424..8f60b6e6bd41 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -13,447 +13,10 @@
 #ifndef __ASM_ARM_UNISTD_H
 #define __ASM_ARM_UNISTD_H
 
-#define __NR_OABI_SYSCALL_BASE  0x900000
+#include <uapi/asm/unistd.h>
 
-#if defined(__thumb__) || defined(__ARM_EABI__)
-#define __NR_SYSCALL_BASE       0
-#else
-#define __NR_SYSCALL_BASE       __NR_OABI_SYSCALL_BASE
-#endif
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_restart_syscall            (__NR_SYSCALL_BASE+  0)
-#define __NR_exit                       (__NR_SYSCALL_BASE+  1)
-#define __NR_fork                       (__NR_SYSCALL_BASE+  2)
-#define __NR_read                       (__NR_SYSCALL_BASE+  3)
-#define __NR_write                      (__NR_SYSCALL_BASE+  4)
-#define __NR_open                       (__NR_SYSCALL_BASE+  5)
-#define __NR_close                      (__NR_SYSCALL_BASE+  6)
-                                        /* 7 was sys_waitpid */
-#define __NR_creat                      (__NR_SYSCALL_BASE+  8)
-#define __NR_link                       (__NR_SYSCALL_BASE+  9)
-#define __NR_unlink                     (__NR_SYSCALL_BASE+ 10)
-#define __NR_execve                     (__NR_SYSCALL_BASE+ 11)
-#define __NR_chdir                      (__NR_SYSCALL_BASE+ 12)
-#define __NR_time                       (__NR_SYSCALL_BASE+ 13)
-#define __NR_mknod                      (__NR_SYSCALL_BASE+ 14)
-#define __NR_chmod                      (__NR_SYSCALL_BASE+ 15)
-#define __NR_lchown                     (__NR_SYSCALL_BASE+ 16)
-                                        /* 17 was sys_break */
-                                        /* 18 was sys_stat */
-#define __NR_lseek                      (__NR_SYSCALL_BASE+ 19)
-#define __NR_getpid                     (__NR_SYSCALL_BASE+ 20)
-#define __NR_mount                      (__NR_SYSCALL_BASE+ 21)
-#define __NR_umount                     (__NR_SYSCALL_BASE+ 22)
-#define __NR_setuid                     (__NR_SYSCALL_BASE+ 23)
-#define __NR_getuid                     (__NR_SYSCALL_BASE+ 24)
-#define __NR_stime                      (__NR_SYSCALL_BASE+ 25)
-#define __NR_ptrace                     (__NR_SYSCALL_BASE+ 26)
-#define __NR_alarm                      (__NR_SYSCALL_BASE+ 27)
-                                        /* 28 was sys_fstat */
-#define __NR_pause                      (__NR_SYSCALL_BASE+ 29)
-#define __NR_utime                      (__NR_SYSCALL_BASE+ 30)
-                                        /* 31 was sys_stty */
-                                        /* 32 was sys_gtty */
-#define __NR_access                     (__NR_SYSCALL_BASE+ 33)
-#define __NR_nice                       (__NR_SYSCALL_BASE+ 34)
-                                        /* 35 was sys_ftime */
-#define __NR_sync                       (__NR_SYSCALL_BASE+ 36)
-#define __NR_kill                       (__NR_SYSCALL_BASE+ 37)
-#define __NR_rename                     (__NR_SYSCALL_BASE+ 38)
-#define __NR_mkdir                      (__NR_SYSCALL_BASE+ 39)
-#define __NR_rmdir                      (__NR_SYSCALL_BASE+ 40)
-#define __NR_dup                        (__NR_SYSCALL_BASE+ 41)
-#define __NR_pipe                       (__NR_SYSCALL_BASE+ 42)
-#define __NR_times                      (__NR_SYSCALL_BASE+ 43)
-                                        /* 44 was sys_prof */
-#define __NR_brk                        (__NR_SYSCALL_BASE+ 45)
-#define __NR_setgid                     (__NR_SYSCALL_BASE+ 46)
-#define __NR_getgid                     (__NR_SYSCALL_BASE+ 47)
-                                        /* 48 was sys_signal */
-#define __NR_geteuid                    (__NR_SYSCALL_BASE+ 49)
-#define __NR_getegid                    (__NR_SYSCALL_BASE+ 50)
-#define __NR_acct                       (__NR_SYSCALL_BASE+ 51)
-#define __NR_umount2                    (__NR_SYSCALL_BASE+ 52)
-                                        /* 53 was sys_lock */
-#define __NR_ioctl                      (__NR_SYSCALL_BASE+ 54)
-#define __NR_fcntl                      (__NR_SYSCALL_BASE+ 55)
-                                        /* 56 was sys_mpx */
-#define __NR_setpgid                    (__NR_SYSCALL_BASE+ 57)
-                                        /* 58 was sys_ulimit */
-                                        /* 59 was sys_olduname */
-#define __NR_umask                      (__NR_SYSCALL_BASE+ 60)
-#define __NR_chroot                     (__NR_SYSCALL_BASE+ 61)
-#define __NR_ustat                      (__NR_SYSCALL_BASE+ 62)
-#define __NR_dup2                       (__NR_SYSCALL_BASE+ 63)
-#define __NR_getppid                    (__NR_SYSCALL_BASE+ 64)
-#define __NR_getpgrp                    (__NR_SYSCALL_BASE+ 65)
-#define __NR_setsid                     (__NR_SYSCALL_BASE+ 66)
-#define __NR_sigaction                  (__NR_SYSCALL_BASE+ 67)
-                                        /* 68 was sys_sgetmask */
-                                        /* 69 was sys_ssetmask */
-#define __NR_setreuid                   (__NR_SYSCALL_BASE+ 70)
-#define __NR_setregid                   (__NR_SYSCALL_BASE+ 71)
-#define __NR_sigsuspend                 (__NR_SYSCALL_BASE+ 72)
-#define __NR_sigpending                 (__NR_SYSCALL_BASE+ 73)
-#define __NR_sethostname                (__NR_SYSCALL_BASE+ 74)
-#define __NR_setrlimit                  (__NR_SYSCALL_BASE+ 75)
-#define __NR_getrlimit                  (__NR_SYSCALL_BASE+ 76) /* Back compat 2GB limited rlimit */
-#define __NR_getrusage                  (__NR_SYSCALL_BASE+ 77)
-#define __NR_gettimeofday               (__NR_SYSCALL_BASE+ 78)
-#define __NR_settimeofday               (__NR_SYSCALL_BASE+ 79)
-#define __NR_getgroups                  (__NR_SYSCALL_BASE+ 80)
-#define __NR_setgroups                  (__NR_SYSCALL_BASE+ 81)
-#define __NR_select                     (__NR_SYSCALL_BASE+ 82)
-#define __NR_symlink                    (__NR_SYSCALL_BASE+ 83)
-                                        /* 84 was sys_lstat */
-#define __NR_readlink                   (__NR_SYSCALL_BASE+ 85)
-#define __NR_uselib                     (__NR_SYSCALL_BASE+ 86)
-#define __NR_swapon                     (__NR_SYSCALL_BASE+ 87)
-#define __NR_reboot                     (__NR_SYSCALL_BASE+ 88)
-#define __NR_readdir                    (__NR_SYSCALL_BASE+ 89)
-#define __NR_mmap                       (__NR_SYSCALL_BASE+ 90)
-#define __NR_munmap                     (__NR_SYSCALL_BASE+ 91)
-#define __NR_truncate                   (__NR_SYSCALL_BASE+ 92)
-#define __NR_ftruncate                  (__NR_SYSCALL_BASE+ 93)
-#define __NR_fchmod                     (__NR_SYSCALL_BASE+ 94)
-#define __NR_fchown                     (__NR_SYSCALL_BASE+ 95)
-#define __NR_getpriority                (__NR_SYSCALL_BASE+ 96)
-#define __NR_setpriority                (__NR_SYSCALL_BASE+ 97)
-                                        /* 98 was sys_profil */
-#define __NR_statfs                     (__NR_SYSCALL_BASE+ 99)
-#define __NR_fstatfs                    (__NR_SYSCALL_BASE+100)
-                                        /* 101 was sys_ioperm */
-#define __NR_socketcall                 (__NR_SYSCALL_BASE+102)
-#define __NR_syslog                     (__NR_SYSCALL_BASE+103)
-#define __NR_setitimer                  (__NR_SYSCALL_BASE+104)
-#define __NR_getitimer                  (__NR_SYSCALL_BASE+105)
-#define __NR_stat                       (__NR_SYSCALL_BASE+106)
-#define __NR_lstat                      (__NR_SYSCALL_BASE+107)
-#define __NR_fstat                      (__NR_SYSCALL_BASE+108)
-                                        /* 109 was sys_uname */
-                                        /* 110 was sys_iopl */
-#define __NR_vhangup                    (__NR_SYSCALL_BASE+111)
-                                        /* 112 was sys_idle */
-#define __NR_syscall                    (__NR_SYSCALL_BASE+113) /* syscall to call a syscall! */
-#define __NR_wait4                      (__NR_SYSCALL_BASE+114)
-#define __NR_swapoff                    (__NR_SYSCALL_BASE+115)
-#define __NR_sysinfo                    (__NR_SYSCALL_BASE+116)
-#define __NR_ipc                        (__NR_SYSCALL_BASE+117)
-#define __NR_fsync                      (__NR_SYSCALL_BASE+118)
-#define __NR_sigreturn                  (__NR_SYSCALL_BASE+119)
-#define __NR_clone                      (__NR_SYSCALL_BASE+120)
-#define __NR_setdomainname              (__NR_SYSCALL_BASE+121)
-#define __NR_uname                      (__NR_SYSCALL_BASE+122)
-                                        /* 123 was sys_modify_ldt */
-#define __NR_adjtimex                   (__NR_SYSCALL_BASE+124)
-#define __NR_mprotect                   (__NR_SYSCALL_BASE+125)
-#define __NR_sigprocmask                (__NR_SYSCALL_BASE+126)
-                                        /* 127 was sys_create_module */
-#define __NR_init_module                (__NR_SYSCALL_BASE+128)
-#define __NR_delete_module              (__NR_SYSCALL_BASE+129)
-                                        /* 130 was sys_get_kernel_syms */
-#define __NR_quotactl                   (__NR_SYSCALL_BASE+131)
-#define __NR_getpgid                    (__NR_SYSCALL_BASE+132)
-#define __NR_fchdir                     (__NR_SYSCALL_BASE+133)
-#define __NR_bdflush                    (__NR_SYSCALL_BASE+134)
-#define __NR_sysfs                      (__NR_SYSCALL_BASE+135)
-#define __NR_personality                (__NR_SYSCALL_BASE+136)
-                                        /* 137 was sys_afs_syscall */
-#define __NR_setfsuid                   (__NR_SYSCALL_BASE+138)
-#define __NR_setfsgid                   (__NR_SYSCALL_BASE+139)
-#define __NR__llseek                    (__NR_SYSCALL_BASE+140)
-#define __NR_getdents                   (__NR_SYSCALL_BASE+141)
-#define __NR__newselect                 (__NR_SYSCALL_BASE+142)
-#define __NR_flock                      (__NR_SYSCALL_BASE+143)
-#define __NR_msync                      (__NR_SYSCALL_BASE+144)
-#define __NR_readv                      (__NR_SYSCALL_BASE+145)
-#define __NR_writev                     (__NR_SYSCALL_BASE+146)
-#define __NR_getsid                     (__NR_SYSCALL_BASE+147)
-#define __NR_fdatasync                  (__NR_SYSCALL_BASE+148)
-#define __NR__sysctl                    (__NR_SYSCALL_BASE+149)
-#define __NR_mlock                      (__NR_SYSCALL_BASE+150)
-#define __NR_munlock                    (__NR_SYSCALL_BASE+151)
-#define __NR_mlockall                   (__NR_SYSCALL_BASE+152)
-#define __NR_munlockall                 (__NR_SYSCALL_BASE+153)
-#define __NR_sched_setparam             (__NR_SYSCALL_BASE+154)
-#define __NR_sched_getparam             (__NR_SYSCALL_BASE+155)
-#define __NR_sched_setscheduler         (__NR_SYSCALL_BASE+156)
-#define __NR_sched_getscheduler         (__NR_SYSCALL_BASE+157)
-#define __NR_sched_yield                (__NR_SYSCALL_BASE+158)
-#define __NR_sched_get_priority_max     (__NR_SYSCALL_BASE+159)
-#define __NR_sched_get_priority_min     (__NR_SYSCALL_BASE+160)
-#define __NR_sched_rr_get_interval      (__NR_SYSCALL_BASE+161)
-#define __NR_nanosleep                  (__NR_SYSCALL_BASE+162)
-#define __NR_mremap                     (__NR_SYSCALL_BASE+163)
-#define __NR_setresuid                  (__NR_SYSCALL_BASE+164)
-#define __NR_getresuid                  (__NR_SYSCALL_BASE+165)
-                                        /* 166 was sys_vm86 */
-                                        /* 167 was sys_query_module */
-#define __NR_poll                       (__NR_SYSCALL_BASE+168)
-#define __NR_nfsservctl                 (__NR_SYSCALL_BASE+169)
-#define __NR_setresgid                  (__NR_SYSCALL_BASE+170)
-#define __NR_getresgid                  (__NR_SYSCALL_BASE+171)
-#define __NR_prctl                      (__NR_SYSCALL_BASE+172)
-#define __NR_rt_sigreturn               (__NR_SYSCALL_BASE+173)
-#define __NR_rt_sigaction               (__NR_SYSCALL_BASE+174)
-#define __NR_rt_sigprocmask             (__NR_SYSCALL_BASE+175)
-#define __NR_rt_sigpending              (__NR_SYSCALL_BASE+176)
-#define __NR_rt_sigtimedwait            (__NR_SYSCALL_BASE+177)
-#define __NR_rt_sigqueueinfo            (__NR_SYSCALL_BASE+178)
-#define __NR_rt_sigsuspend              (__NR_SYSCALL_BASE+179)
-#define __NR_pread64                    (__NR_SYSCALL_BASE+180)
-#define __NR_pwrite64                   (__NR_SYSCALL_BASE+181)
-#define __NR_chown                      (__NR_SYSCALL_BASE+182)
-#define __NR_getcwd                     (__NR_SYSCALL_BASE+183)
-#define __NR_capget                     (__NR_SYSCALL_BASE+184)
-#define __NR_capset                     (__NR_SYSCALL_BASE+185)
-#define __NR_sigaltstack                (__NR_SYSCALL_BASE+186)
-#define __NR_sendfile                   (__NR_SYSCALL_BASE+187)
-                                        /* 188 reserved */
-                                        /* 189 reserved */
-#define __NR_vfork                      (__NR_SYSCALL_BASE+190)
-#define __NR_ugetrlimit                 (__NR_SYSCALL_BASE+191) /* SuS compliant getrlimit */
-#define __NR_mmap2                      (__NR_SYSCALL_BASE+192)
-#define __NR_truncate64                 (__NR_SYSCALL_BASE+193)
-#define __NR_ftruncate64                (__NR_SYSCALL_BASE+194)
-#define __NR_stat64                     (__NR_SYSCALL_BASE+195)
-#define __NR_lstat64                    (__NR_SYSCALL_BASE+196)
-#define __NR_fstat64                    (__NR_SYSCALL_BASE+197)
-#define __NR_lchown32                   (__NR_SYSCALL_BASE+198)
-#define __NR_getuid32                   (__NR_SYSCALL_BASE+199)
-#define __NR_getgid32                   (__NR_SYSCALL_BASE+200)
-#define __NR_geteuid32                  (__NR_SYSCALL_BASE+201)
-#define __NR_getegid32                  (__NR_SYSCALL_BASE+202)
-#define __NR_setreuid32                 (__NR_SYSCALL_BASE+203)
-#define __NR_setregid32                 (__NR_SYSCALL_BASE+204)
-#define __NR_getgroups32                (__NR_SYSCALL_BASE+205)
-#define __NR_setgroups32                (__NR_SYSCALL_BASE+206)
-#define __NR_fchown32                   (__NR_SYSCALL_BASE+207)
-#define __NR_setresuid32                (__NR_SYSCALL_BASE+208)
-#define __NR_getresuid32                (__NR_SYSCALL_BASE+209)
-#define __NR_setresgid32                (__NR_SYSCALL_BASE+210)
-#define __NR_getresgid32                (__NR_SYSCALL_BASE+211)
-#define __NR_chown32                    (__NR_SYSCALL_BASE+212)
-#define __NR_setuid32                   (__NR_SYSCALL_BASE+213)
-#define __NR_setgid32                   (__NR_SYSCALL_BASE+214)
-#define __NR_setfsuid32                 (__NR_SYSCALL_BASE+215)
-#define __NR_setfsgid32                 (__NR_SYSCALL_BASE+216)
-#define __NR_getdents64                 (__NR_SYSCALL_BASE+217)
-#define __NR_pivot_root                 (__NR_SYSCALL_BASE+218)
-#define __NR_mincore                    (__NR_SYSCALL_BASE+219)
-#define __NR_madvise                    (__NR_SYSCALL_BASE+220)
-#define __NR_fcntl64                    (__NR_SYSCALL_BASE+221)
-                                        /* 222 for tux */
-                                        /* 223 is unused */
-#define __NR_gettid                     (__NR_SYSCALL_BASE+224)
-#define __NR_readahead                  (__NR_SYSCALL_BASE+225)
-#define __NR_setxattr                   (__NR_SYSCALL_BASE+226)
-#define __NR_lsetxattr                  (__NR_SYSCALL_BASE+227)
-#define __NR_fsetxattr                  (__NR_SYSCALL_BASE+228)
-#define __NR_getxattr                   (__NR_SYSCALL_BASE+229)
-#define __NR_lgetxattr                  (__NR_SYSCALL_BASE+230)
-#define __NR_fgetxattr                  (__NR_SYSCALL_BASE+231)
-#define __NR_listxattr                  (__NR_SYSCALL_BASE+232)
-#define __NR_llistxattr                 (__NR_SYSCALL_BASE+233)
-#define __NR_flistxattr                 (__NR_SYSCALL_BASE+234)
-#define __NR_removexattr                (__NR_SYSCALL_BASE+235)
-#define __NR_lremovexattr               (__NR_SYSCALL_BASE+236)
-#define __NR_fremovexattr               (__NR_SYSCALL_BASE+237)
-#define __NR_tkill                      (__NR_SYSCALL_BASE+238)
-#define __NR_sendfile64                 (__NR_SYSCALL_BASE+239)
-#define __NR_futex                      (__NR_SYSCALL_BASE+240)
-#define __NR_sched_setaffinity          (__NR_SYSCALL_BASE+241)
-#define __NR_sched_getaffinity          (__NR_SYSCALL_BASE+242)
-#define __NR_io_setup                   (__NR_SYSCALL_BASE+243)
-#define __NR_io_destroy                 (__NR_SYSCALL_BASE+244)
-#define __NR_io_getevents               (__NR_SYSCALL_BASE+245)
-#define __NR_io_submit                  (__NR_SYSCALL_BASE+246)
-#define __NR_io_cancel                  (__NR_SYSCALL_BASE+247)
-#define __NR_exit_group                 (__NR_SYSCALL_BASE+248)
-#define __NR_lookup_dcookie             (__NR_SYSCALL_BASE+249)
-#define __NR_epoll_create               (__NR_SYSCALL_BASE+250)
-#define __NR_epoll_ctl                  (__NR_SYSCALL_BASE+251)
-#define __NR_epoll_wait                 (__NR_SYSCALL_BASE+252)
-#define __NR_remap_file_pages           (__NR_SYSCALL_BASE+253)
-                                        /* 254 for set_thread_area */
-                                        /* 255 for get_thread_area */
-#define __NR_set_tid_address            (__NR_SYSCALL_BASE+256)
-#define __NR_timer_create               (__NR_SYSCALL_BASE+257)
-#define __NR_timer_settime              (__NR_SYSCALL_BASE+258)
-#define __NR_timer_gettime              (__NR_SYSCALL_BASE+259)
-#define __NR_timer_getoverrun           (__NR_SYSCALL_BASE+260)
-#define __NR_timer_delete               (__NR_SYSCALL_BASE+261)
-#define __NR_clock_settime              (__NR_SYSCALL_BASE+262)
-#define __NR_clock_gettime              (__NR_SYSCALL_BASE+263)
-#define __NR_clock_getres               (__NR_SYSCALL_BASE+264)
-#define __NR_clock_nanosleep            (__NR_SYSCALL_BASE+265)
-#define __NR_statfs64                   (__NR_SYSCALL_BASE+266)
-#define __NR_fstatfs64                  (__NR_SYSCALL_BASE+267)
-#define __NR_tgkill                     (__NR_SYSCALL_BASE+268)
-#define __NR_utimes                     (__NR_SYSCALL_BASE+269)
-#define __NR_arm_fadvise64_64           (__NR_SYSCALL_BASE+270)
-#define __NR_pciconfig_iobase           (__NR_SYSCALL_BASE+271)
-#define __NR_pciconfig_read             (__NR_SYSCALL_BASE+272)
-#define __NR_pciconfig_write            (__NR_SYSCALL_BASE+273)
-#define __NR_mq_open                    (__NR_SYSCALL_BASE+274)
-#define __NR_mq_unlink                  (__NR_SYSCALL_BASE+275)
-#define __NR_mq_timedsend               (__NR_SYSCALL_BASE+276)
-#define __NR_mq_timedreceive            (__NR_SYSCALL_BASE+277)
-#define __NR_mq_notify                  (__NR_SYSCALL_BASE+278)
-#define __NR_mq_getsetattr              (__NR_SYSCALL_BASE+279)
-#define __NR_waitid                     (__NR_SYSCALL_BASE+280)
-#define __NR_socket                     (__NR_SYSCALL_BASE+281)
-#define __NR_bind                       (__NR_SYSCALL_BASE+282)
-#define __NR_connect                    (__NR_SYSCALL_BASE+283)
-#define __NR_listen                     (__NR_SYSCALL_BASE+284)
-#define __NR_accept                     (__NR_SYSCALL_BASE+285)
-#define __NR_getsockname                (__NR_SYSCALL_BASE+286)
-#define __NR_getpeername                (__NR_SYSCALL_BASE+287)
-#define __NR_socketpair                 (__NR_SYSCALL_BASE+288)
-#define __NR_send                       (__NR_SYSCALL_BASE+289)
-#define __NR_sendto                     (__NR_SYSCALL_BASE+290)
-#define __NR_recv                       (__NR_SYSCALL_BASE+291)
-#define __NR_recvfrom                   (__NR_SYSCALL_BASE+292)
-#define __NR_shutdown                   (__NR_SYSCALL_BASE+293)
-#define __NR_setsockopt                 (__NR_SYSCALL_BASE+294)
-#define __NR_getsockopt                 (__NR_SYSCALL_BASE+295)
-#define __NR_sendmsg                    (__NR_SYSCALL_BASE+296)
-#define __NR_recvmsg                    (__NR_SYSCALL_BASE+297)
-#define __NR_semop                      (__NR_SYSCALL_BASE+298)
-#define __NR_semget                     (__NR_SYSCALL_BASE+299)
-#define __NR_semctl                     (__NR_SYSCALL_BASE+300)
-#define __NR_msgsnd                     (__NR_SYSCALL_BASE+301)
-#define __NR_msgrcv                     (__NR_SYSCALL_BASE+302)
-#define __NR_msgget                     (__NR_SYSCALL_BASE+303)
-#define __NR_msgctl                     (__NR_SYSCALL_BASE+304)
-#define __NR_shmat                      (__NR_SYSCALL_BASE+305)
-#define __NR_shmdt                      (__NR_SYSCALL_BASE+306)
-#define __NR_shmget                     (__NR_SYSCALL_BASE+307)
-#define __NR_shmctl                     (__NR_SYSCALL_BASE+308)
-#define __NR_add_key                    (__NR_SYSCALL_BASE+309)
-#define __NR_request_key                (__NR_SYSCALL_BASE+310)
-#define __NR_keyctl                     (__NR_SYSCALL_BASE+311)
-#define __NR_semtimedop                 (__NR_SYSCALL_BASE+312)
-#define __NR_vserver                    (__NR_SYSCALL_BASE+313)
-#define __NR_ioprio_set                 (__NR_SYSCALL_BASE+314)
-#define __NR_ioprio_get                 (__NR_SYSCALL_BASE+315)
-#define __NR_inotify_init               (__NR_SYSCALL_BASE+316)
-#define __NR_inotify_add_watch          (__NR_SYSCALL_BASE+317)
-#define __NR_inotify_rm_watch           (__NR_SYSCALL_BASE+318)
-#define __NR_mbind                      (__NR_SYSCALL_BASE+319)
-#define __NR_get_mempolicy              (__NR_SYSCALL_BASE+320)
-#define __NR_set_mempolicy              (__NR_SYSCALL_BASE+321)
-#define __NR_openat                     (__NR_SYSCALL_BASE+322)
-#define __NR_mkdirat                    (__NR_SYSCALL_BASE+323)
-#define __NR_mknodat                    (__NR_SYSCALL_BASE+324)
-#define __NR_fchownat                   (__NR_SYSCALL_BASE+325)
-#define __NR_futimesat                  (__NR_SYSCALL_BASE+326)
-#define __NR_fstatat64                  (__NR_SYSCALL_BASE+327)
-#define __NR_unlinkat                   (__NR_SYSCALL_BASE+328)
-#define __NR_renameat                   (__NR_SYSCALL_BASE+329)
-#define __NR_linkat                     (__NR_SYSCALL_BASE+330)
-#define __NR_symlinkat                  (__NR_SYSCALL_BASE+331)
-#define __NR_readlinkat                 (__NR_SYSCALL_BASE+332)
-#define __NR_fchmodat                   (__NR_SYSCALL_BASE+333)
-#define __NR_faccessat                  (__NR_SYSCALL_BASE+334)
-#define __NR_pselect6                   (__NR_SYSCALL_BASE+335)
-#define __NR_ppoll                      (__NR_SYSCALL_BASE+336)
-#define __NR_unshare                    (__NR_SYSCALL_BASE+337)
-#define __NR_set_robust_list            (__NR_SYSCALL_BASE+338)
-#define __NR_get_robust_list            (__NR_SYSCALL_BASE+339)
-#define __NR_splice                     (__NR_SYSCALL_BASE+340)
-#define __NR_arm_sync_file_range        (__NR_SYSCALL_BASE+341)
-#define __NR_sync_file_range2           __NR_arm_sync_file_range
-#define __NR_tee                        (__NR_SYSCALL_BASE+342)
-#define __NR_vmsplice                   (__NR_SYSCALL_BASE+343)
-#define __NR_move_pages                 (__NR_SYSCALL_BASE+344)
-#define __NR_getcpu                     (__NR_SYSCALL_BASE+345)
-#define __NR_epoll_pwait                (__NR_SYSCALL_BASE+346)
-#define __NR_kexec_load                 (__NR_SYSCALL_BASE+347)
-#define __NR_utimensat                  (__NR_SYSCALL_BASE+348)
-#define __NR_signalfd                   (__NR_SYSCALL_BASE+349)
-#define __NR_timerfd_create             (__NR_SYSCALL_BASE+350)
-#define __NR_eventfd                    (__NR_SYSCALL_BASE+351)
-#define __NR_fallocate                  (__NR_SYSCALL_BASE+352)
-#define __NR_timerfd_settime            (__NR_SYSCALL_BASE+353)
-#define __NR_timerfd_gettime            (__NR_SYSCALL_BASE+354)
-#define __NR_signalfd4                  (__NR_SYSCALL_BASE+355)
-#define __NR_eventfd2                   (__NR_SYSCALL_BASE+356)
-#define __NR_epoll_create1              (__NR_SYSCALL_BASE+357)
-#define __NR_dup3                       (__NR_SYSCALL_BASE+358)
-#define __NR_pipe2                      (__NR_SYSCALL_BASE+359)
-#define __NR_inotify_init1              (__NR_SYSCALL_BASE+360)
-#define __NR_preadv                     (__NR_SYSCALL_BASE+361)
-#define __NR_pwritev                    (__NR_SYSCALL_BASE+362)
-#define __NR_rt_tgsigqueueinfo          (__NR_SYSCALL_BASE+363)
-#define __NR_perf_event_open            (__NR_SYSCALL_BASE+364)
-#define __NR_recvmmsg                   (__NR_SYSCALL_BASE+365)
-#define __NR_accept4                    (__NR_SYSCALL_BASE+366)
-#define __NR_fanotify_init              (__NR_SYSCALL_BASE+367)
-#define __NR_fanotify_mark              (__NR_SYSCALL_BASE+368)
-#define __NR_prlimit64                  (__NR_SYSCALL_BASE+369)
-#define __NR_name_to_handle_at          (__NR_SYSCALL_BASE+370)
-#define __NR_open_by_handle_at          (__NR_SYSCALL_BASE+371)
-#define __NR_clock_adjtime              (__NR_SYSCALL_BASE+372)
-#define __NR_syncfs                     (__NR_SYSCALL_BASE+373)
-#define __NR_sendmmsg                   (__NR_SYSCALL_BASE+374)
-#define __NR_setns                      (__NR_SYSCALL_BASE+375)
-#define __NR_process_vm_readv           (__NR_SYSCALL_BASE+376)
-#define __NR_process_vm_writev          (__NR_SYSCALL_BASE+377)
-                                        /* 378 for kcmp */
-
-/*
- * This may need to be greater than __NR_last_syscall+1 in order to
- * account for the padding in the syscall table
- */
-#ifdef __KERNEL__
 #define __NR_syscalls  (380)
-#endif /* __KERNEL__ */
-
-/*
- * The following SWIs are ARM private.
- */
-#define __ARM_NR_BASE                   (__NR_SYSCALL_BASE+0x0f0000)
-#define __ARM_NR_breakpoint             (__ARM_NR_BASE+1)
-#define __ARM_NR_cacheflush             (__ARM_NR_BASE+2)
-#define __ARM_NR_usr26                  (__ARM_NR_BASE+3)
-#define __ARM_NR_usr32                  (__ARM_NR_BASE+4)
-#define __ARM_NR_set_tls                (__ARM_NR_BASE+5)
-
-/*
- * *NOTE*: This is a ghost syscall private to the kernel.  Only the
- * __kuser_cmpxchg code in entry-armv.S should be aware of its
- * existence.  Don't ever use this from user code.
- */
-#ifdef __KERNEL__
 #define __ARM_NR_cmpxchg                (__ARM_NR_BASE+0x00fff0)
-#endif
-
-/*
- * The following syscalls are obsolete and no longer available for EABI.
- */
-#if !defined(__KERNEL__)
-#if defined(__ARM_EABI__)
-#undef __NR_time
-#undef __NR_umount
-#undef __NR_stime
-#undef __NR_alarm
-#undef __NR_utime
-#undef __NR_getrlimit
-#undef __NR_select
-#undef __NR_readdir
-#undef __NR_mmap
-#undef __NR_socketcall
-#undef __NR_syscall
-#undef __NR_ipc
-#endif
-#endif
-
-#ifdef __KERNEL__
 
 #define __ARCH_WANT_STAT64
 #define __ARCH_WANT_SYS_GETHOSTNAME
@@ -495,5 +58,4 @@
 #define __IGNORE_migrate_pages
 #define __IGNORE_kcmp
 
-#endif /* __KERNEL__ */
 #endif /* __ASM_ARM_UNISTD_H */
diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild
index baebb3da1d44..47bcb2d254af 100644
--- a/arch/arm/include/uapi/asm/Kbuild
+++ b/arch/arm/include/uapi/asm/Kbuild
@@ -1,3 +1,19 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
+header-y += a.out.h
+header-y += byteorder.h
+header-y += fcntl.h
+header-y += hwcap.h
+header-y += ioctls.h
+header-y += kvm_para.h
+header-y += mman.h
+header-y += posix_types.h
+header-y += ptrace.h
+header-y += setup.h
+header-y += sigcontext.h
+header-y += signal.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += unistd.h
diff --git a/arch/arm/include/asm/a.out.h b/arch/arm/include/uapi/asm/a.out.h
index 083894b2e3bc..083894b2e3bc 100644
--- a/arch/arm/include/asm/a.out.h
+++ b/arch/arm/include/uapi/asm/a.out.h
diff --git a/arch/arm/include/asm/byteorder.h b/arch/arm/include/uapi/asm/byteorder.h
index 77379748b171..77379748b171 100644
--- a/arch/arm/include/asm/byteorder.h
+++ b/arch/arm/include/uapi/asm/byteorder.h
diff --git a/arch/arm/include/asm/fcntl.h b/arch/arm/include/uapi/asm/fcntl.h
index a80b6607b2ef..a80b6607b2ef 100644
--- a/arch/arm/include/asm/fcntl.h
+++ b/arch/arm/include/uapi/asm/fcntl.h
diff --git a/arch/arm/include/uapi/asm/hwcap.h b/arch/arm/include/uapi/asm/hwcap.h
new file mode 100644
index 000000000000..f254f6503cce
--- /dev/null
+++ b/arch/arm/include/uapi/asm/hwcap.h
@@ -0,0 +1,29 @@
+#ifndef _UAPI__ASMARM_HWCAP_H
+#define _UAPI__ASMARM_HWCAP_H
+
+/*
+ * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
+ */
+#define HWCAP_SWP       (1 << 0)
+#define HWCAP_HALF      (1 << 1)
+#define HWCAP_THUMB     (1 << 2)
+#define HWCAP_26BIT     (1 << 3)        /* Play it safe */
+#define HWCAP_FAST_MULT (1 << 4)
+#define HWCAP_FPA       (1 << 5)
+#define HWCAP_VFP       (1 << 6)
+#define HWCAP_EDSP      (1 << 7)
+#define HWCAP_JAVA      (1 << 8)
+#define HWCAP_IWMMXT    (1 << 9)
+#define HWCAP_CRUNCH    (1 << 10)
+#define HWCAP_THUMBEE   (1 << 11)
+#define HWCAP_NEON      (1 << 12)
+#define HWCAP_VFPv3     (1 << 13)
+#define HWCAP_VFPv3D16  (1 << 14)
+#define HWCAP_TLS       (1 << 15)
+#define HWCAP_VFPv4     (1 << 16)
+#define HWCAP_IDIVA     (1 << 17)
+#define HWCAP_IDIVT     (1 << 18)
+#define HWCAP_IDIV      (HWCAP_IDIVA | HWCAP_IDIVT)
+
+
+#endif /* _UAPI__ASMARM_HWCAP_H */
diff --git a/arch/arm/include/asm/ioctls.h b/arch/arm/include/uapi/asm/ioctls.h
index 9c9629816128..9c9629816128 100644
--- a/arch/arm/include/asm/ioctls.h
+++ b/arch/arm/include/uapi/asm/ioctls.h
diff --git a/arch/arm/include/asm/kvm_para.h b/arch/arm/include/uapi/asm/kvm_para.h
index 14fab8f0b957..14fab8f0b957 100644
--- a/arch/arm/include/asm/kvm_para.h
+++ b/arch/arm/include/uapi/asm/kvm_para.h
diff --git a/arch/arm/include/asm/mman.h b/arch/arm/include/uapi/asm/mman.h
index 41f99c573b93..41f99c573b93 100644
--- a/arch/arm/include/asm/mman.h
+++ b/arch/arm/include/uapi/asm/mman.h
diff --git a/arch/arm/include/asm/posix_types.h b/arch/arm/include/uapi/asm/posix_types.h
index d2de9cbbcd9b..d2de9cbbcd9b 100644
--- a/arch/arm/include/asm/posix_types.h
+++ b/arch/arm/include/uapi/asm/posix_types.h
diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
new file mode 100644
index 000000000000..96ee0929790f
--- /dev/null
+++ b/arch/arm/include/uapi/asm/ptrace.h
@@ -0,0 +1,138 @@
+/*
+ *  arch/arm/include/asm/ptrace.h
+ *
+ *  Copyright (C) 1996-2003 Russell King
+ *
+ * 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.
+ */
+#ifndef _UAPI__ASM_ARM_PTRACE_H
+#define _UAPI__ASM_ARM_PTRACE_H
+
+#include <asm/hwcap.h>
+
+#define PTRACE_GETREGS          12
+#define PTRACE_SETREGS          13
+#define PTRACE_GETFPREGS        14
+#define PTRACE_SETFPREGS        15
+/* PTRACE_ATTACH is 16 */
+/* PTRACE_DETACH is 17 */
+#define PTRACE_GETWMMXREGS      18
+#define PTRACE_SETWMMXREGS      19
+/* 20 is unused */
+#define PTRACE_OLDSETOPTIONS    21
+#define PTRACE_GET_THREAD_AREA  22
+#define PTRACE_SET_SYSCALL      23
+/* PTRACE_SYSCALL is 24 */
+#define PTRACE_GETCRUNCHREGS    25
+#define PTRACE_SETCRUNCHREGS    26
+#define PTRACE_GETVFPREGS       27
+#define PTRACE_SETVFPREGS       28
+#define PTRACE_GETHBPREGS       29
+#define PTRACE_SETHBPREGS       30
+
+/*
+ * PSR bits
+ */
+#define USR26_MODE      0x00000000
+#define FIQ26_MODE      0x00000001
+#define IRQ26_MODE      0x00000002
+#define SVC26_MODE      0x00000003
+#define USR_MODE        0x00000010
+#define FIQ_MODE        0x00000011
+#define IRQ_MODE        0x00000012
+#define SVC_MODE        0x00000013
+#define ABT_MODE        0x00000017
+#define HYP_MODE        0x0000001a
+#define UND_MODE        0x0000001b
+#define SYSTEM_MODE     0x0000001f
+#define MODE32_BIT      0x00000010
+#define MODE_MASK       0x0000001f
+#define PSR_T_BIT       0x00000020
+#define PSR_F_BIT       0x00000040
+#define PSR_I_BIT       0x00000080
+#define PSR_A_BIT       0x00000100
+#define PSR_E_BIT       0x00000200
+#define PSR_J_BIT       0x01000000
+#define PSR_Q_BIT       0x08000000
+#define PSR_V_BIT       0x10000000
+#define PSR_C_BIT       0x20000000
+#define PSR_Z_BIT       0x40000000
+#define PSR_N_BIT       0x80000000
+
+/*
+ * Groups of PSR bits
+ */
+#define PSR_f           0xff000000      /* Flags                */
+#define PSR_s           0x00ff0000      /* Status               */
+#define PSR_x           0x0000ff00      /* Extension            */
+#define PSR_c           0x000000ff      /* Control              */
+
+/*
+ * ARMv7 groups of PSR bits
+ */
+#define APSR_MASK       0xf80f0000      /* N, Z, C, V, Q and GE flags */
+#define PSR_ISET_MASK   0x01000010      /* ISA state (J, T) mask */
+#define PSR_IT_MASK     0x0600fc00      /* If-Then execution state mask */
+#define PSR_ENDIAN_MASK 0x00000200      /* Endianness state mask */
+
+/*
+ * Default endianness state
+ */
+#ifdef CONFIG_CPU_ENDIAN_BE8
+#define PSR_ENDSTATE    PSR_E_BIT
+#else
+#define PSR_ENDSTATE    0
+#endif
+
+/* 
+ * These are 'magic' values for PTRACE_PEEKUSR that return info about where a
+ * process is located in memory.
+ */
+#define PT_TEXT_ADDR            0x10000
+#define PT_DATA_ADDR            0x10004
+#define PT_TEXT_END_ADDR        0x10008
+
+#ifndef __ASSEMBLY__
+
+/*
+ * This struct defines the way the registers are stored on the
+ * stack during a system call.  Note that sizeof(struct pt_regs)
+ * has to be a multiple of 8.
+ */
+#ifndef __KERNEL__
+struct pt_regs {
+        long uregs[18];
+};
+#endif /* __KERNEL__ */
+
+#define ARM_cpsr        uregs[16]
+#define ARM_pc          uregs[15]
+#define ARM_lr          uregs[14]
+#define ARM_sp          uregs[13]
+#define ARM_ip          uregs[12]
+#define ARM_fp          uregs[11]
+#define ARM_r10         uregs[10]
+#define ARM_r9          uregs[9]
+#define ARM_r8          uregs[8]
+#define ARM_r7          uregs[7]
+#define ARM_r6          uregs[6]
+#define ARM_r5          uregs[5]
+#define ARM_r4          uregs[4]
+#define ARM_r3          uregs[3]
+#define ARM_r2          uregs[2]
+#define ARM_r1          uregs[1]
+#define ARM_r0          uregs[0]
+#define ARM_ORIG_r0     uregs[17]
+
+/*
+ * The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
+ * and core dumps.
+ */
+#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
+
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* _UAPI__ASM_ARM_PTRACE_H */
diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h
new file mode 100644
index 000000000000..979ff4016404
--- /dev/null
+++ b/arch/arm/include/uapi/asm/setup.h
@@ -0,0 +1,187 @@
+/*
+ *  linux/include/asm/setup.h
+ *
+ *  Copyright (C) 1997-1999 Russell King
+ *
+ * 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.
+ *
+ *  Structure passed to kernel to tell it about the
+ *  hardware it's running on.  See Documentation/arm/Setup
+ *  for more info.
+ */
+#ifndef _UAPI__ASMARM_SETUP_H
+#define _UAPI__ASMARM_SETUP_H
+
+#include <linux/types.h>
+
+#define COMMAND_LINE_SIZE 1024
+
+/* The list ends with an ATAG_NONE node. */
+#define ATAG_NONE       0x00000000
+
+struct tag_header {
+        __u32 size;
+        __u32 tag;
+};
+
+/* The list must start with an ATAG_CORE node */
+#define ATAG_CORE       0x54410001
+
+struct tag_core {
+        __u32 flags;            /* bit 0 = read-only */
+        __u32 pagesize;
+        __u32 rootdev;
+};
+
+/* it is allowed to have multiple ATAG_MEM nodes */
+#define ATAG_MEM        0x54410002
+
+struct tag_mem32 {
+        __u32   size;
+        __u32   start;  /* physical start address */
+};
+
+/* VGA text type displays */
+#define ATAG_VIDEOTEXT  0x54410003
+
+struct tag_videotext {
+        __u8            x;
+        __u8            y;
+        __u16           video_page;
+        __u8            video_mode;
+        __u8            video_cols;
+        __u16           video_ega_bx;
+        __u8            video_lines;
+        __u8            video_isvga;
+        __u16           video_points;
+};
+
+/* describes how the ramdisk will be used in kernel */
+#define ATAG_RAMDISK    0x54410004
+
+struct tag_ramdisk {
+        __u32 flags;    /* bit 0 = load, bit 1 = prompt */
+        __u32 size;     /* decompressed ramdisk size in _kilo_ bytes */
+        __u32 start;    /* starting block of floppy-based RAM disk image */
+};
+
+/* describes where the compressed ramdisk image lives (virtual address) */
+/*
+ * this one accidentally used virtual addresses - as such,
+ * it's deprecated.
+ */
+#define ATAG_INITRD     0x54410005
+
+/* describes where the compressed ramdisk image lives (physical address) */
+#define ATAG_INITRD2    0x54420005
+
+struct tag_initrd {
+        __u32 start;    /* physical start address */
+        __u32 size;     /* size of compressed ramdisk image in bytes */
+};
+
+/* board serial number. "64 bits should be enough for everybody" */
+#define ATAG_SERIAL     0x54410006
+
+struct tag_serialnr {
+        __u32 low;
+        __u32 high;
+};
+
+/* board revision */
+#define ATAG_REVISION   0x54410007
+
+struct tag_revision {
+        __u32 rev;
+};
+
+/* initial values for vesafb-type framebuffers. see struct screen_info
+ * in include/linux/tty.h
+ */
+#define ATAG_VIDEOLFB   0x54410008
+
+struct tag_videolfb {
+        __u16           lfb_width;
+        __u16           lfb_height;
+        __u16           lfb_depth;
+        __u16           lfb_linelength;
+        __u32           lfb_base;
+        __u32           lfb_size;
+        __u8            red_size;
+        __u8            red_pos;
+        __u8            green_size;
+        __u8            green_pos;
+        __u8            blue_size;
+        __u8            blue_pos;
+        __u8            rsvd_size;
+        __u8            rsvd_pos;
+};
+
+/* command line: \0 terminated string */
+#define ATAG_CMDLINE    0x54410009
+
+struct tag_cmdline {
+        char    cmdline[1];     /* this is the minimum size */
+};
+
+/* acorn RiscPC specific information */
+#define ATAG_ACORN      0x41000101
+
+struct tag_acorn {
+        __u32 memc_control_reg;
+        __u32 vram_pages;
+        __u8 sounddefault;
+        __u8 adfsdrives;
+};
+
+/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
+#define ATAG_MEMCLK     0x41000402
+
+struct tag_memclk {
+        __u32 fmemclk;
+};
+
+struct tag {
+        struct tag_header hdr;
+        union {
+                struct tag_core         core;
+                struct tag_mem32        mem;
+                struct tag_videotext    videotext;
+                struct tag_ramdisk      ramdisk;
+                struct tag_initrd       initrd;
+                struct tag_serialnr     serialnr;
+                struct tag_revision     revision;
+                struct tag_videolfb     videolfb;
+                struct tag_cmdline      cmdline;
+
+                /*
+                 * Acorn specific
+                 */
+                struct tag_acorn        acorn;
+
+                /*
+                 * DC21285 specific
+                 */
+                struct tag_memclk       memclk;
+        } u;
+};
+
+struct tagtable {
+        __u32 tag;
+        int (*parse)(const struct tag *);
+};
+
+#define tag_member_present(tag,member)                          \
+        ((unsigned long)(&((struct tag *)0L)->member + 1)       \
+                <= (tag)->hdr.size * 4)
+
+#define tag_next(t)     ((struct tag *)((__u32 *)(t) + (t)->hdr.size))
+#define tag_size(type)  ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
+
+#define for_each_tag(t,base)            \
+        for (t = base; t->hdr.size; t = tag_next(t))
+
+
+#endif /* _UAPI__ASMARM_SETUP_H */
diff --git a/arch/arm/include/asm/sigcontext.h b/arch/arm/include/uapi/asm/sigcontext.h
index fc0b80b6a6fc..fc0b80b6a6fc 100644
--- a/arch/arm/include/asm/sigcontext.h
+++ b/arch/arm/include/uapi/asm/sigcontext.h
diff --git a/arch/arm/include/uapi/asm/signal.h b/arch/arm/include/uapi/asm/signal.h
new file mode 100644
index 000000000000..921c57fdc52e
--- /dev/null
+++ b/arch/arm/include/uapi/asm/signal.h
@@ -0,0 +1,127 @@
+#ifndef _UAPI_ASMARM_SIGNAL_H
+#define _UAPI_ASMARM_SIGNAL_H
+
+#include <linux/types.h>
+
+/* Avoid too many header ordering problems.  */
+struct siginfo;
+
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+
+#define NSIG            32
+typedef unsigned long sigset_t;
+
+#endif /* __KERNEL__ */
+
+#define SIGHUP           1
+#define SIGINT           2
+#define SIGQUIT          3
+#define SIGILL           4
+#define SIGTRAP          5
+#define SIGABRT          6
+#define SIGIOT           6
+#define SIGBUS           7
+#define SIGFPE           8
+#define SIGKILL          9
+#define SIGUSR1         10
+#define SIGSEGV         11
+#define SIGUSR2         12
+#define SIGPIPE         13
+#define SIGALRM         14
+#define SIGTERM         15
+#define SIGSTKFLT       16
+#define SIGCHLD         17
+#define SIGCONT         18
+#define SIGSTOP         19
+#define SIGTSTP         20
+#define SIGTTIN         21
+#define SIGTTOU         22
+#define SIGURG          23
+#define SIGXCPU         24
+#define SIGXFSZ         25
+#define SIGVTALRM       26
+#define SIGPROF         27
+#define SIGWINCH        28
+#define SIGIO           29
+#define SIGPOLL         SIGIO
+/*
+#define SIGLOST         29
+*/
+#define SIGPWR          30
+#define SIGSYS          31
+#define SIGUNUSED       31
+
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#define SIGRTMAX        _NSIG
+
+#define SIGSWI          32
+
+/*
+ * SA_FLAGS values:
+ *
+ * SA_NOCLDSTOP         flag to turn off SIGCHLD when children stop.
+ * SA_NOCLDWAIT         flag on SIGCHLD to inhibit zombies.
+ * SA_SIGINFO           deliver the signal with SIGINFO structs
+ * SA_THIRTYTWO         delivers the signal in 32-bit mode, even if the task 
+ *                      is running in 26-bit.
+ * SA_ONSTACK           allows alternate signal stacks (see sigaltstack(2)).
+ * SA_RESTART           flag to get restarting signals (which were the default long ago)
+ * SA_NODEFER           prevents the current signal from being masked in the handler.
+ * SA_RESETHAND         clears the handler when the signal is delivered.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_NOCLDSTOP    0x00000001
+#define SA_NOCLDWAIT    0x00000002
+#define SA_SIGINFO      0x00000004
+#define SA_THIRTYTWO    0x02000000
+#define SA_RESTORER     0x04000000
+#define SA_ONSTACK      0x08000000
+#define SA_RESTART      0x10000000
+#define SA_NODEFER      0x40000000
+#define SA_RESETHAND    0x80000000
+
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+
+
+/* 
+ * sigaltstack controls
+ */
+#define SS_ONSTACK      1
+#define SS_DISABLE      2
+
+#define MINSIGSTKSZ     2048
+#define SIGSTKSZ        8192
+
+#include <asm-generic/signal-defs.h>
+
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+
+struct sigaction {
+        union {
+          __sighandler_t _sa_handler;
+          void (*_sa_sigaction)(int, struct siginfo *, void *);
+        } _u;
+        sigset_t sa_mask;
+        unsigned long sa_flags;
+        void (*sa_restorer)(void);
+};
+
+#define sa_handler      _u._sa_handler
+#define sa_sigaction    _u._sa_sigaction
+
+#endif /* __KERNEL__ */
+
+typedef struct sigaltstack {
+        void __user *ss_sp;
+        int ss_flags;
+        size_t ss_size;
+} stack_t;
+
+
+#endif /* _UAPI_ASMARM_SIGNAL_H */
diff --git a/arch/arm/include/asm/stat.h b/arch/arm/include/uapi/asm/stat.h
index 42c0c13999d5..42c0c13999d5 100644
--- a/arch/arm/include/asm/stat.h
+++ b/arch/arm/include/uapi/asm/stat.h
diff --git a/arch/arm/include/asm/statfs.h b/arch/arm/include/uapi/asm/statfs.h
index 079447c05ba7..079447c05ba7 100644
--- a/arch/arm/include/asm/statfs.h
+++ b/arch/arm/include/uapi/asm/statfs.h
diff --git a/arch/arm/include/uapi/asm/swab.h b/arch/arm/include/uapi/asm/swab.h
new file mode 100644
index 000000000000..6fcb32a5c453
--- /dev/null
+++ b/arch/arm/include/uapi/asm/swab.h
@@ -0,0 +1,53 @@
+/*
+ *  arch/arm/include/asm/byteorder.h
+ *
+ * ARM Endian-ness.  In little endian mode, the data bus is connected such
+ * that byte accesses appear as:
+ *  0 = d0...d7, 1 = d8...d15, 2 = d16...d23, 3 = d24...d31
+ * and word accesses (data or instruction) appear as:
+ *  d0...d31
+ *
+ * When in big endian mode, byte accesses appear as:
+ *  0 = d24...d31, 1 = d16...d23, 2 = d8...d15, 3 = d0...d7
+ * and word accesses (data or instruction) appear as:
+ *  d0...d31
+ */
+#ifndef _UAPI__ASM_ARM_SWAB_H
+#define _UAPI__ASM_ARM_SWAB_H
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
+#  define __SWAB_64_THRU_32__
+#endif
+
+
+#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6
+static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
+{
+        __u32 t;
+
+#ifndef __thumb__
+        if (!__builtin_constant_p(x)) {
+                /*
+                 * The compiler needs a bit of a hint here to always do the
+                 * right thing and not screw it up to different degrees
+                 * depending on the gcc version.
+                 */
+                asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
+        } else
+#endif
+                t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */
+
+        x = (x << 24) | (x >> 8);               /* mov r0,r0,ror #8      */
+        t &= ~0x00FF0000;                       /* bic r1,r1,#0x00FF0000 */
+        x ^= (t >> 8);                          /* eor r0,r0,r1,lsr #8   */
+
+        return x;
+}
+#define __arch_swab32 __arch_swab32
+
+#endif
+
+#endif /* _UAPI__ASM_ARM_SWAB_H */
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h
new file mode 100644
index 000000000000..ac03bdb4ae44
--- /dev/null
+++ b/arch/arm/include/uapi/asm/unistd.h
@@ -0,0 +1,450 @@
+/*
+ *  arch/arm/include/asm/unistd.h
+ *
+ *  Copyright (C) 2001-2005 Russell King
+ *
+ * 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.
+ *
+ * Please forward _all_ changes to this file to rmk@arm.linux.org.uk,
+ * no matter what the change is.  Thanks!
+ */
+#ifndef _UAPI__ASM_ARM_UNISTD_H
+#define _UAPI__ASM_ARM_UNISTD_H
+
+#define __NR_OABI_SYSCALL_BASE  0x900000
+
+#if defined(__thumb__) || defined(__ARM_EABI__)
+#define __NR_SYSCALL_BASE       0
+#else
+#define __NR_SYSCALL_BASE       __NR_OABI_SYSCALL_BASE
+#endif
+
+/*
+ * This file contains the system call numbers.
+ */
+
+#define __NR_restart_syscall            (__NR_SYSCALL_BASE+  0)
+#define __NR_exit                       (__NR_SYSCALL_BASE+  1)
+#define __NR_fork                       (__NR_SYSCALL_BASE+  2)
+#define __NR_read                       (__NR_SYSCALL_BASE+  3)
+#define __NR_write                      (__NR_SYSCALL_BASE+  4)
+#define __NR_open                       (__NR_SYSCALL_BASE+  5)
+#define __NR_close                      (__NR_SYSCALL_BASE+  6)
+                                        /* 7 was sys_waitpid */
+#define __NR_creat                      (__NR_SYSCALL_BASE+  8)
+#define __NR_link                       (__NR_SYSCALL_BASE+  9)
+#define __NR_unlink                     (__NR_SYSCALL_BASE+ 10)
+#define __NR_execve                     (__NR_SYSCALL_BASE+ 11)
+#define __NR_chdir                      (__NR_SYSCALL_BASE+ 12)
+#define __NR_time                       (__NR_SYSCALL_BASE+ 13)
+#define __NR_mknod                      (__NR_SYSCALL_BASE+ 14)
+#define __NR_chmod                      (__NR_SYSCALL_BASE+ 15)
+#define __NR_lchown                     (__NR_SYSCALL_BASE+ 16)
+                                        /* 17 was sys_break */
+                                        /* 18 was sys_stat */
+#define __NR_lseek                      (__NR_SYSCALL_BASE+ 19)
+#define __NR_getpid                     (__NR_SYSCALL_BASE+ 20)
+#define __NR_mount                      (__NR_SYSCALL_BASE+ 21)
+#define __NR_umount                     (__NR_SYSCALL_BASE+ 22)
+#define __NR_setuid                     (__NR_SYSCALL_BASE+ 23)
+#define __NR_getuid                     (__NR_SYSCALL_BASE+ 24)
+#define __NR_stime                      (__NR_SYSCALL_BASE+ 25)
+#define __NR_ptrace                     (__NR_SYSCALL_BASE+ 26)
+#define __NR_alarm                      (__NR_SYSCALL_BASE+ 27)
+                                        /* 28 was sys_fstat */
+#define __NR_pause                      (__NR_SYSCALL_BASE+ 29)
+#define __NR_utime                      (__NR_SYSCALL_BASE+ 30)
+                                        /* 31 was sys_stty */
+                                        /* 32 was sys_gtty */
+#define __NR_access                     (__NR_SYSCALL_BASE+ 33)
+#define __NR_nice                       (__NR_SYSCALL_BASE+ 34)
+                                        /* 35 was sys_ftime */
+#define __NR_sync                       (__NR_SYSCALL_BASE+ 36)
+#define __NR_kill                       (__NR_SYSCALL_BASE+ 37)
+#define __NR_rename                     (__NR_SYSCALL_BASE+ 38)
+#define __NR_mkdir                      (__NR_SYSCALL_BASE+ 39)
+#define __NR_rmdir                      (__NR_SYSCALL_BASE+ 40)
+#define __NR_dup                        (__NR_SYSCALL_BASE+ 41)
+#define __NR_pipe                       (__NR_SYSCALL_BASE+ 42)
+#define __NR_times                      (__NR_SYSCALL_BASE+ 43)
+                                        /* 44 was sys_prof */
+#define __NR_brk                        (__NR_SYSCALL_BASE+ 45)
+#define __NR_setgid                     (__NR_SYSCALL_BASE+ 46)
+#define __NR_getgid                     (__NR_SYSCALL_BASE+ 47)
+                                        /* 48 was sys_signal */
+#define __NR_geteuid                    (__NR_SYSCALL_BASE+ 49)
+#define __NR_getegid                    (__NR_SYSCALL_BASE+ 50)
+#define __NR_acct                       (__NR_SYSCALL_BASE+ 51)
+#define __NR_umount2                    (__NR_SYSCALL_BASE+ 52)
+                                        /* 53 was sys_lock */
+#define __NR_ioctl                      (__NR_SYSCALL_BASE+ 54)
+#define __NR_fcntl                      (__NR_SYSCALL_BASE+ 55)
+                                        /* 56 was sys_mpx */
+#define __NR_setpgid                    (__NR_SYSCALL_BASE+ 57)
+                                        /* 58 was sys_ulimit */
+                                        /* 59 was sys_olduname */
+#define __NR_umask                      (__NR_SYSCALL_BASE+ 60)
+#define __NR_chroot                     (__NR_SYSCALL_BASE+ 61)
+#define __NR_ustat                      (__NR_SYSCALL_BASE+ 62)
+#define __NR_dup2                       (__NR_SYSCALL_BASE+ 63)
+#define __NR_getppid                    (__NR_SYSCALL_BASE+ 64)
+#define __NR_getpgrp                    (__NR_SYSCALL_BASE+ 65)
+#define __NR_setsid                     (__NR_SYSCALL_BASE+ 66)
+#define __NR_sigaction                  (__NR_SYSCALL_BASE+ 67)
+                                        /* 68 was sys_sgetmask */
+                                        /* 69 was sys_ssetmask */
+#define __NR_setreuid                   (__NR_SYSCALL_BASE+ 70)
+#define __NR_setregid                   (__NR_SYSCALL_BASE+ 71)
+#define __NR_sigsuspend                 (__NR_SYSCALL_BASE+ 72)
+#define __NR_sigpending                 (__NR_SYSCALL_BASE+ 73)
+#define __NR_sethostname                (__NR_SYSCALL_BASE+ 74)
+#define __NR_setrlimit                  (__NR_SYSCALL_BASE+ 75)
+#define __NR_getrlimit                  (__NR_SYSCALL_BASE+ 76) /* Back compat 2GB limited rlimit */
+#define __NR_getrusage                  (__NR_SYSCALL_BASE+ 77)
+#define __NR_gettimeofday               (__NR_SYSCALL_BASE+ 78)
+#define __NR_settimeofday               (__NR_SYSCALL_BASE+ 79)
+#define __NR_getgroups                  (__NR_SYSCALL_BASE+ 80)
+#define __NR_setgroups                  (__NR_SYSCALL_BASE+ 81)
+#define __NR_select                     (__NR_SYSCALL_BASE+ 82)
+#define __NR_symlink                    (__NR_SYSCALL_BASE+ 83)
+                                        /* 84 was sys_lstat */
+#define __NR_readlink                   (__NR_SYSCALL_BASE+ 85)
+#define __NR_uselib                     (__NR_SYSCALL_BASE+ 86)
+#define __NR_swapon                     (__NR_SYSCALL_BASE+ 87)
+#define __NR_reboot                     (__NR_SYSCALL_BASE+ 88)
+#define __NR_readdir                    (__NR_SYSCALL_BASE+ 89)
+#define __NR_mmap                       (__NR_SYSCALL_BASE+ 90)
+#define __NR_munmap                     (__NR_SYSCALL_BASE+ 91)
+#define __NR_truncate                   (__NR_SYSCALL_BASE+ 92)
+#define __NR_ftruncate                  (__NR_SYSCALL_BASE+ 93)
+#define __NR_fchmod                     (__NR_SYSCALL_BASE+ 94)
+#define __NR_fchown                     (__NR_SYSCALL_BASE+ 95)
+#define __NR_getpriority                (__NR_SYSCALL_BASE+ 96)
+#define __NR_setpriority                (__NR_SYSCALL_BASE+ 97)
+                                        /* 98 was sys_profil */
+#define __NR_statfs                     (__NR_SYSCALL_BASE+ 99)
+#define __NR_fstatfs                    (__NR_SYSCALL_BASE+100)
+                                        /* 101 was sys_ioperm */
+#define __NR_socketcall                 (__NR_SYSCALL_BASE+102)
+#define __NR_syslog                     (__NR_SYSCALL_BASE+103)
+#define __NR_setitimer                  (__NR_SYSCALL_BASE+104)
+#define __NR_getitimer                  (__NR_SYSCALL_BASE+105)
+#define __NR_stat                       (__NR_SYSCALL_BASE+106)
+#define __NR_lstat                      (__NR_SYSCALL_BASE+107)
+#define __NR_fstat                      (__NR_SYSCALL_BASE+108)
+                                        /* 109 was sys_uname */
+                                        /* 110 was sys_iopl */
+#define __NR_vhangup                    (__NR_SYSCALL_BASE+111)
+                                        /* 112 was sys_idle */
+#define __NR_syscall                    (__NR_SYSCALL_BASE+113) /* syscall to call a syscall! */
+#define __NR_wait4                      (__NR_SYSCALL_BASE+114)
+#define __NR_swapoff                    (__NR_SYSCALL_BASE+115)
+#define __NR_sysinfo                    (__NR_SYSCALL_BASE+116)
+#define __NR_ipc                        (__NR_SYSCALL_BASE+117)
+#define __NR_fsync                      (__NR_SYSCALL_BASE+118)
+#define __NR_sigreturn                  (__NR_SYSCALL_BASE+119)
+#define __NR_clone                      (__NR_SYSCALL_BASE+120)
+#define __NR_setdomainname              (__NR_SYSCALL_BASE+121)
+#define __NR_uname                      (__NR_SYSCALL_BASE+122)
+                                        /* 123 was sys_modify_ldt */
+#define __NR_adjtimex                   (__NR_SYSCALL_BASE+124)
+#define __NR_mprotect                   (__NR_SYSCALL_BASE+125)
+#define __NR_sigprocmask                (__NR_SYSCALL_BASE+126)
+                                        /* 127 was sys_create_module */
+#define __NR_init_module                (__NR_SYSCALL_BASE+128)
+#define __NR_delete_module              (__NR_SYSCALL_BASE+129)
+                                        /* 130 was sys_get_kernel_syms */
+#define __NR_quotactl                   (__NR_SYSCALL_BASE+131)
+#define __NR_getpgid                    (__NR_SYSCALL_BASE+132)
+#define __NR_fchdir                     (__NR_SYSCALL_BASE+133)
+#define __NR_bdflush                    (__NR_SYSCALL_BASE+134)
+#define __NR_sysfs                      (__NR_SYSCALL_BASE+135)
+#define __NR_personality                (__NR_SYSCALL_BASE+136)
+                                        /* 137 was sys_afs_syscall */
+#define __NR_setfsuid                   (__NR_SYSCALL_BASE+138)
+#define __NR_setfsgid                   (__NR_SYSCALL_BASE+139)
+#define __NR__llseek                    (__NR_SYSCALL_BASE+140)
+#define __NR_getdents                   (__NR_SYSCALL_BASE+141)
+#define __NR__newselect                 (__NR_SYSCALL_BASE+142)
+#define __NR_flock                      (__NR_SYSCALL_BASE+143)
+#define __NR_msync                      (__NR_SYSCALL_BASE+144)
+#define __NR_readv                      (__NR_SYSCALL_BASE+145)
+#define __NR_writev                     (__NR_SYSCALL_BASE+146)
+#define __NR_getsid                     (__NR_SYSCALL_BASE+147)
+#define __NR_fdatasync                  (__NR_SYSCALL_BASE+148)
+#define __NR__sysctl                    (__NR_SYSCALL_BASE+149)
+#define __NR_mlock                      (__NR_SYSCALL_BASE+150)
+#define __NR_munlock                    (__NR_SYSCALL_BASE+151)
+#define __NR_mlockall                   (__NR_SYSCALL_BASE+152)
+#define __NR_munlockall                 (__NR_SYSCALL_BASE+153)
+#define __NR_sched_setparam             (__NR_SYSCALL_BASE+154)
+#define __NR_sched_getparam             (__NR_SYSCALL_BASE+155)
+#define __NR_sched_setscheduler         (__NR_SYSCALL_BASE+156)
+#define __NR_sched_getscheduler         (__NR_SYSCALL_BASE+157)
+#define __NR_sched_yield                (__NR_SYSCALL_BASE+158)
+#define __NR_sched_get_priority_max     (__NR_SYSCALL_BASE+159)
+#define __NR_sched_get_priority_min     (__NR_SYSCALL_BASE+160)
+#define __NR_sched_rr_get_interval      (__NR_SYSCALL_BASE+161)
+#define __NR_nanosleep                  (__NR_SYSCALL_BASE+162)
+#define __NR_mremap                     (__NR_SYSCALL_BASE+163)
+#define __NR_setresuid                  (__NR_SYSCALL_BASE+164)
+#define __NR_getresuid                  (__NR_SYSCALL_BASE+165)
+                                        /* 166 was sys_vm86 */
+                                        /* 167 was sys_query_module */
+#define __NR_poll                       (__NR_SYSCALL_BASE+168)
+#define __NR_nfsservctl                 (__NR_SYSCALL_BASE+169)
+#define __NR_setresgid                  (__NR_SYSCALL_BASE+170)
+#define __NR_getresgid                  (__NR_SYSCALL_BASE+171)
+#define __NR_prctl                      (__NR_SYSCALL_BASE+172)
+#define __NR_rt_sigreturn               (__NR_SYSCALL_BASE+173)
+#define __NR_rt_sigaction               (__NR_SYSCALL_BASE+174)
+#define __NR_rt_sigprocmask             (__NR_SYSCALL_BASE+175)
+#define __NR_rt_sigpending              (__NR_SYSCALL_BASE+176)
+#define __NR_rt_sigtimedwait            (__NR_SYSCALL_BASE+177)
+#define __NR_rt_sigqueueinfo            (__NR_SYSCALL_BASE+178)
+#define __NR_rt_sigsuspend              (__NR_SYSCALL_BASE+179)
+#define __NR_pread64                    (__NR_SYSCALL_BASE+180)
+#define __NR_pwrite64                   (__NR_SYSCALL_BASE+181)
+#define __NR_chown                      (__NR_SYSCALL_BASE+182)
+#define __NR_getcwd                     (__NR_SYSCALL_BASE+183)
+#define __NR_capget                     (__NR_SYSCALL_BASE+184)
+#define __NR_capset                     (__NR_SYSCALL_BASE+185)
+#define __NR_sigaltstack                (__NR_SYSCALL_BASE+186)
+#define __NR_sendfile                   (__NR_SYSCALL_BASE+187)
+                                        /* 188 reserved */
+                                        /* 189 reserved */
+#define __NR_vfork                      (__NR_SYSCALL_BASE+190)
+#define __NR_ugetrlimit                 (__NR_SYSCALL_BASE+191) /* SuS compliant getrlimit */
+#define __NR_mmap2                      (__NR_SYSCALL_BASE+192)
+#define __NR_truncate64                 (__NR_SYSCALL_BASE+193)
+#define __NR_ftruncate64                (__NR_SYSCALL_BASE+194)
+#define __NR_stat64                     (__NR_SYSCALL_BASE+195)
+#define __NR_lstat64                    (__NR_SYSCALL_BASE+196)
+#define __NR_fstat64                    (__NR_SYSCALL_BASE+197)
+#define __NR_lchown32                   (__NR_SYSCALL_BASE+198)
+#define __NR_getuid32                   (__NR_SYSCALL_BASE+199)
+#define __NR_getgid32                   (__NR_SYSCALL_BASE+200)
+#define __NR_geteuid32                  (__NR_SYSCALL_BASE+201)
+#define __NR_getegid32                  (__NR_SYSCALL_BASE+202)
+#define __NR_setreuid32                 (__NR_SYSCALL_BASE+203)
+#define __NR_setregid32                 (__NR_SYSCALL_BASE+204)
+#define __NR_getgroups32                (__NR_SYSCALL_BASE+205)
+#define __NR_setgroups32                (__NR_SYSCALL_BASE+206)
+#define __NR_fchown32                   (__NR_SYSCALL_BASE+207)
+#define __NR_setresuid32                (__NR_SYSCALL_BASE+208)
+#define __NR_getresuid32                (__NR_SYSCALL_BASE+209)
+#define __NR_setresgid32                (__NR_SYSCALL_BASE+210)
+#define __NR_getresgid32                (__NR_SYSCALL_BASE+211)
+#define __NR_chown32                    (__NR_SYSCALL_BASE+212)
+#define __NR_setuid32                   (__NR_SYSCALL_BASE+213)
+#define __NR_setgid32                   (__NR_SYSCALL_BASE+214)
+#define __NR_setfsuid32                 (__NR_SYSCALL_BASE+215)
+#define __NR_setfsgid32                 (__NR_SYSCALL_BASE+216)
+#define __NR_getdents64                 (__NR_SYSCALL_BASE+217)
+#define __NR_pivot_root                 (__NR_SYSCALL_BASE+218)
+#define __NR_mincore                    (__NR_SYSCALL_BASE+219)
+#define __NR_madvise                    (__NR_SYSCALL_BASE+220)
+#define __NR_fcntl64                    (__NR_SYSCALL_BASE+221)
+                                        /* 222 for tux */
+                                        /* 223 is unused */
+#define __NR_gettid                     (__NR_SYSCALL_BASE+224)
+#define __NR_readahead                  (__NR_SYSCALL_BASE+225)
+#define __NR_setxattr                   (__NR_SYSCALL_BASE+226)
+#define __NR_lsetxattr                  (__NR_SYSCALL_BASE+227)
+#define __NR_fsetxattr                  (__NR_SYSCALL_BASE+228)
+#define __NR_getxattr                   (__NR_SYSCALL_BASE+229)
+#define __NR_lgetxattr                  (__NR_SYSCALL_BASE+230)
+#define __NR_fgetxattr                  (__NR_SYSCALL_BASE+231)
+#define __NR_listxattr                  (__NR_SYSCALL_BASE+232)
+#define __NR_llistxattr                 (__NR_SYSCALL_BASE+233)
+#define __NR_flistxattr                 (__NR_SYSCALL_BASE+234)
+#define __NR_removexattr                (__NR_SYSCALL_BASE+235)
+#define __NR_lremovexattr               (__NR_SYSCALL_BASE+236)
+#define __NR_fremovexattr               (__NR_SYSCALL_BASE+237)
+#define __NR_tkill                      (__NR_SYSCALL_BASE+238)
+#define __NR_sendfile64                 (__NR_SYSCALL_BASE+239)
+#define __NR_futex                      (__NR_SYSCALL_BASE+240)
+#define __NR_sched_setaffinity          (__NR_SYSCALL_BASE+241)
+#define __NR_sched_getaffinity          (__NR_SYSCALL_BASE+242)
+#define __NR_io_setup                   (__NR_SYSCALL_BASE+243)
+#define __NR_io_destroy                 (__NR_SYSCALL_BASE+244)
+#define __NR_io_getevents               (__NR_SYSCALL_BASE+245)
+#define __NR_io_submit                  (__NR_SYSCALL_BASE+246)
+#define __NR_io_cancel                  (__NR_SYSCALL_BASE+247)
+#define __NR_exit_group                 (__NR_SYSCALL_BASE+248)
+#define __NR_lookup_dcookie             (__NR_SYSCALL_BASE+249)
+#define __NR_epoll_create               (__NR_SYSCALL_BASE+250)
+#define __NR_epoll_ctl                  (__NR_SYSCALL_BASE+251)
+#define __NR_epoll_wait                 (__NR_SYSCALL_BASE+252)
+#define __NR_remap_file_pages           (__NR_SYSCALL_BASE+253)
+                                        /* 254 for set_thread_area */
+                                        /* 255 for get_thread_area */
+#define __NR_set_tid_address            (__NR_SYSCALL_BASE+256)
+#define __NR_timer_create               (__NR_SYSCALL_BASE+257)
+#define __NR_timer_settime              (__NR_SYSCALL_BASE+258)
+#define __NR_timer_gettime              (__NR_SYSCALL_BASE+259)
+#define __NR_timer_getoverrun           (__NR_SYSCALL_BASE+260)
+#define __NR_timer_delete               (__NR_SYSCALL_BASE+261)
+#define __NR_clock_settime              (__NR_SYSCALL_BASE+262)
+#define __NR_clock_gettime              (__NR_SYSCALL_BASE+263)
+#define __NR_clock_getres               (__NR_SYSCALL_BASE+264)
+#define __NR_clock_nanosleep            (__NR_SYSCALL_BASE+265)
+#define __NR_statfs64                   (__NR_SYSCALL_BASE+266)
+#define __NR_fstatfs64                  (__NR_SYSCALL_BASE+267)
+#define __NR_tgkill                     (__NR_SYSCALL_BASE+268)
+#define __NR_utimes                     (__NR_SYSCALL_BASE+269)
+#define __NR_arm_fadvise64_64           (__NR_SYSCALL_BASE+270)
+#define __NR_pciconfig_iobase           (__NR_SYSCALL_BASE+271)
+#define __NR_pciconfig_read             (__NR_SYSCALL_BASE+272)
+#define __NR_pciconfig_write            (__NR_SYSCALL_BASE+273)
+#define __NR_mq_open                    (__NR_SYSCALL_BASE+274)
+#define __NR_mq_unlink                  (__NR_SYSCALL_BASE+275)
+#define __NR_mq_timedsend               (__NR_SYSCALL_BASE+276)
+#define __NR_mq_timedreceive            (__NR_SYSCALL_BASE+277)
+#define __NR_mq_notify                  (__NR_SYSCALL_BASE+278)
+#define __NR_mq_getsetattr              (__NR_SYSCALL_BASE+279)
+#define __NR_waitid                     (__NR_SYSCALL_BASE+280)
+#define __NR_socket                     (__NR_SYSCALL_BASE+281)
+#define __NR_bind                       (__NR_SYSCALL_BASE+282)
+#define __NR_connect                    (__NR_SYSCALL_BASE+283)
+#define __NR_listen                     (__NR_SYSCALL_BASE+284)
+#define __NR_accept                     (__NR_SYSCALL_BASE+285)
+#define __NR_getsockname                (__NR_SYSCALL_BASE+286)
+#define __NR_getpeername                (__NR_SYSCALL_BASE+287)
+#define __NR_socketpair                 (__NR_SYSCALL_BASE+288)
+#define __NR_send                       (__NR_SYSCALL_BASE+289)
+#define __NR_sendto                     (__NR_SYSCALL_BASE+290)
+#define __NR_recv                       (__NR_SYSCALL_BASE+291)
+#define __NR_recvfrom                   (__NR_SYSCALL_BASE+292)
+#define __NR_shutdown                   (__NR_SYSCALL_BASE+293)
+#define __NR_setsockopt                 (__NR_SYSCALL_BASE+294)
+#define __NR_getsockopt                 (__NR_SYSCALL_BASE+295)
+#define __NR_sendmsg                    (__NR_SYSCALL_BASE+296)
+#define __NR_recvmsg                    (__NR_SYSCALL_BASE+297)
+#define __NR_semop                      (__NR_SYSCALL_BASE+298)
+#define __NR_semget                     (__NR_SYSCALL_BASE+299)
+#define __NR_semctl                     (__NR_SYSCALL_BASE+300)
+#define __NR_msgsnd                     (__NR_SYSCALL_BASE+301)
+#define __NR_msgrcv                     (__NR_SYSCALL_BASE+302)
+#define __NR_msgget                     (__NR_SYSCALL_BASE+303)
+#define __NR_msgctl                     (__NR_SYSCALL_BASE+304)
+#define __NR_shmat                      (__NR_SYSCALL_BASE+305)
+#define __NR_shmdt                      (__NR_SYSCALL_BASE+306)
+#define __NR_shmget                     (__NR_SYSCALL_BASE+307)
+#define __NR_shmctl                     (__NR_SYSCALL_BASE+308)
+#define __NR_add_key                    (__NR_SYSCALL_BASE+309)
+#define __NR_request_key                (__NR_SYSCALL_BASE+310)
+#define __NR_keyctl                     (__NR_SYSCALL_BASE+311)
+#define __NR_semtimedop                 (__NR_SYSCALL_BASE+312)
+#define __NR_vserver                    (__NR_SYSCALL_BASE+313)
+#define __NR_ioprio_set                 (__NR_SYSCALL_BASE+314)
+#define __NR_ioprio_get                 (__NR_SYSCALL_BASE+315)
+#define __NR_inotify_init               (__NR_SYSCALL_BASE+316)
+#define __NR_inotify_add_watch          (__NR_SYSCALL_BASE+317)
+#define __NR_inotify_rm_watch           (__NR_SYSCALL_BASE+318)
+#define __NR_mbind                      (__NR_SYSCALL_BASE+319)
+#define __NR_get_mempolicy              (__NR_SYSCALL_BASE+320)
+#define __NR_set_mempolicy              (__NR_SYSCALL_BASE+321)
+#define __NR_openat                     (__NR_SYSCALL_BASE+322)
+#define __NR_mkdirat                    (__NR_SYSCALL_BASE+323)
+#define __NR_mknodat                    (__NR_SYSCALL_BASE+324)
+#define __NR_fchownat                   (__NR_SYSCALL_BASE+325)
+#define __NR_futimesat                  (__NR_SYSCALL_BASE+326)
+#define __NR_fstatat64                  (__NR_SYSCALL_BASE+327)
+#define __NR_unlinkat                   (__NR_SYSCALL_BASE+328)
+#define __NR_renameat                   (__NR_SYSCALL_BASE+329)
+#define __NR_linkat                     (__NR_SYSCALL_BASE+330)
+#define __NR_symlinkat                  (__NR_SYSCALL_BASE+331)
+#define __NR_readlinkat                 (__NR_SYSCALL_BASE+332)
+#define __NR_fchmodat                   (__NR_SYSCALL_BASE+333)
+#define __NR_faccessat                  (__NR_SYSCALL_BASE+334)
+#define __NR_pselect6                   (__NR_SYSCALL_BASE+335)
+#define __NR_ppoll                      (__NR_SYSCALL_BASE+336)
+#define __NR_unshare                    (__NR_SYSCALL_BASE+337)
+#define __NR_set_robust_list            (__NR_SYSCALL_BASE+338)
+#define __NR_get_robust_list            (__NR_SYSCALL_BASE+339)
+#define __NR_splice                     (__NR_SYSCALL_BASE+340)
+#define __NR_arm_sync_file_range        (__NR_SYSCALL_BASE+341)
+#define __NR_sync_file_range2           __NR_arm_sync_file_range
+#define __NR_tee                        (__NR_SYSCALL_BASE+342)
+#define __NR_vmsplice                   (__NR_SYSCALL_BASE+343)
+#define __NR_move_pages                 (__NR_SYSCALL_BASE+344)
+#define __NR_getcpu                     (__NR_SYSCALL_BASE+345)
+#define __NR_epoll_pwait                (__NR_SYSCALL_BASE+346)
+#define __NR_kexec_load                 (__NR_SYSCALL_BASE+347)
+#define __NR_utimensat                  (__NR_SYSCALL_BASE+348)
+#define __NR_signalfd                   (__NR_SYSCALL_BASE+349)
+#define __NR_timerfd_create             (__NR_SYSCALL_BASE+350)
+#define __NR_eventfd                    (__NR_SYSCALL_BASE+351)
+#define __NR_fallocate                  (__NR_SYSCALL_BASE+352)
+#define __NR_timerfd_settime            (__NR_SYSCALL_BASE+353)
+#define __NR_timerfd_gettime            (__NR_SYSCALL_BASE+354)
+#define __NR_signalfd4                  (__NR_SYSCALL_BASE+355)
+#define __NR_eventfd2                   (__NR_SYSCALL_BASE+356)
+#define __NR_epoll_create1              (__NR_SYSCALL_BASE+357)
+#define __NR_dup3                       (__NR_SYSCALL_BASE+358)
+#define __NR_pipe2                      (__NR_SYSCALL_BASE+359)
+#define __NR_inotify_init1              (__NR_SYSCALL_BASE+360)
+#define __NR_preadv                     (__NR_SYSCALL_BASE+361)
+#define __NR_pwritev                    (__NR_SYSCALL_BASE+362)
+#define __NR_rt_tgsigqueueinfo          (__NR_SYSCALL_BASE+363)
+#define __NR_perf_event_open            (__NR_SYSCALL_BASE+364)
+#define __NR_recvmmsg                   (__NR_SYSCALL_BASE+365)
+#define __NR_accept4                    (__NR_SYSCALL_BASE+366)
+#define __NR_fanotify_init              (__NR_SYSCALL_BASE+367)
+#define __NR_fanotify_mark              (__NR_SYSCALL_BASE+368)
+#define __NR_prlimit64                  (__NR_SYSCALL_BASE+369)
+#define __NR_name_to_handle_at          (__NR_SYSCALL_BASE+370)
+#define __NR_open_by_handle_at          (__NR_SYSCALL_BASE+371)
+#define __NR_clock_adjtime              (__NR_SYSCALL_BASE+372)
+#define __NR_syncfs                     (__NR_SYSCALL_BASE+373)
+#define __NR_sendmmsg                   (__NR_SYSCALL_BASE+374)
+#define __NR_setns                      (__NR_SYSCALL_BASE+375)
+#define __NR_process_vm_readv           (__NR_SYSCALL_BASE+376)
+#define __NR_process_vm_writev          (__NR_SYSCALL_BASE+377)
+                                        /* 378 for kcmp */
+
+/*
+ * This may need to be greater than __NR_last_syscall+1 in order to
+ * account for the padding in the syscall table
+ */
+
+/*
+ * The following SWIs are ARM private.
+ */
+#define __ARM_NR_BASE                   (__NR_SYSCALL_BASE+0x0f0000)
+#define __ARM_NR_breakpoint             (__ARM_NR_BASE+1)
+#define __ARM_NR_cacheflush             (__ARM_NR_BASE+2)
+#define __ARM_NR_usr26                  (__ARM_NR_BASE+3)
+#define __ARM_NR_usr32                  (__ARM_NR_BASE+4)
+#define __ARM_NR_set_tls                (__ARM_NR_BASE+5)
+
+/*
+ * *NOTE*: This is a ghost syscall private to the kernel.  Only the
+ * __kuser_cmpxchg code in entry-armv.S should be aware of its
+ * existence.  Don't ever use this from user code.
+ */
+
+/*
+ * The following syscalls are obsolete and no longer available for EABI.
+ */
+#if !defined(__KERNEL__)
+#if defined(__ARM_EABI__)
+#undef __NR_time
+#undef __NR_umount
+#undef __NR_stime
+#undef __NR_alarm
+#undef __NR_utime
+#undef __NR_getrlimit
+#undef __NR_select
+#undef __NR_readdir
+#undef __NR_mmap
+#undef __NR_socketcall
+#undef __NR_syscall
+#undef __NR_ipc
+#endif
+#endif
+
+#endif /* _UAPI__ASM_ARM_UNISTD_H */
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index c8050b14e615..b14207101938 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -19,8 +19,8 @@ config AT91_SAM9G45_RESET
 
 config SOC_AT91SAM9
         bool
-        select GENERIC_CLOCKEVENTS
         select CPU_ARM926T
+        select GENERIC_CLOCKEVENTS
 
 menu "Atmel AT91 System-on-Chip"
 
@@ -28,66 +28,66 @@ comment "Atmel AT91 Processor"
 
 config SOC_AT91SAM9
         bool
+        select AT91_SAM9_SMC
+        select AT91_SAM9_TIME
         select CPU_ARM926T
         select MULTI_IRQ_HANDLER
         select SPARSE_IRQ
-        select AT91_SAM9_TIME
-        select AT91_SAM9_SMC
 
 config SOC_AT91RM9200
         bool "AT91RM9200"
         select CPU_ARM920T
-        select MULTI_IRQ_HANDLER
-        select SPARSE_IRQ
         select GENERIC_CLOCKEVENTS
         select HAVE_AT91_DBGU0
+        select MULTI_IRQ_HANDLER
+        select SPARSE_IRQ
 
 config SOC_AT91SAM9260
         bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_NET_MACB
+        select SOC_AT91SAM9
         help
           Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
           or AT91SAM9G20 SoC.
 
 config SOC_AT91SAM9261
         bool "AT91SAM9261 or AT91SAM9G10"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
+        select SOC_AT91SAM9
         help
           Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
 
 config SOC_AT91SAM9263
         bool "AT91SAM9263"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU1
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select SOC_AT91SAM9
 
 config SOC_AT91SAM9RL
         bool "AT91SAM9RL"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
+        select SOC_AT91SAM9
 
 config SOC_AT91SAM9G45
         bool "AT91SAM9G45 or AT91SAM9M10 families"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU1
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select SOC_AT91SAM9
         help
           Select this if you are using one of Atmel's AT91SAM9G45 family SoC.
           This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
 
 config SOC_AT91SAM9X5
         bool "AT91SAM9x5 family"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select SOC_AT91SAM9
         help
           Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
           This means that your SAM9 name finishes with a '5' (except if it is
@@ -97,9 +97,9 @@ config SOC_AT91SAM9X5
 
 config SOC_AT91SAM9N12
         bool "AT91SAM9N12 family"
-        select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
+        select SOC_AT91SAM9
         help
           Select this if you are using Atmel's AT91SAM9N12 SoC.
 
@@ -144,9 +144,9 @@ config ARCH_AT91SAM9G45
 config ARCH_AT91X40
         bool "AT91x40"
         depends on !MMU
+        select ARCH_USES_GETTIMEOFFSET
         select MULTI_IRQ_HANDLER
         select SPARSE_IRQ
-        select ARCH_USES_GETTIMEOFFSET
 
 endchoice
 
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index e6135363765a..263242da2cb8 100644
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -23,9 +23,9 @@ config ARCH_CLEP7312
 
 config ARCH_EDB7211
         bool "EDB7211"
-        select ISA
-        select ARCH_SPARSEMEM_ENABLE
         select ARCH_SELECT_MEMORY_MODEL
+        select ARCH_SPARSEMEM_ENABLE
+        select ISA
         help
           Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211
           evaluation board.
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 026b4b277ae5..f8eecb959413 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -4,12 +4,12 @@ config AINTC
         bool
 
 config CP_INTC
-        select IRQ_DOMAIN
         bool
+        select IRQ_DOMAIN
 
 config ARCH_DAVINCI_DMx
-        select CPU_ARM926T
         bool
+        select CPU_ARM926T
 
 menu "TI DaVinci Implementations"
 
@@ -32,19 +32,19 @@ config ARCH_DAVINCI_DM646x
 
 config ARCH_DAVINCI_DA830
         bool "DA830/OMAP-L137/AM17x based system"
-        select CP_INTC
         select ARCH_DAVINCI_DA8XX
         select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1
+        select CP_INTC
 
 config ARCH_DAVINCI_DA850
         bool "DA850/OMAP-L138/AM18x based system"
-        select CP_INTC
         select ARCH_DAVINCI_DA8XX
         select ARCH_HAS_CPUFREQ
+        select CP_INTC
 
 config ARCH_DAVINCI_DA8XX
-        select CPU_ARM926T
         bool
+        select CPU_ARM926T
 
 config ARCH_DAVINCI_DM365
         bool "DaVinci 365 based system"
@@ -52,9 +52,9 @@ config ARCH_DAVINCI_DM365
         select ARCH_DAVINCI_DMx
 
 config ARCH_DAVINCI_TNETV107X
+        bool "TNETV107X based system"
         select CPU_V6
         select CP_INTC
-        bool "TNETV107X based system"
 
 comment "DaVinci Board Type"
 
@@ -103,9 +103,9 @@ config MACH_DAVINCI_DM6467_EVM
         bool "TI DM6467 EVM"
         default ARCH_DAVINCI_DM646x
         depends on ARCH_DAVINCI_DM646x
-        select MACH_DAVINCI_DM6467TEVM
         select EEPROM_AT24
         select I2C
+        select MACH_DAVINCI_DM6467TEVM
         help
           Configure this option to specify the whether the board used
           for development is a DM6467 EVM
@@ -127,8 +127,8 @@ config MACH_DAVINCI_DA830_EVM
         bool "TI DA830/OMAP-L137/AM17x Reference Platform"
         default ARCH_DAVINCI_DA830
         depends on ARCH_DAVINCI_DA830
-        select GPIO_PCF857X
         select EEPROM_AT24
+        select GPIO_PCF857X
         select I2C
         help
           Say Y here to select the TI DA830/OMAP-L137/AM17x Evaluation Module.
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 4372075c551f..da55107033dd 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -31,11 +31,11 @@ config CPU_EXYNOS4210
         bool "SAMSUNG EXYNOS4210"
         default y
         depends on ARCH_EXYNOS4
-        select SAMSUNG_DMADEV
         select ARM_CPU_SUSPEND if PM
+        select PM_GENERIC_DOMAINS
         select S5P_PM if PM
         select S5P_SLEEP if PM
-        select PM_GENERIC_DOMAINS
+        select SAMSUNG_DMADEV
         help
           Enable EXYNOS4210 CPU support
 
@@ -43,9 +43,9 @@ config SOC_EXYNOS4212
         bool "SAMSUNG EXYNOS4212"
         default y
         depends on ARCH_EXYNOS4
-        select SAMSUNG_DMADEV
         select S5P_PM if PM
         select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
         help
           Enable EXYNOS4212 SoC support
 
@@ -61,9 +61,9 @@ config SOC_EXYNOS5250
         bool "SAMSUNG EXYNOS5250"
         default y
         depends on ARCH_EXYNOS5
-        select SAMSUNG_DMADEV
         select S5P_PM if PM
         select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
         help
           Enable EXYNOS5250 SoC support
 
@@ -189,71 +189,71 @@ config MACH_SMDKC210
 config MACH_SMDKV310
         bool "SMDKV310"
         select CPU_EXYNOS4210
-        select S5P_DEV_FIMD0
+        select EXYNOS4_DEV_AHCI
+        select EXYNOS4_DEV_USB_OHCI
+        select EXYNOS4_SETUP_FIMD0
+        select EXYNOS4_SETUP_I2C1
+        select EXYNOS4_SETUP_KEYPAD
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
+        select EXYNOS_DEV_SYSMMU
+        select S3C24XX_PWM
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_HSMMC2
+        select S3C_DEV_HSMMC3
+        select S3C_DEV_I2C1
         select S3C_DEV_RTC
+        select S3C_DEV_USB_HSOTG
         select S3C_DEV_WDT
-        select S3C_DEV_I2C1
         select S5P_DEV_FIMC0
         select S5P_DEV_FIMC1
         select S5P_DEV_FIMC2
         select S5P_DEV_FIMC3
+        select S5P_DEV_FIMD0
         select S5P_DEV_G2D
         select S5P_DEV_I2C_HDMIPHY
         select S5P_DEV_JPEG
         select S5P_DEV_MFC
         select S5P_DEV_TV
         select S5P_DEV_USB_EHCI
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
-        select S3C_DEV_HSMMC2
-        select S3C_DEV_HSMMC3
-        select S3C_DEV_USB_HSOTG
         select SAMSUNG_DEV_BACKLIGHT
-        select EXYNOS_DEV_DRM
-        select EXYNOS_DEV_SYSMMU
-        select EXYNOS4_DEV_AHCI
         select SAMSUNG_DEV_KEYPAD
-        select EXYNOS_DEV_DMA
         select SAMSUNG_DEV_PWM
-        select EXYNOS4_DEV_USB_OHCI
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_I2C1
-        select EXYNOS4_SETUP_KEYPAD
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_USB_PHY
-        select S3C24XX_PWM
         help
           Machine support for Samsung SMDKV310
 
 config MACH_ARMLEX4210
         bool "ARMLEX4210"
         select CPU_EXYNOS4210
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
+        select EXYNOS4_DEV_AHCI
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS_DEV_DMA
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC2
         select S3C_DEV_HSMMC3
-        select EXYNOS4_DEV_AHCI
-        select EXYNOS_DEV_DMA
-        select EXYNOS4_SETUP_SDHCI
+        select S3C_DEV_RTC
+        select S3C_DEV_WDT
         help
           Machine support for Samsung ARMLEX4210 based on EXYNOS4210
 
 config MACH_UNIVERSAL_C210
         bool "Mobile UNIVERSAL_C210 Board"
-        select CPU_EXYNOS4210
-        select S5P_HRT
         select CLKSRC_MMIO
+        select CPU_EXYNOS4210
+        select EXYNOS4_SETUP_FIMC
+        select EXYNOS4_SETUP_FIMD0
+        select EXYNOS4_SETUP_I2C1
+        select EXYNOS4_SETUP_I2C3
+        select EXYNOS4_SETUP_I2C5
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
+        select EXYNOS_DEV_SYSMMU
         select HAVE_SCHED_CLOCK
-        select S5P_GPIO_INT
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
-        select S5P_DEV_FIMC3
-        select S5P_DEV_G2D
-        select S5P_DEV_CSIS0
-        select S5P_DEV_JPEG
-        select S5P_DEV_FIMD0
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC2
         select S3C_DEV_HSMMC3
@@ -261,21 +261,21 @@ config MACH_UNIVERSAL_C210
         select S3C_DEV_I2C3
         select S3C_DEV_I2C5
         select S3C_DEV_USB_HSOTG
+        select S5P_DEV_CSIS0
+        select S5P_DEV_FIMC0
+        select S5P_DEV_FIMC1
+        select S5P_DEV_FIMC2
+        select S5P_DEV_FIMC3
+        select S5P_DEV_FIMD0
+        select S5P_DEV_G2D
         select S5P_DEV_I2C_HDMIPHY
+        select S5P_DEV_JPEG
         select S5P_DEV_MFC
         select S5P_DEV_ONENAND
         select S5P_DEV_TV
-        select EXYNOS_DEV_SYSMMU
-        select EXYNOS_DEV_DMA
-        select EXYNOS_DEV_DRM
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_I2C1
-        select EXYNOS4_SETUP_I2C3
-        select EXYNOS4_SETUP_I2C5
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_FIMC
+        select S5P_GPIO_INT
+        select S5P_HRT
         select S5P_SETUP_MIPIPHY
-        select EXYNOS4_SETUP_USB_PHY
         help
           Machine support for Samsung Mobile Universal S5PC210 Reference
           Board.
@@ -283,10 +283,16 @@ config MACH_UNIVERSAL_C210
 config MACH_NURI
         bool "Mobile NURI Board"
         select CPU_EXYNOS4210
-        select S5P_GPIO_INT
-        select S3C_DEV_WDT
-        select S3C_DEV_RTC
-        select S5P_DEV_FIMD0
+        select EXYNOS4_SETUP_FIMC
+        select EXYNOS4_SETUP_FIMD0
+        select EXYNOS4_SETUP_I2C1
+        select EXYNOS4_SETUP_I2C3
+        select EXYNOS4_SETUP_I2C5
+        select EXYNOS4_SETUP_I2C6
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC2
         select S3C_DEV_HSMMC3
@@ -294,41 +300,42 @@ config MACH_NURI
         select S3C_DEV_I2C3
         select S3C_DEV_I2C5
         select S3C_DEV_I2C6
+        select S3C_DEV_RTC
         select S3C_DEV_USB_HSOTG
+        select S3C_DEV_WDT
         select S5P_DEV_CSIS0
-        select S5P_DEV_JPEG
         select S5P_DEV_FIMC0
         select S5P_DEV_FIMC1
         select S5P_DEV_FIMC2
         select S5P_DEV_FIMC3
+        select S5P_DEV_FIMD0
         select S5P_DEV_G2D
+        select S5P_DEV_JPEG
         select S5P_DEV_MFC
         select S5P_DEV_USB_EHCI
+        select S5P_GPIO_INT
         select S5P_SETUP_MIPIPHY
-        select EXYNOS_DEV_DMA
-        select EXYNOS_DEV_DRM
-        select EXYNOS4_SETUP_FIMC
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_I2C1
-        select EXYNOS4_SETUP_I2C3
-        select EXYNOS4_SETUP_I2C5
-        select EXYNOS4_SETUP_I2C6
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_USB_PHY
-        select S5P_SETUP_MIPIPHY
-        select SAMSUNG_DEV_PWM
         select SAMSUNG_DEV_ADC
+        select SAMSUNG_DEV_PWM
         help
           Machine support for Samsung Mobile NURI Board.
 
 config MACH_ORIGEN
         bool "ORIGEN"
         select CPU_EXYNOS4210
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
+        select EXYNOS4_DEV_USB_OHCI
+        select EXYNOS4_SETUP_FIMD0
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
+        select EXYNOS_DEV_SYSMMU
+        select S3C24XX_PWM
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC2
+        select S3C_DEV_RTC
         select S3C_DEV_USB_HSOTG
+        select S3C_DEV_WDT
         select S5P_DEV_FIMC0
         select S5P_DEV_FIMC1
         select S5P_DEV_FIMC2
@@ -342,14 +349,6 @@ config MACH_ORIGEN
         select S5P_DEV_USB_EHCI
         select SAMSUNG_DEV_BACKLIGHT
         select SAMSUNG_DEV_PWM
-        select EXYNOS_DEV_DRM
-        select EXYNOS_DEV_SYSMMU
-        select EXYNOS_DEV_DMA
-        select EXYNOS4_DEV_USB_OHCI
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_USB_PHY
-        select S3C24XX_PWM
         help
           Machine support for ORIGEN based on Samsung EXYNOS4210
 
@@ -357,7 +356,17 @@ comment "EXYNOS4212 Boards"
 
 config MACH_SMDK4212
         bool "SMDK4212"
-        select SOC_EXYNOS4212
+        select EXYNOS4_SETUP_FIMD0
+        select EXYNOS4_SETUP_I2C1
+        select EXYNOS4_SETUP_I2C3
+        select EXYNOS4_SETUP_I2C7
+        select EXYNOS4_SETUP_KEYPAD
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
+        select EXYNOS_DEV_SYSMMU
+        select S3C24XX_PWM
         select S3C_DEV_HSMMC2
         select S3C_DEV_HSMMC3
         select S3C_DEV_I2C1
@@ -375,17 +384,7 @@ config MACH_SMDK4212
         select SAMSUNG_DEV_BACKLIGHT
         select SAMSUNG_DEV_KEYPAD
         select SAMSUNG_DEV_PWM
-        select EXYNOS_DEV_SYSMMU
-        select EXYNOS_DEV_DMA
-        select EXYNOS_DEV_DRM
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_I2C1
-        select EXYNOS4_SETUP_I2C3
-        select EXYNOS4_SETUP_I2C7
-        select EXYNOS4_SETUP_KEYPAD
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_USB_PHY
-        select S3C24XX_PWM
+        select SOC_EXYNOS4212
         help
           Machine support for Samsung SMDK4212
 
@@ -393,8 +392,8 @@ comment "EXYNOS4412 Boards"
 
 config MACH_SMDK4412
         bool "SMDK4412"
-        select SOC_EXYNOS4412
         select MACH_SMDK4212
+        select SOC_EXYNOS4412
         help
           Machine support for Samsung SMDK4412
 endif
@@ -404,12 +403,12 @@ comment "Flattened Device Tree based board for EXYNOS SoCs"
 config MACH_EXYNOS4_DT
         bool "Samsung Exynos4 Machine using device tree"
         depends on ARCH_EXYNOS4
-        select CPU_EXYNOS4210
-        select USE_OF
         select ARM_AMBA
+        select CPU_EXYNOS4210
         select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
         select PINCTRL
         select PINCTRL_EXYNOS4
+        select USE_OF
         help
           Machine support for Samsung Exynos4 machine with device tree enabled.
           Select this if a fdt blob is available for the Exynos4 SoC based board.
@@ -419,9 +418,9 @@ config MACH_EXYNOS4_DT
 config MACH_EXYNOS5_DT
         bool "SAMSUNG EXYNOS5 Machine using device tree"
         depends on ARCH_EXYNOS5
+        select ARM_AMBA
         select SOC_EXYNOS5250
         select USE_OF
-        select ARM_AMBA
         help
           Machine support for Samsung EXYNOS5 machine with device tree enabled.
           Select this if a fdt blob is available for the EXYNOS5 SoC based board.
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index f643ef819da6..abda5a18a664 100644
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -91,7 +91,7 @@ config FOOTBRIDGE_ADDIN
 
 # EBSA285 board in either host or addin mode
 config ARCH_EBSA285
-        select ARCH_MAY_HAVE_PC_FDC
         bool
+        select ARCH_MAY_HAVE_PC_FDC
 
 endif
diff --git a/arch/arm/mach-h720x/Kconfig b/arch/arm/mach-h720x/Kconfig
index abf356c02343..6bb755bcb6f5 100644
--- a/arch/arm/mach-h720x/Kconfig
+++ b/arch/arm/mach-h720x/Kconfig
@@ -12,9 +12,9 @@ config ARCH_H7201
 
 config ARCH_H7202
         bool "hms30c7202"
+        depends on ARCH_H720X
         select CPU_H7202
         select ZONE_DMA
-        depends on ARCH_H720X
         help
           Say Y here if you are using the Hynix HMS30C7202 Reference Board
 
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 32197c117afe..8d276584650e 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -41,68 +41,68 @@ config SOC_IMX1
 
 config SOC_IMX21
         bool
-        select MACH_MX21
-        select CPU_ARM926T
         select COMMON_CLK
+        select CPU_ARM926T
         select IMX_HAVE_IOMUX_V1
+        select MACH_MX21
         select MXC_AVIC
 
 config SOC_IMX25
         bool
         select ARCH_MX25
+        select ARCH_MXC_IOMUX_V3
         select COMMON_CLK
         select CPU_ARM926T
         select HAVE_CAN_FLEXCAN if CAN
-        select ARCH_MXC_IOMUX_V3
         select MXC_AVIC
 
 config SOC_IMX27
         bool
-        select MACH_MX27
-        select CPU_ARM926T
         select COMMON_CLK
+        select CPU_ARM926T
         select IMX_HAVE_IOMUX_V1
+        select MACH_MX27
         select MXC_AVIC
 
 config SOC_IMX31
         bool
+        select COMMON_CLK
         select CPU_V6
         select IMX_HAVE_PLATFORM_MXC_RNGA
         select MXC_AVIC
-        select COMMON_CLK
         select SMP_ON_UP if SMP
 
 config SOC_IMX35
         bool
-        select CPU_V6K
         select ARCH_MXC_IOMUX_V3
         select COMMON_CLK
+        select CPU_V6K
+        select HAVE_CAN_FLEXCAN if CAN
         select HAVE_EPIT
         select MXC_AVIC
         select SMP_ON_UP if SMP
-        select HAVE_CAN_FLEXCAN if CAN
 
 config SOC_IMX5
-        select CPU_V7
-        select MXC_TZIC
-        select COMMON_CLK
-        select ARCH_MXC_IOMUX_V3
+        bool
         select ARCH_HAS_CPUFREQ
         select ARCH_MX5
-        bool
+        select ARCH_MXC_IOMUX_V3
+        select COMMON_CLK
+        select CPU_V7
+        select MXC_TZIC
 
 config SOC_IMX50
         bool
-        select SOC_IMX5
         select ARCH_MX50
+        select SOC_IMX5
 
 config  SOC_IMX51
         bool
-        select SOC_IMX5
         select ARCH_MX5
         select ARCH_MX51
         select PINCTRL
         select PINCTRL_IMX51
+        select SOC_IMX5
 
 if ARCH_IMX_V4_V5
 
@@ -112,10 +112,10 @@ config MACH_MXLADS
 
 config ARCH_MX1ADS
         bool "MX1ADS platform"
-        select MACH_MXLADS
-        select SOC_IMX1
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
+        select MACH_MXLADS
+        select SOC_IMX1
         help
           Say Y here if you are using Motorola MX1ADS/MXLADS boards
 
@@ -127,9 +127,9 @@ config MACH_SCB9328
 
 config MACH_APF9328
         bool "APF9328"
-        select SOC_IMX1
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX1
         help
           Say Yes here if you are using the Armadeus APF9328 development board
 
@@ -137,11 +137,11 @@ comment "MX21 platforms:"
 
 config MACH_MX21ADS
         bool "MX21ADS platform"
-        select SOC_IMX21
         select IMX_HAVE_PLATFORM_IMX_FB
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_MXC_NAND
+        select SOC_IMX21
         help
           Include support for MX21ADS platform. This includes specific
           configurations for the board and its peripherals.
@@ -150,22 +150,21 @@ comment "MX25 platforms:"
 
 config MACH_MX25_3DS
         bool "Support MX25PDK (3DS) Platform"
-        select SOC_IMX25
         select IMX_HAVE_PLATFORM_FLEXCAN
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMXDI_RTC
-        select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_FB
+        select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_KEYPAD
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select SOC_IMX25
 
 config MACH_EUKREA_CPUIMX25SD
         bool "Support Eukrea CPUIMX25 Platform"
-        select SOC_IMX25
         select IMX_HAVE_PLATFORM_FLEXCAN
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
@@ -177,6 +176,7 @@ config MACH_EUKREA_CPUIMX25SD
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX25
 
 choice
         prompt "Baseboard"
@@ -199,20 +199,19 @@ comment "MX27 platforms:"
 
 config MACH_MX27ADS
         bool "MX27ADS platform"
-        select SOC_IMX27
         select IMX_HAVE_PLATFORM_IMX_FB
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_MXC_W1
+        select SOC_IMX27
         help
           Include support for MX27ADS platform. This includes specific
           configurations for the board and its peripherals.
 
 config MACH_PCM038
         bool "Phytec phyCORE-i.MX27 CPU module (pcm038)"
-        select SOC_IMX27
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
@@ -221,6 +220,7 @@ config MACH_PCM038
         select IMX_HAVE_PLATFORM_MXC_W1
         select IMX_HAVE_PLATFORM_SPI_IMX
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX27
         help
           Include support for phyCORE-i.MX27 (aka pcm038) platform. This
           includes specific configurations for the module and its peripherals.
@@ -242,7 +242,6 @@ endchoice
 
 config MACH_CPUIMX27
         bool "Eukrea CPUIMX27 module"
-        select SOC_IMX27
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_I2C
@@ -251,6 +250,7 @@ config MACH_CPUIMX27
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_MXC_W1
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX27
         help
           Include support for Eukrea CPUIMX27 platform. This includes
           specific configurations for the module and its peripherals.
@@ -292,7 +292,6 @@ endchoice
 
 config MACH_MX27_3DS
         bool "MX27PDK platform"
-        select SOC_IMX27
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_FB
@@ -306,13 +305,13 @@ config MACH_MX27_3DS
         select IMX_HAVE_PLATFORM_SPI_IMX
         select MXC_DEBUG_BOARD
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX27
         help
           Include support for MX27PDK platform. This includes specific
           configurations for the board and its peripherals.
 
 config MACH_IMX27_VISSTRIM_M10
         bool "Vista Silicon i.MX27 Visstrim_m10"
-        select SOC_IMX27
         select IMX_HAVE_PLATFORM_GPIO_KEYS
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_SSI
@@ -321,6 +320,7 @@ config MACH_IMX27_VISSTRIM_M10
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_MMC
         select LEDS_GPIO_REGISTER
+        select SOC_IMX27
         help
           Include support for Visstrim_m10 platform and its different variants.
           This includes specific configurations for the board and its
@@ -328,16 +328,15 @@ config MACH_IMX27_VISSTRIM_M10
 
 config MACH_IMX27LITE
         bool "LogicPD MX27 LITEKIT platform"
-        select SOC_IMX27
-        select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_IMX_SSI
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX27
         help
           Include support for MX27 LITEKIT platform. This includes specific
           configurations for the board and its peripherals.
 
 config MACH_PCA100
         bool "Phytec phyCARD-s (pca100)"
-        select SOC_IMX27
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_FB
@@ -350,27 +349,28 @@ config MACH_PCA100
         select IMX_HAVE_PLATFORM_MXC_W1
         select IMX_HAVE_PLATFORM_SPI_IMX
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX27
         help
           Include support for phyCARD-s (aka pca100) platform. This
           includes specific configurations for the module and its peripherals.
 
 config MACH_MXT_TD60
         bool "Maxtrack i-MXT TD60"
-        select SOC_IMX27
         select IMX_HAVE_PLATFORM_IMX_FB
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_MXC_NAND
+        select SOC_IMX27
         help
           Include support for i-MXT (aka td60) platform. This
           includes specific configurations for the module and its peripherals.
 
 config MACH_IMX27IPCAM
         bool "IMX27 IPCAM platform"
-        select SOC_IMX27
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX27
         help
           Include support for IMX27 IPCAM platform. This includes specific
           configurations for the board and its peripherals.
@@ -390,11 +390,11 @@ comment "MX31 platforms:"
 
 config MACH_MX31ADS
         bool "Support MX31ADS platforms"
-        select SOC_IMX31
+        default y
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_SSI
         select IMX_HAVE_PLATFORM_IMX_UART
-        default y
+        select SOC_IMX31
         help
           Include support for MX31ADS platform. This includes specific
           configurations for the board and its peripherals.
@@ -412,21 +412,19 @@ config MACH_MX31ADS_WM1133_EV1
 
 config MACH_MX31LILLY
         bool "Support MX31 LILLY-1131 platforms (INCO startec)"
-        select SOC_IMX31
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_SPI_IMX
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
         help
           Include support for mx31 based LILLY1131 modules. This includes
           specific configurations for the board and its peripherals.
 
 config MACH_MX31LITE
         bool "Support MX31 LITEKIT (LogicPD)"
-        select SOC_IMX31
-        select MXC_ULPI if USB_ULPI
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_MXC_EHCI
@@ -435,13 +433,14 @@ config MACH_MX31LITE
         select IMX_HAVE_PLATFORM_MXC_RTC
         select IMX_HAVE_PLATFORM_SPI_IMX
         select LEDS_GPIO_REGISTER
+        select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
         help
           Include support for MX31 LITEKIT platform. This includes specific
           configurations for the board and its peripherals.
 
 config MACH_PCM037
         bool "Support Phytec pcm037 (i.MX31) platforms"
-        select SOC_IMX31
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_I2C
@@ -452,6 +451,7 @@ config MACH_PCM037
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_MXC_W1
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
         help
           Include support for Phytec pcm037 platform. This includes
           specific configurations for the board and its peripherals.
@@ -468,8 +468,6 @@ config MACH_PCM037_EET
 
 config MACH_MX31_3DS
         bool "Support MX31PDK (3DS)"
-        select SOC_IMX31
-        select MXC_DEBUG_BOARD
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_I2C
@@ -481,7 +479,9 @@ config MACH_MX31_3DS
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SPI_IMX
+        select MXC_DEBUG_BOARD
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
         help
           Include support for MX31PDK (3DS) platform. This includes specific
           configurations for the board and its peripherals.
@@ -497,7 +497,6 @@ config MACH_MX31_3DS_MXC_NAND_USE_BBT
 
 config MACH_MX31MOBOARD
         bool "Support mx31moboard platforms (EPFL Mobots group)"
-        select SOC_IMX31
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_I2C
@@ -509,22 +508,22 @@ config MACH_MX31MOBOARD
         select IMX_HAVE_PLATFORM_SPI_IMX
         select LEDS_GPIO_REGISTER
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
         help
           Include support for mx31moboard platform. This includes specific
           configurations for the board and its peripherals.
 
 config MACH_QONG
         bool "Support Dave/DENX QongEVB-LITE platform"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX31
         help
           Include support for Dave/DENX QongEVB-LITE platform. This includes
           specific configurations for the board and its peripherals.
 
 config MACH_ARMADILLO5X0
         bool "Support Atmark Armadillo-500 Development Base Board"
-        select SOC_IMX31
         select IMX_HAVE_PLATFORM_GPIO_KEYS
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
@@ -533,23 +532,24 @@ config MACH_ARMADILLO5X0
         select IMX_HAVE_PLATFORM_MXC_MMC
         select IMX_HAVE_PLATFORM_MXC_NAND
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
         help
           Include support for Atmark Armadillo-500 platform. This includes
           specific configurations for the board and its peripherals.
 
 config MACH_KZM_ARM11_01
         bool "Support KZM-ARM11-01(Kyoto Microcomputer)"
-        select SOC_IMX31
         select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX31
         help
           Include support for KZM-ARM11-01. This includes specific
           configurations for the board and its peripherals.
 
 config MACH_BUG
         bool "Support Buglabs BUGBase platform"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_UART
         default y
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX31
         help
           Include support for BUGBase 1.3 platform. This includes specific
           configurations for the board and its peripherals.
@@ -565,7 +565,6 @@ comment "MX35 platforms:"
 
 config MACH_PCM043
         bool "Support Phytec pcm043 (i.MX35) platforms"
-        select SOC_IMX35
         select IMX_HAVE_PLATFORM_FLEXCAN
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
@@ -577,14 +576,13 @@ config MACH_PCM043
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX35
         help
           Include support for Phytec pcm043 platform. This includes
           specific configurations for the board and its peripherals.
 
 config MACH_MX35_3DS
         bool "Support MX35PDK platform"
-        select SOC_IMX35
-        select MXC_DEBUG_BOARD
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_FB
@@ -595,13 +593,14 @@ config MACH_MX35_3DS
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_MXC_RTC
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select MXC_DEBUG_BOARD
+        select SOC_IMX35
         help
           Include support for MX35PDK platform. This includes specific
           configurations for the board and its peripherals.
 
 config MACH_EUKREA_CPUIMX35SD
         bool "Support Eukrea CPUIMX35 Platform"
-        select SOC_IMX35
         select IMX_HAVE_PLATFORM_FLEXCAN
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
@@ -611,6 +610,7 @@ config MACH_EUKREA_CPUIMX35SD
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
         select MXC_ULPI if USB_ULPI
+        select SOC_IMX35
         help
           Include support for Eukrea CPUIMX35 platform. This includes
           specific configurations for the board and its peripherals.
@@ -635,16 +635,16 @@ endchoice
 
 config MACH_VPR200
         bool "Support VPR200 platform"
-        select SOC_IMX35
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_GPIO_KEYS
         select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select SOC_IMX35
         help
           Include support for VPR200 platform. This includes specific
           configurations for the board and its peripherals.
@@ -654,11 +654,11 @@ comment "i.MX5 platforms:"
 config MACH_MX50_RDP
         bool "Support MX50 reference design platform"
         depends on BROKEN
-        select SOC_IMX50
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
         select IMX_HAVE_PLATFORM_SPI_IMX
+        select SOC_IMX50
         help
           Include support for MX50 reference design platform (RDP) board. This
           includes specific configurations for the board and its peripherals.
@@ -667,15 +667,14 @@ comment "i.MX51 machines:"
 
 config MACH_IMX51_DT
         bool "Support i.MX51 platforms from device tree"
-        select SOC_IMX51
         select MACH_MX51_BABBAGE
+        select SOC_IMX51
         help
           Include support for Freescale i.MX51 based platforms
           using the device tree for discovery
 
 config MACH_MX51_BABBAGE
         bool "Support MX51 BABBAGE platforms"
-        select SOC_IMX51
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_I2C
@@ -683,6 +682,7 @@ config MACH_MX51_BABBAGE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
         select IMX_HAVE_PLATFORM_SPI_IMX
+        select SOC_IMX51
         help
           Include support for MX51 Babbage platform, also known as MX51EVK in
           u-boot. This includes specific configurations for the board and its
@@ -690,27 +690,27 @@ config MACH_MX51_BABBAGE
 
 config MACH_MX51_3DS
         bool "Support MX51PDK (3DS)"
-        select SOC_IMX51
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_KEYPAD
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
         select IMX_HAVE_PLATFORM_SPI_IMX
         select MXC_DEBUG_BOARD
+        select SOC_IMX51
         help
           Include support for MX51PDK (3DS) platform. This includes specific
           configurations for the board and its peripherals.
 
 config MACH_EUKREA_CPUIMX51SD
         bool "Support Eukrea CPUIMX51SD module"
-        select SOC_IMX51
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SPI_IMX
+        select SOC_IMX51
         help
           Include support for Eukrea CPUIMX51SD platform. This includes
           specific configurations for the module and its peripherals.
@@ -736,12 +736,12 @@ comment "Device tree only"
 
 config  SOC_IMX53
         bool "i.MX53 support"
-        select SOC_IMX5
         select ARCH_MX5
         select ARCH_MX53
         select HAVE_CAN_FLEXCAN if CAN
         select PINCTRL
         select PINCTRL_IMX53
+        select SOC_IMX5
 
         help
           This enables support for Freescale i.MX53 processor.
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index fd5e7b6881bf..73a2d905af8a 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -234,8 +234,8 @@ config IXP4XX_QMGR
 
 config IXP4XX_NPE
         tristate "IXP4xx Network Processor Engine support"
-        select HOTPLUG
         select FW_LOADER
+        select HOTPLUG
         help
           This driver supports IXP4xx built-in network coprocessors
           and is automatically selected by Ethernet and HSS drivers.
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
index d697d07a1bf0..178d4daa5e1d 100644
--- a/arch/arm/mach-mmp/Kconfig
+++ b/arch/arm/mach-mmp/Kconfig
@@ -107,22 +107,22 @@ endmenu
 
 config CPU_PXA168
         bool
-        select CPU_MOHAWK
         select COMMON_CLK
+        select CPU_MOHAWK
         help
           Select code specific to PXA168
 
 config CPU_PXA910
         bool
-        select CPU_MOHAWK
         select COMMON_CLK
+        select CPU_MOHAWK
         help
           Select code specific to PXA910
 
 config CPU_MMP2
         bool
-        select CPU_PJ4
         select COMMON_CLK
+        select CPU_PJ4
         help
           Select code specific to MMP2. MMP2 is ARMv7 compatible.
 
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 7902de151cc5..b61908594b47 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -10,35 +10,35 @@ choice
 
 config ARCH_MSM7X00A
         bool "MSM7x00A / MSM7x01A"
-        select MACH_TROUT if !MACH_HALIBUT
         select ARCH_MSM_ARM11
-        select MSM_SMD
-        select MSM_SMD_PKG3
         select CPU_V6
         select GPIO_MSM_V1
+        select MACH_TROUT if !MACH_HALIBUT
         select MSM_PROC_COMM
+        select MSM_SMD
+        select MSM_SMD_PKG3
 
 config ARCH_MSM7X30
         bool "MSM7x30"
-        select MACH_MSM7X30_SURF # if !
         select ARCH_MSM_SCORPION
-        select MSM_SMD
-        select MSM_VIC
         select CPU_V7
-        select MSM_GPIOMUX
         select GPIO_MSM_V1
+        select MACH_MSM7X30_SURF # if !
+        select MSM_GPIOMUX
         select MSM_PROC_COMM
+        select MSM_SMD
+        select MSM_VIC
 
 config ARCH_QSD8X50
         bool "QSD8X50"
-        select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
         select ARCH_MSM_SCORPION
-        select MSM_SMD
-        select MSM_VIC
         select CPU_V7
-        select MSM_GPIOMUX
         select GPIO_MSM_V1
+        select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
+        select MSM_GPIOMUX
         select MSM_PROC_COMM
+        select MSM_SMD
+        select MSM_VIC
 
 endchoice
 
@@ -47,10 +47,10 @@ config ARCH_MSM8X60
         select ARCH_MSM_SCORPIONMP
         select ARM_GIC
         select CPU_V7
-        select MSM_V2_TLMM
         select GPIO_MSM_V2
         select MSM_GPIOMUX
         select MSM_SCM if SMP
+        select MSM_V2_TLMM
         select USE_OF
 
 config ARCH_MSM8960
@@ -58,9 +58,9 @@ config ARCH_MSM8960
         select ARCH_MSM_SCORPIONMP
         select ARM_GIC
         select CPU_V7
-        select MSM_V2_TLMM
         select MSM_GPIOMUX
         select MSM_SCM if SMP
+        select MSM_V2_TLMM
         select USE_OF
 
 config MSM_HAS_DEBUG_UART_HS
@@ -110,8 +110,8 @@ config MACH_QSD8X50_SURF
 
 config MACH_QSD8X50A_ST1_5
         depends on ARCH_QSD8X50
-        select MSM_SOC_REV_A
         bool "QSD8x50A ST1.5"
+        select MSM_SOC_REV_A
         help
           Support for the Qualcomm ST1.5.
 
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
index 365879b47c0e..c744946ef022 100644
--- a/arch/arm/mach-nomadik/Kconfig
+++ b/arch/arm/mach-nomadik/Kconfig
@@ -4,8 +4,8 @@ menu "Nomadik boards"
 
 config MACH_NOMADIK_8815NHK
         bool "ST 8815 Nomadik Hardware Kit (evaluation board)"
-        select NOMADIK_8815
         select HAS_MTU
+        select NOMADIK_8815
 
 endmenu
 
@@ -16,7 +16,7 @@ config I2C_BITBANG_8815NHK
         tristate "Driver for bit-bang busses found on the 8815 NHK"
         depends on I2C && MACH_NOMADIK_8815NHK
         depends on PINCTRL_NOMADIK
-        select I2C_ALGOBIT
         default y
+        select I2C_ALGOBIT
 
 endif
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index cba3f7191cfc..903da8eb886c 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -8,15 +8,15 @@ comment "OMAP Core Type"
 config ARCH_OMAP730
         depends on ARCH_OMAP1
         bool "OMAP730 Based System"
+        select ARCH_OMAP_OTG
         select CPU_ARM926T
         select OMAP_MPU_TIMER
-        select ARCH_OMAP_OTG
 
 config ARCH_OMAP850
         depends on ARCH_OMAP1
         bool "OMAP850 Based System"
-        select CPU_ARM926T
         select ARCH_OMAP_OTG
+        select CPU_ARM926T
 
 config ARCH_OMAP15XX
         depends on ARCH_OMAP1
@@ -28,8 +28,8 @@ config ARCH_OMAP15XX
 config ARCH_OMAP16XX
         depends on ARCH_OMAP1
         bool "OMAP16xx Based System"
-        select CPU_ARM926T
         select ARCH_OMAP_OTG
+        select CPU_ARM926T
 
 comment "OMAP Board Type"
         depends on ARCH_OMAP1
@@ -132,8 +132,8 @@ config MACH_OMAP_PALMTT
 
 config MACH_SX1
         bool "Siemens SX1"
-        select I2C
         depends on ARCH_OMAP1 && ARCH_OMAP15XX
+        select I2C
         help
           Support for the Siemens SX1 phone. To boot the kernel,
           you'll need a SX1 compatible bootloader; check out
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index a6219eaf1f68..2a1a898c7f90 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -6,19 +6,19 @@ config ARCH_OMAP2PLUS_TYPICAL
         bool "Typical OMAP configuration"
         default y
         select AEABI
-        select REGULATOR
-        select PM_RUNTIME
-        select VFP
-        select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
-        select SERIAL_OMAP
-        select SERIAL_OMAP_CONSOLE
+        select HIGHMEM
         select I2C
         select I2C_OMAP
         select MENELAUS if ARCH_OMAP2
+        select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
+        select PINCTRL
+        select PM_RUNTIME
+        select REGULATOR
+        select SERIAL_OMAP
+        select SERIAL_OMAP_CONSOLE
         select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
         select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
-        select HIGHMEM
-        select PINCTRL
+        select VFP
         help
           Compile a kernel suitable for booting most boards
 
@@ -40,44 +40,44 @@ config ARCH_OMAP3
         bool "TI OMAP3"
         depends on ARCH_OMAP2PLUS
         default y
-        select CPU_V7
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
         select ARCH_HAS_OPP
-        select PM_RUNTIME if CPU_IDLE
-        select PM_OPP if PM
         select ARM_CPU_SUSPEND if PM
+        select CPU_V7
         select MULTI_IRQ_HANDLER
-        select SOC_HAS_OMAP2_SDRC
         select OMAP_INTERCONNECT
+        select PM_OPP if PM
+        select PM_RUNTIME if CPU_IDLE
+        select SOC_HAS_OMAP2_SDRC
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
 
 config ARCH_OMAP4
         bool "TI OMAP4"
         default y
         depends on ARCH_OMAP2PLUS
+        select ARCH_HAS_OPP
+        select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
+        select ARM_CPU_SUSPEND if PM
+        select ARM_ERRATA_720789
+        select ARM_GIC
         select CACHE_L2X0
         select CPU_V7
-        select ARM_GIC
         select HAVE_SMP
         select LOCAL_TIMERS if SMP
+        select OMAP_INTERCONNECT
         select PL310_ERRATA_588369
         select PL310_ERRATA_727915
-        select ARM_ERRATA_720789
-        select ARCH_HAS_OPP
-        select PM_RUNTIME if CPU_IDLE
         select PM_OPP if PM
+        select PM_RUNTIME if CPU_IDLE
         select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select ARM_CPU_SUSPEND if PM
-        select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
-        select OMAP_INTERCONNECT
 
 config SOC_OMAP5
         bool "TI OMAP5"
-        select CPU_V7
+        select ARM_ARCH_TIMER
+        select ARM_CPU_SUSPEND if PM
         select ARM_GIC
+        select CPU_V7
         select HAVE_SMP
-        select ARM_CPU_SUSPEND if PM
         select SOC_HAS_REALTIME_COUNTER
-        select ARM_ARCH_TIMER
 
 comment "OMAP Core Type"
         depends on ARCH_OMAP2
@@ -109,8 +109,8 @@ config SOC_TI81XX
 config SOC_AM33XX
         bool "AM33XX support"
         default y
-        select CPU_V7
         select ARM_CPU_SUSPEND if PM
+        select CPU_V7
         select MULTI_IRQ_HANDLER
 
 config OMAP_PACKAGE_ZAF
@@ -157,8 +157,8 @@ config MACH_OMAP_H4
         bool "OMAP 2420 H4 board"
         depends on SOC_OMAP2420
         default y
-        select OMAP_PACKAGE_ZAF
         select OMAP_DEBUG_DEVICES
+        select OMAP_PACKAGE_ZAF
 
 config MACH_OMAP_APOLLON
         bool "OMAP 2420 Apollon board"
@@ -193,8 +193,8 @@ config MACH_OMAP_LDP
 config MACH_OMAP3530_LV_SOM
         bool "OMAP3 Logic 3530 LV SOM board"
         depends on ARCH_OMAP3
-        select OMAP_PACKAGE_CBB
         default y
+        select OMAP_PACKAGE_CBB
         help
          Support for the LogicPD OMAP3530 SOM Development kit
          for full description please see the products webpage at
@@ -203,8 +203,8 @@ config MACH_OMAP3530_LV_SOM
 config MACH_OMAP3_TORPEDO
         bool "OMAP3 Logic 35x Torpedo board"
         depends on ARCH_OMAP3
-        select OMAP_PACKAGE_CBB
         default y
+        select OMAP_PACKAGE_CBB
         help
          Support for the LogicPD OMAP35x Torpedo Development kit
          for full description please see the products webpage at
@@ -265,17 +265,17 @@ config MACH_NOKIA_N8X0
         bool "Nokia N800/N810"
         depends on SOC_OMAP2420
         default y
-        select OMAP_PACKAGE_ZAC
         select MACH_NOKIA_N800
         select MACH_NOKIA_N810
         select MACH_NOKIA_N810_WIMAX
+        select OMAP_PACKAGE_ZAC
 
 config MACH_NOKIA_RM680
         bool "Nokia RM-680/696 board"
         depends on ARCH_OMAP3
         default y
-        select OMAP_PACKAGE_CBB
         select MACH_NOKIA_RM696
+        select OMAP_PACKAGE_CBB
 
 config MACH_NOKIA_RX51
         bool "Nokia RX-51 board"
@@ -288,20 +288,20 @@ config MACH_OMAP_ZOOM2
         depends on ARCH_OMAP3
         default y
         select OMAP_PACKAGE_CBB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select SERIAL_8250
-        select SERIAL_CORE_CONSOLE
         select SERIAL_8250_CONSOLE
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SERIAL_CORE_CONSOLE
 
 config MACH_OMAP_ZOOM3
         bool "OMAP3630 Zoom3 board"
         depends on ARCH_OMAP3
         default y
         select OMAP_PACKAGE_CBP
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select SERIAL_8250
-        select SERIAL_CORE_CONSOLE
         select SERIAL_8250_CONSOLE
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SERIAL_CORE_CONSOLE
 
 config MACH_CM_T35
         bool "CompuLab CM-T35/CM-T3730 modules"
@@ -329,8 +329,8 @@ config MACH_IGEP0030
         bool "IGEP OMAP3 module"
         depends on ARCH_OMAP3
         default y
-        select OMAP_PACKAGE_CBB
         select MACH_IGEP0020
+        select OMAP_PACKAGE_CBB
 
 config MACH_SBC3530
         bool "OMAP3 SBC STALKER board"
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 41fc85327673..558ccfb8d458 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -6,8 +6,8 @@ config ARCH_PRIMA2
         bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
         default y
         select CPU_V7
-        select ZONE_DMA
         select SIRF_IRQ
+        select ZONE_DMA
         help
           Support for CSR SiRFSoC ARM Cortex A9 Platform
 
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 8e6288de69b9..11aa7399dc09 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -27,10 +27,10 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
 
 config MACH_PXA3XX_DT
         bool "Support PXA3xx platforms from device tree"
-        select PXA3xx
         select CPU_PXA300
-        select POWER_SUPPLY
         select HAVE_PWM
+        select POWER_SUPPLY
+        select PXA3xx
         select USE_OF
         help
           Include support for Marvell PXA3xx based platforms using
@@ -44,13 +44,13 @@ config ARCH_LUBBOCK
 
 config MACH_MAINSTONE
         bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
-        select PXA27x
         select HAVE_PWM
+        select PXA27x
 
 config MACH_ZYLONITE
         bool
-        select PXA3xx
         select HAVE_PWM
+        select PXA3xx
 
 config MACH_ZYLONITE300
         bool "PXA3xx Development Platform (aka Zylonite) PXA300/310"
@@ -65,19 +65,19 @@ config MACH_ZYLONITE320
 
 config MACH_LITTLETON
         bool "PXA3xx Form Factor Platform (aka Littleton)"
-        select PXA3xx
         select CPU_PXA300
         select CPU_PXA310
+        select PXA3xx
 
 config MACH_TAVOREVB
         bool "PXA930 Evaluation Board (aka TavorEVB)"
-        select PXA3xx
         select CPU_PXA930
+        select PXA3xx
 
 config MACH_SAAR
         bool "PXA930 Handheld Platform (aka SAAR)"
-        select PXA3xx
         select CPU_PXA930
+        select PXA3xx
 
 comment "Third Party Dev Platforms (sorted by vendor name)"
 
@@ -87,29 +87,29 @@ config ARCH_PXA_IDP
 
 config ARCH_VIPER
         bool "Arcom/Eurotech VIPER SBC"
-        select PXA25x
-        select ISA
-        select I2C_GPIO
+        select ARCOM_PCMCIA
         select HAVE_PWM
+        select I2C_GPIO
+        select ISA
+        select PXA25x
         select PXA_HAVE_ISA_IRQS
-        select ARCOM_PCMCIA
 
 config MACH_ARCOM_ZEUS
         bool "Arcom/Eurotech ZEUS SBC"
-        select PXA27x
+        select ARCOM_PCMCIA
         select ISA
+        select PXA27x
         select PXA_HAVE_ISA_IRQS
-        select ARCOM_PCMCIA
 
 config MACH_BALLOON3
         bool "Balloon 3 board"
-        select PXA27x
         select IWMMXT
+        select PXA27x
 
 config MACH_CSB726
         bool "Enable Cogent CSB726 System On a Module"
-        select PXA27x
         select IWMMXT
+        select PXA27x
         help
           Say Y here if you intend to run this kernel on a Cogent
           CSB726 System On Module.
@@ -121,11 +121,11 @@ config CSB726_CSB701
 config MACH_ARMCORE
         bool "CompuLab CM-X255/CM-X270 modules"
         select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI
-        select PXA27x
         select IWMMXT
-        select PXA25x
         select MIGHT_HAVE_PCI
         select NEED_MACH_IO_H if PCI
+        select PXA25x
+        select PXA27x
 
 config MACH_EM_X270
         bool "CompuLab EM-x270 platform"
@@ -137,10 +137,10 @@ config MACH_EXEDA
 
 config MACH_CM_X300
         bool "CompuLab CM-X300 modules"
-        select PXA3xx
         select CPU_PXA300
         select CPU_PXA310
         select HAVE_PWM
+        select PXA3xx
 
 config MACH_CAPC7117
         bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM"
@@ -168,22 +168,22 @@ endchoice
 
 config MACH_INTELMOTE2
         bool "Intel Mote 2 Platform"
-        select PXA27x
         select IWMMXT
+        select PXA27x
 
 config MACH_STARGATE2
         bool "Intel Stargate 2 Platform"
-        select PXA27x
         select IWMMXT
+        select PXA27x
 
 config MACH_XCEP
         bool "Iskratel Electronics XCEP"
-        select PXA25x
         select MTD
-        select MTD_PHYSMAP
-        select MTD_CFI_INTELEXT
         select MTD_CFI
+        select MTD_CFI_INTELEXT
         select MTD_CHAR
+        select MTD_PHYSMAP
+        select PXA25x
         select SMC91X
         help
           PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
@@ -195,14 +195,14 @@ config TRIZEPS_PXA
 config MACH_TRIZEPS4
         bool "Keith und Koep Trizeps4 DIMM-Module"
         depends on TRIZEPS_PXA
-        select TRIZEPS_PCMCIA
         select PXA27x
+        select TRIZEPS_PCMCIA
 
 config MACH_TRIZEPS4WL
         bool "Keith und Koep Trizeps4-WL DIMM-Module"
         depends on TRIZEPS_PXA
-        select TRIZEPS_PCMCIA
         select PXA27x
+        select TRIZEPS_PCMCIA
 
 choice
         prompt "Select base board for Trizeps module"
@@ -231,18 +231,18 @@ config TRIZEPS_PCMCIA
 
 config MACH_LOGICPD_PXA270
         bool "LogicPD PXA270 Card Engine Development Platform"
-        select PXA27x
         select HAVE_PWM
+        select PXA27x
 
 config MACH_PCM027
         bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
-        select PXA27x
         select IWMMXT
+        select PXA27x
 
 config MACH_PCM990_BASEBOARD
         bool "PHYTEC PCM-990 development board"
-        select HAVE_PWM
         depends on MACH_PCM027
+        select HAVE_PWM
 
 choice
         prompt "display on pcm990"
@@ -266,19 +266,19 @@ config MACH_COLIBRI
 config MACH_COLIBRI_PXA270_INCOME
         bool "Income s.r.o. PXA270 SBC"
         depends on MACH_COLIBRI
-        select PXA27x
         select HAVE_PWM
+        select PXA27x
 
 config MACH_COLIBRI300
         bool "Toradex Colibri PXA300/310"
-        select PXA3xx
         select CPU_PXA300
         select CPU_PXA310
+        select PXA3xx
 
 config MACH_COLIBRI320
         bool "Toradex Colibri PXA320"
-        select PXA3xx
         select CPU_PXA320
+        select PXA3xx
 
 config MACH_COLIBRI_EVALBOARD
         bool "Toradex Colibri Evaluation Carrier Board support"
@@ -286,8 +286,8 @@ config MACH_COLIBRI_EVALBOARD
 
 config MACH_VPAC270
         bool "Voipac PXA270"
-        select PXA27x
         select HAVE_PATA_PLATFORM
+        select PXA27x
         help
           PXA270 based Single Board Computer.
 
@@ -295,9 +295,9 @@ comment "End-user Products (sorted by vendor name)"
 
 config MACH_H4700
         bool "HP iPAQ hx4700"
-        select PXA27x
-        select IWMMXT
         select HAVE_PWM
+        select IWMMXT
+        select PXA27x
 
 config MACH_H5000
         bool "HP iPAQ h5000"
@@ -309,16 +309,16 @@ config MACH_HIMALAYA
 
 config MACH_MAGICIAN
         bool "Enable HTC Magician Support"
-        select PXA27x
-        select IWMMXT
         select HAVE_PWM
+        select IWMMXT
+        select PXA27x
 
 config MACH_MIOA701
         bool "Mitac Mio A701 Support"
-        select PXA27x
-        select IWMMXT
-        select HAVE_PWM
         select GPIO_SYSFS
+        select HAVE_PWM
+        select IWMMXT
+        select PXA27x
         help
           Say Y here if you intend to run this kernel on a
           MIO A701. Currently there is only basic support
@@ -326,9 +326,9 @@ config MACH_MIOA701
 
 config PXA_EZX
         bool "Motorola EZX Platform"
-        select PXA27x
-        select IWMMXT
         select HAVE_PWM
+        select IWMMXT
+        select PXA27x
 
 config MACH_EZX_A780
         bool "Motorola EZX A780"
@@ -393,9 +393,9 @@ config MACH_PALMT5
         bool "Palm Tungsten|T5"
         default y
         depends on ARCH_PXA_PALM
-        select PXA27x
         select IWMMXT
         select MACH_PALM27X
+        select PXA27x
         help
           Say Y here if you intend to run this kernel on a Palm Tungsten|T5
           handheld computer.
@@ -404,9 +404,9 @@ config MACH_PALMTX
         bool "Palm T|X"
         default y
         depends on ARCH_PXA_PALM
-        select PXA27x
         select IWMMXT
         select MACH_PALM27X
+        select PXA27x
         help
           Say Y here if you intend to run this kernel on a Palm T|X
           handheld computer.
@@ -415,9 +415,9 @@ config MACH_PALMZ72
         bool "Palm Zire 72"
         default y
         depends on ARCH_PXA_PALM
-        select PXA27x
         select IWMMXT
         select MACH_PALM27X
+        select PXA27x
         help
           Say Y here if you intend to run this kernel on Palm Zire 72
           handheld computer.
@@ -426,9 +426,9 @@ config MACH_PALMLD
         bool "Palm LifeDrive"
         default y
         depends on ARCH_PXA_PALM
-        select PXA27x
         select IWMMXT
         select MACH_PALM27X
+        select PXA27x
         help
           Say Y here if you intend to run this kernel on a Palm LifeDrive
           handheld computer.
@@ -441,10 +441,10 @@ config MACH_CENTRO
         bool "Palm Centro 685 (GSM)"
         default y
         depends on ARCH_PXA_PALM
-        select MACH_PALM27X
-        select PXA27x
         select IWMMXT
+        select MACH_PALM27X
         select PALM_TREO
+        select PXA27x
         help
           Say Y here if you intend to run this kernel on Palm Centro 685 (GSM)
           smartphone.
@@ -453,37 +453,37 @@ config MACH_TREO680
         bool "Palm Treo 680"
         default y
         depends on ARCH_PXA_PALM
-        select MACH_PALM27X
-        select PXA27x
         select IWMMXT
+        select MACH_PALM27X
         select PALM_TREO
+        select PXA27x
         help
           Say Y here if you intend to run this kernel on Palm Treo 680
           smartphone.
 
 config MACH_RAUMFELD_RC
         bool "Raumfeld Controller"
-        select PXA3xx
         select CPU_PXA300
-        select POWER_SUPPLY
         select HAVE_PWM
+        select POWER_SUPPLY
+        select PXA3xx
 
 config MACH_RAUMFELD_CONNECTOR
         bool "Raumfeld Connector"
+        select CPU_PXA300
         select POWER_SUPPLY
         select PXA3xx
-        select CPU_PXA300
 
 config MACH_RAUMFELD_SPEAKER
         bool "Raumfeld Speaker"
+        select CPU_PXA300
         select POWER_SUPPLY
         select PXA3xx
-        select CPU_PXA300
 
 config PXA_SHARPSL
         bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
-        select SHARP_SCOOP
         select SHARP_PARAM
+        select SHARP_SCOOP
         help
           Say Y here if you intend to run this kernel on a
           Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi),
@@ -526,11 +526,11 @@ config MACH_HUSKY
 config MACH_AKITA
         bool "Enable Sharp SL-1000 (Akita) Support"
         depends on PXA_SHARPSL
-        select PXA27x
-        select PXA_SHARP_Cxx00
-        select MACH_SPITZ
         select I2C
         select I2C_PXA
+        select MACH_SPITZ
+        select PXA27x
+        select PXA_SHARP_Cxx00
 
 config MACH_SPITZ
         bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
@@ -575,8 +575,8 @@ config MACH_ICONTROL
 
 config ARCH_PXA_ESERIES
         bool "PXA based Toshiba e-series PDAs"
-        select PXA25x
         select FB_W100
+        select PXA25x
 
 config MACH_E330
         bool "Toshiba e330"
@@ -628,8 +628,8 @@ config MACH_E800
 
 config MACH_ZIPIT2
         bool "Zipit Z2 Handheld"
-        select PXA27x
         select HAVE_PWM
+        select PXA27x
 endif
 endmenu
 
@@ -720,9 +720,9 @@ config SHARPSL_PM
 config SHARPSL_PM_MAX1111
         bool
         select HWMON
+        select SENSORS_MAX1111
         select SPI
         select SPI_MASTER
-        select SENSORS_MAX1111
 
 config PXA_HAVE_ISA_IRQS
         bool
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index c593be428b8f..14c1d47e1abf 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -21,8 +21,8 @@ config REALVIEW_EB_A9MP
 config REALVIEW_EB_ARM11MP
         bool "Support ARM11MPCore Tile"
         depends on MACH_REALVIEW_EB
-        select CPU_V6K
         select ARCH_HAS_BARRIERS if SMP
+        select CPU_V6K
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
         help
@@ -40,12 +40,12 @@ config REALVIEW_EB_ARM11MP_REVB
 
 config MACH_REALVIEW_PB11MP
         bool "Support RealView(R) Platform Baseboard for ARM11MPCore"
-        select CPU_V6K
+        select ARCH_HAS_BARRIERS if SMP
         select ARM_GIC
+        select CPU_V6K
         select HAVE_PATA_PLATFORM
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
-        select ARCH_HAS_BARRIERS if SMP
         help
           Include support for the ARM(R) RealView(R) Platform Baseboard for
           the ARM11MPCore.  This platform has an on-board ARM11MPCore and has
@@ -54,8 +54,8 @@ config MACH_REALVIEW_PB11MP
 # ARMv6 CPU without K extensions, but does have the new exclusive ops
 config MACH_REALVIEW_PB1176
         bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S"
-        select CPU_V6
         select ARM_GIC
+        select CPU_V6
         select HAVE_TCM
         select MIGHT_HAVE_CACHE_L2X0
         help
@@ -73,8 +73,8 @@ config REALVIEW_PB1176_SECURE_FLASH
 
 config MACH_REALVIEW_PBA8
         bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform"
-        select CPU_V7
         select ARM_GIC
+        select CPU_V7
         select HAVE_PATA_PLATFORM
         help
           Include support for the ARM(R) RealView Platform Baseboard for
@@ -83,11 +83,11 @@ config MACH_REALVIEW_PBA8
 
 config MACH_REALVIEW_PBX
         bool "Support RealView(R) Platform Baseboard Explore"
+        select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
         select ARM_GIC
         select HAVE_PATA_PLATFORM
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
-        select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
         select ZONE_DMA if SPARSEMEM
         help
           Include support for the ARM(R) RealView(R) Platform Baseboard
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig
index c5256f4e90bb..495f6928cbaa 100644
--- a/arch/arm/mach-s3c2412/Kconfig
+++ b/arch/arm/mach-s3c2412/Kconfig
@@ -7,7 +7,7 @@
 config S3C2412_CPUFREQ
         bool
         depends on CPU_FREQ_S3C24XX && CPU_S3C2412
-        select S3C2412_IOTIMING
         default y
+        select S3C2412_IOTIMING
         help
           CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index ece7a10fe3c6..a4d7fd27bec5 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -5,8 +5,8 @@
 config S3C2440_CPUFREQ
         bool "S3C2440/S3C2442 CPU Frequency scaling support"
         depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442)
-        select S3C2410_CPUFREQ_UTILS
         default y
+        select S3C2410_CPUFREQ_UTILS
         help
           CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs.
 
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index d56b0f7f2b20..2b6cb5f29c2d 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -17,10 +17,10 @@ config CPU_S3C2410
         bool "SAMSUNG S3C2410"
         default y
         select CPU_ARM920T
-        select S3C2410_CLOCK
         select CPU_LLSERIAL_S3C2410
-        select S3C2410_PM if PM
+        select S3C2410_CLOCK
         select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX
+        select S3C2410_PM if PM
         help
           Support for S3C2410 and S3C2410A family from the S3C24XX line
           of Samsung Mobile CPUs.
@@ -30,8 +30,8 @@ config CPU_S3C2412
         depends on ARCH_S3C24XX
         select CPU_ARM926T
         select CPU_LLSERIAL_S3C2440
-        select S3C2412_PM if PM
         select S3C2412_DMA if S3C24XX_DMA
+        select S3C2412_PM if PM
         help
           Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
 
@@ -40,10 +40,10 @@ config CPU_S3C2416
         depends on ARCH_S3C24XX
         select CPU_ARM926T
         select CPU_LLSERIAL_S3C2440
-        select SAMSUNG_CLKSRC
+        select S3C2416_PM if PM
         select S3C2443_COMMON
         select S3C2443_DMA if S3C24XX_DMA
-        select S3C2416_PM if PM
+        select SAMSUNG_CLKSRC
         help
           Support for the S3C2416 SoC from the S3C24XX line
 
@@ -75,9 +75,9 @@ config CPU_S3C2443
         depends on ARCH_S3C24XX
         select CPU_ARM920T
         select CPU_LLSERIAL_S3C2440
-        select SAMSUNG_CLKSRC
         select S3C2443_COMMON
         select S3C2443_DMA if S3C24XX_DMA
+        select SAMSUNG_CLKSRC
         help
           Support for the S3C2443 SoC from the S3C24XX line
 
@@ -156,16 +156,16 @@ config MACH_AML_M5900
 
 config ARCH_BAST
         bool "Simtec Electronics BAST (EB2410ITX)"
+        select ISA
+        select MACH_BAST_IDE
         select S3C2410_IOTIMING if S3C2410_CPUFREQ
-        select S3C24XX_SIMTEC_PM if PM
+        select S3C24XX_DCLK
         select S3C24XX_SIMTEC_NOR
+        select S3C24XX_SIMTEC_PM if PM
         select S3C24XX_SIMTEC_USB
-        select MACH_BAST_IDE
-        select S3C24XX_DCLK
-        select ISA
         select S3C_DEV_HWMON
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the Simtec Electronics EB2410ITX
           development board (also known as BAST)
@@ -181,9 +181,9 @@ config BAST_PC104_IRQ
 config ARCH_H1940
         bool "IPAQ H1940"
         select PM_H1940 if PM
-        select S3C_DEV_USB_HOST
-        select S3C_DEV_NAND
         select S3C24XX_SETUP_TS
+        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the HP IPAQ H1940
 
@@ -203,23 +203,23 @@ config PM_H1940
 config MACH_N30
         bool "Acer N30 family"
         select MACH_N35
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you want suppt for the Acer N30, Acer N35,
           Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs.
 
 config MACH_OTOM
         bool "NexVision OTOM Board"
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the Nex Vision OTOM board
 
 config MACH_QT2410
         bool "QT2410"
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the Armzone QT2410
 
@@ -239,12 +239,12 @@ config MACH_TCT_HAMMER
 
 config MACH_VR1000
         bool "Thorcom VR1000"
-        select S3C24XX_SIMTEC_PM if PM
+        select MACH_BAST_IDE
         select S3C24XX_DCLK
         select S3C24XX_SIMTEC_NOR
-        select MACH_BAST_IDE
-        select S3C_DEV_USB_HOST
+        select S3C24XX_SIMTEC_PM if PM
         select S3C24XX_SIMTEC_USB
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the Thorcom VR1000 board.
 
@@ -285,8 +285,8 @@ comment "S3C2412 Boards"
 
 config MACH_JIVE
         bool "Logitech Jive"
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the Logitech Jive.
 
@@ -314,15 +314,15 @@ config MACH_SMDK2413
         bool "SMDK2413"
         select MACH_S3C2413
         select S3C24XX_SMDK
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using an SMDK2413
 
 config MACH_VSTMS
         bool "VMSTMS"
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using an VSTMS board
 
@@ -351,13 +351,13 @@ comment "S3C2416 Boards"
 
 config MACH_SMDK2416
         bool "SMDK2416"
+        select S3C2416_SETUP_SDHCI
         select S3C24XX_SMDK
         select S3C_DEV_FB
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_NAND
         select S3C_DEV_USB_HOST
-        select S3C2416_SETUP_SDHCI
         help
           Say Y here if you are using an SMDK2416
 
@@ -379,11 +379,11 @@ comment "S3C2440 Boards"
 
 config MACH_ANUBIS
         bool "Simtec Electronics ANUBIS"
-        select S3C24XX_DCLK
-        select S3C24XX_SIMTEC_PM if PM
         select HAVE_PATA_PLATFORM
-        select S3C24XX_GPIO_EXTRA64
         select S3C2440_XTAL_12000000
+        select S3C24XX_DCLK
+        select S3C24XX_GPIO_EXTRA64
+        select S3C24XX_SIMTEC_PM if PM
         select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the Simtec Electronics ANUBIS
@@ -391,18 +391,18 @@ config MACH_ANUBIS
 
 config MACH_AT2440EVB
         bool "Avantech AT2440EVB development board"
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the AT2440EVB development board
 
 config MACH_MINI2440
         bool "MINI2440 development board"
         select EEPROM_AT24
-        select NEW_LEDS
         select LEDS_CLASS
         select LEDS_TRIGGER
         select LEDS_TRIGGER_BACKLIGHT
+        select NEW_LEDS
         select S3C_DEV_NAND
         select S3C_DEV_USB_HOST
         help
@@ -412,20 +412,20 @@ config MACH_MINI2440
 config MACH_NEXCODER_2440
         bool "NexVision NEXCODER 2440 Light Board"
         select S3C2440_XTAL_12000000
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board
 
 config MACH_OSIRIS
         bool "Simtec IM2440D20 (OSIRIS) module"
+        select S3C2410_IOTIMING if S3C2440_CPUFREQ
+        select S3C2440_XTAL_12000000
         select S3C24XX_DCLK
-        select S3C24XX_SIMTEC_PM if PM
         select S3C24XX_GPIO_EXTRA128
-        select S3C2440_XTAL_12000000
-        select S3C2410_IOTIMING if S3C2440_CPUFREQ
-        select S3C_DEV_USB_HOST
+        select S3C24XX_SIMTEC_PM if PM
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the Simtec IM2440D20 module, also
           known as the Osiris.
@@ -445,8 +445,8 @@ config MACH_OSIRIS_DVS
 
 config MACH_RX3715
         bool "HP iPAQ rx3715"
-        select S3C2440_XTAL_16934400
         select PM_H1940 if PM
+        select S3C2440_XTAL_16934400
         select S3C_DEV_NAND
         help
           Say Y here if you are using the HP iPAQ rx3715.
@@ -455,8 +455,8 @@ config ARCH_S3C2440
         bool "SMDK2440"
         select S3C2440_XTAL_16934400
         select S3C24XX_SMDK
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         help
           Say Y here if you are using the SMDK2440.
 
@@ -478,11 +478,11 @@ comment "S3C2442 Boards"
 
 config MACH_NEO1973_GTA02
         bool "Openmoko GTA02 / Freerunner phone"
+        select I2C
+        select MACH_NEO1973
         select MFD_PCF50633
         select PCF50633_GPIO
-        select I2C
         select POWER_SUPPLY
-        select MACH_NEO1973
         select S3C24XX_PWM
         select S3C_DEV_USB_HOST
         help
@@ -490,13 +490,13 @@ config MACH_NEO1973_GTA02
 
 config MACH_RX1950
         bool "HP iPAQ rx1950"
-        select S3C24XX_DCLK
-        select PM_H1940 if PM
         select I2C
-        select S3C24XX_PWM
-        select S3C_DEV_NAND
+        select PM_H1940 if PM
         select S3C2410_IOTIMING if S3C2440_CPUFREQ
         select S3C2440_XTAL_16934400
+        select S3C24XX_DCLK
+        select S3C24XX_PWM
+        select S3C_DEV_NAND
         help
            Say Y here if you're using HP iPAQ rx1950
 
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 06ca1cd4cae2..63e7ae3ee9e6 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -7,9 +7,9 @@
 config PLAT_S3C64XX
         bool
         depends on ARCH_S3C64XX
-        select SAMSUNG_WAKEMASK
-        select PM_GENERIC_DOMAINS
         default y
+        select PM_GENERIC_DOMAINS
+        select SAMSUNG_WAKEMASK
         help
           Base platform code for any Samsung S3C64XX device
 
@@ -31,8 +31,8 @@ config S3C64XX_DMA
         select S3C_DMA
 
 config S3C64XX_SETUP_SDHCI
-        select S3C64XX_SETUP_SDHCI_GPIO
         bool
+        select S3C64XX_SETUP_SDHCI_GPIO
         help
           Internal configuration for default SDHCI setup for S3C6400 and
           S3C6410 SoCs.
@@ -93,9 +93,9 @@ config S3C64XX_SETUP_USB_PHY
 config MACH_SMDK6400
        bool "SMDK6400"
         select CPU_S3C6400
+        select S3C64XX_SETUP_SDHCI
         select S3C_DEV_HSMMC
         select S3C_DEV_NAND
-        select S3C64XX_SETUP_SDHCI
         help
           Machine support for the Samsung SMDK6400
 
@@ -104,21 +104,21 @@ config MACH_SMDK6400
 config MACH_ANW6410
         bool "A&W6410"
         select CPU_S3C6410
-        select S3C_DEV_FB
         select S3C64XX_SETUP_FB_24BPP
+        select S3C_DEV_FB
         help
           Machine support for the A&W6410
 
 config MACH_MINI6410
         bool "MINI6410"
         select CPU_S3C6410
+        select S3C64XX_SETUP_FB_24BPP
+        select S3C64XX_SETUP_SDHCI
+        select S3C_DEV_FB
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
-        select S3C64XX_SETUP_SDHCI
-        select S3C_DEV_USB_HOST
         select S3C_DEV_NAND
-        select S3C_DEV_FB
-        select S3C64XX_SETUP_FB_24BPP
+        select S3C_DEV_USB_HOST
         select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_TS
         help
@@ -127,42 +127,42 @@ config MACH_MINI6410
 config MACH_REAL6410
         bool "REAL6410"
         select CPU_S3C6410
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
+        select S3C64XX_SETUP_FB_24BPP
         select S3C64XX_SETUP_SDHCI
         select S3C_DEV_FB
-        select S3C64XX_SETUP_FB_24BPP
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
         select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
         select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_TS
-        select S3C_DEV_USB_HOST
         help
           Machine support for the CoreWind REAL6410
 
 config MACH_SMDK6410
         bool "SMDK6410"
         select CPU_S3C6410
-        select SAMSUNG_DEV_ADC
+        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select S3C64XX_SETUP_FB_24BPP
+        select S3C64XX_SETUP_I2C1
+        select S3C64XX_SETUP_IDE
+        select S3C64XX_SETUP_KEYPAD
+        select S3C64XX_SETUP_SDHCI
+        select S3C64XX_SETUP_USB_PHY
+        select S3C_DEV_FB
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_I2C1
-        select SAMSUNG_DEV_IDE
-        select S3C_DEV_FB
         select S3C_DEV_RTC
-        select SAMSUNG_DEV_TS
         select S3C_DEV_USB_HOST
         select S3C_DEV_USB_HSOTG
         select S3C_DEV_WDT
+        select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_BACKLIGHT
+        select SAMSUNG_DEV_IDE
         select SAMSUNG_DEV_KEYPAD
         select SAMSUNG_DEV_PWM
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
-        select S3C64XX_SETUP_SDHCI
-        select S3C64XX_SETUP_I2C1
-        select S3C64XX_SETUP_IDE
-        select S3C64XX_SETUP_FB_24BPP
-        select S3C64XX_SETUP_KEYPAD
-        select S3C64XX_SETUP_USB_PHY
+        select SAMSUNG_DEV_TS
         help
           Machine support for the Samsung SMDK6410
 
@@ -198,13 +198,13 @@ endchoice
 config SMDK6410_WM1190_EV1
         bool "Support Wolfson Microelectronics 1190-EV1 PMIC card"
         depends on MACH_SMDK6410
-        select REGULATOR
-        select REGULATOR_WM8350
-        select SAMSUNG_GPIO_EXTRA64
-        select MFD_WM8350_I2C
         select MFD_WM8350_CONFIG_MODE_0
         select MFD_WM8350_CONFIG_MODE_3
+        select MFD_WM8350_I2C
         select MFD_WM8352_CONFIG_MODE_0
+        select REGULATOR
+        select REGULATOR_WM8350
+        select SAMSUNG_GPIO_EXTRA64
         help
           The Wolfson Microelectronics 1190-EV1 is a WM835x based PMIC
           and audio daughtercard for the Samsung SMDK6410 reference
@@ -216,11 +216,11 @@ config SMDK6410_WM1190_EV1
 config SMDK6410_WM1192_EV1
         bool "Support Wolfson Microelectronics 1192-EV1 PMIC card"
         depends on MACH_SMDK6410
+        select MFD_WM831X
+        select MFD_WM831X_I2C
         select REGULATOR
         select REGULATOR_WM831X
         select SAMSUNG_GPIO_EXTRA64
-        select MFD_WM831X
-        select MFD_WM831X_I2C
         help
           The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC
           daughtercard for the Samsung SMDK6410 reference platform.
@@ -232,19 +232,19 @@ config SMDK6410_WM1192_EV1
 config MACH_NCP
         bool "NCP"
         select CPU_S3C6410
-        select S3C_DEV_I2C1
-        select S3C_DEV_HSMMC1
         select S3C64XX_SETUP_I2C1
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_I2C1
         help
           Machine support for the Samsung NCP
 
 config MACH_HMT
         bool "Airgoo HMT"
         select CPU_S3C6410
+        select S3C64XX_SETUP_FB_24BPP
         select S3C_DEV_FB
         select S3C_DEV_NAND
         select S3C_DEV_USB_HOST
-        select S3C64XX_SETUP_FB_24BPP
         select SAMSUNG_DEV_PWM
         help
           Machine support for the Airgoo HMT
@@ -252,17 +252,17 @@ config MACH_HMT
 config MACH_SMARTQ
         bool
         select CPU_S3C6410
+        select S3C64XX_SETUP_FB_24BPP
+        select S3C64XX_SETUP_SDHCI
+        select S3C64XX_SETUP_USB_PHY
+        select S3C_DEV_FB
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
-        select S3C_DEV_FB
         select S3C_DEV_HWMON
         select S3C_DEV_RTC
-        select S3C_DEV_USB_HSOTG
         select S3C_DEV_USB_HOST
-        select S3C64XX_SETUP_SDHCI
-        select S3C64XX_SETUP_FB_24BPP
-        select S3C64XX_SETUP_USB_PHY
+        select S3C_DEV_USB_HSOTG
         select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_PWM
         select SAMSUNG_DEV_TS
@@ -284,26 +284,26 @@ config MACH_SMARTQ7
 config MACH_WLF_CRAGG_6410
         bool "Wolfson Cragganmore 6410"
         select CPU_S3C6410
-        select S3C64XX_SETUP_SDHCI
+        select I2C
+        select LEDS_GPIO_REGISTER
+        select S3C64XX_DEV_SPI0
+        select S3C64XX_SETUP_FB_24BPP
         select S3C64XX_SETUP_I2C1
         select S3C64XX_SETUP_IDE
-        select S3C64XX_SETUP_FB_24BPP
         select S3C64XX_SETUP_KEYPAD
+        select S3C64XX_SETUP_SDHCI
         select S3C64XX_SETUP_SPI
         select S3C64XX_SETUP_USB_PHY
-        select SAMSUNG_DEV_ADC
-        select SAMSUNG_DEV_KEYPAD
-        select S3C_DEV_USB_HOST
-        select S3C_DEV_USB_HSOTG
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
         select S3C_DEV_I2C1
-        select S3C_DEV_WDT
         select S3C_DEV_RTC
-        select S3C64XX_DEV_SPI0
+        select S3C_DEV_USB_HOST
+        select S3C_DEV_USB_HSOTG
+        select S3C_DEV_WDT
+        select SAMSUNG_DEV_ADC
+        select SAMSUNG_DEV_KEYPAD
         select SAMSUNG_GPIO_EXTRA128
-        select I2C
-        select LEDS_GPIO_REGISTER
         help
           Machine support for the Wolfson Cragganmore S3C6410 variant.
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
index c87f6108eeb1..e8742cb7ddd9 100644
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ b/arch/arm/mach-s5p64x0/Kconfig
@@ -9,18 +9,18 @@ if ARCH_S5P64X0
 
 config CPU_S5P6440
         bool
-        select SAMSUNG_DMADEV
         select S5P_HRT
         select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
         select SAMSUNG_WAKEMASK if PM
         help
           Enable S5P6440 CPU support
 
 config CPU_S5P6450
         bool
-        select SAMSUNG_DMADEV
         select S5P_HRT
         select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
         select SAMSUNG_WAKEMASK if PM
         help
           Enable S5P6450 CPU support
@@ -52,19 +52,19 @@ config MACH_SMDK6440
         bool "SMDK6440"
         select CPU_S5P6440
         select S3C_DEV_FB
-        select S3C_DEV_I2C1
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
+        select S3C_DEV_I2C1
+        select S3C_DEV_RTC
+        select S3C_DEV_WDT
+        select S5P64X0_SETUP_FB_24BPP
+        select S5P64X0_SETUP_I2C1
+        select S5P64X0_SETUP_SDHCI_GPIO
         select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_BACKLIGHT
         select SAMSUNG_DEV_PWM
         select SAMSUNG_DEV_TS
-        select S5P64X0_SETUP_FB_24BPP
-        select S5P64X0_SETUP_I2C1
-        select S5P64X0_SETUP_SDHCI_GPIO
         help
           Machine support for the Samsung SMDK6440
 
@@ -72,19 +72,19 @@ config MACH_SMDK6450
         bool "SMDK6450"
         select CPU_S5P6450
         select S3C_DEV_FB
-        select S3C_DEV_I2C1
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
+        select S3C_DEV_I2C1
+        select S3C_DEV_RTC
+        select S3C_DEV_WDT
+        select S5P64X0_SETUP_FB_24BPP
+        select S5P64X0_SETUP_I2C1
+        select S5P64X0_SETUP_SDHCI_GPIO
         select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_BACKLIGHT
         select SAMSUNG_DEV_PWM
         select SAMSUNG_DEV_TS
-        select S5P64X0_SETUP_FB_24BPP
-        select S5P64X0_SETUP_I2C1
-        select S5P64X0_SETUP_SDHCI_GPIO
         help
           Machine support for the Samsung SMDK6450
 
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
index 75a26eaf2633..15170be97a74 100644
--- a/arch/arm/mach-s5pc100/Kconfig
+++ b/arch/arm/mach-s5pc100/Kconfig
@@ -60,12 +60,6 @@ config MACH_SMDKC100
         select S3C_DEV_I2C1
         select S3C_DEV_RTC
         select S3C_DEV_WDT
-        select SAMSUNG_DEV_ADC
-        select SAMSUNG_DEV_BACKLIGHT
-        select SAMSUNG_DEV_IDE
-        select SAMSUNG_DEV_KEYPAD
-        select SAMSUNG_DEV_PWM
-        select SAMSUNG_DEV_TS
         select S5PC100_SETUP_FB_24BPP
         select S5PC100_SETUP_I2C1
         select S5PC100_SETUP_IDE
@@ -74,6 +68,12 @@ config MACH_SMDKC100
         select S5P_DEV_FIMC0
         select S5P_DEV_FIMC1
         select S5P_DEV_FIMC2
+        select SAMSUNG_DEV_ADC
+        select SAMSUNG_DEV_BACKLIGHT
+        select SAMSUNG_DEV_IDE
+        select SAMSUNG_DEV_KEYPAD
+        select SAMSUNG_DEV_PWM
+        select SAMSUNG_DEV_TS
         help
           Machine support for the Samsung SMDKC100
 
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 77185c38188b..92ad72f0ef98 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -11,11 +11,11 @@ if ARCH_S5PV210
 
 config CPU_S5PV210
         bool
-        select SAMSUNG_DMADEV
         select S5P_EXT_INT
         select S5P_HRT
         select S5P_PM if PM
         select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
         help
           Enable S5PV210 CPU support
 
@@ -76,44 +76,44 @@ config MACH_AQUILA
         bool "Aquila"
         select CPU_S5PV210
         select S3C_DEV_FB
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
-        select S5P_DEV_ONENAND
         select S5PV210_SETUP_FB_24BPP
         select S5PV210_SETUP_SDHCI
         select S5PV210_SETUP_USB_PHY
+        select S5P_DEV_FIMC0
+        select S5P_DEV_FIMC1
+        select S5P_DEV_FIMC2
+        select S5P_DEV_ONENAND
         help
           Machine support for the Samsung Aquila target based on S5PC110 SoC
 
 config MACH_GONI
         bool "GONI"
         select CPU_S5PV210
-        select S5P_GPIO_INT
         select S3C_DEV_FB
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
         select S3C_DEV_I2C1
         select S3C_DEV_I2C2
-        select S5P_DEV_MFC
         select S3C_DEV_USB_HSOTG
-        select S5P_DEV_ONENAND
-        select SAMSUNG_DEV_KEYPAD
-        select S5P_DEV_TV
         select S5PV210_SETUP_FB_24BPP
+        select S5PV210_SETUP_FIMC
         select S5PV210_SETUP_I2C1
         select S5PV210_SETUP_I2C2
         select S5PV210_SETUP_KEYPAD
         select S5PV210_SETUP_SDHCI
-        select S5PV210_SETUP_FIMC
         select S5PV210_SETUP_USB_PHY
+        select S5P_DEV_FIMC0
+        select S5P_DEV_FIMC1
+        select S5P_DEV_FIMC2
+        select S5P_DEV_MFC
+        select S5P_DEV_ONENAND
+        select S5P_DEV_TV
+        select S5P_GPIO_INT
+        select SAMSUNG_DEV_KEYPAD
         help
           Machine support for Samsung GONI board
           S5PC110(MCP) is one of package option of S5PV210
@@ -125,14 +125,14 @@ config MACH_SMDKC110
         select S3C_DEV_I2C2
         select S3C_DEV_RTC
         select S3C_DEV_WDT
+        select S5PV210_SETUP_I2C1
+        select S5PV210_SETUP_I2C2
+        select S5PV210_SETUP_IDE
         select S5P_DEV_FIMC0
         select S5P_DEV_FIMC1
         select S5P_DEV_FIMC2
         select S5P_DEV_MFC
         select SAMSUNG_DEV_IDE
-        select S5PV210_SETUP_I2C1
-        select S5PV210_SETUP_I2C2
-        select S5PV210_SETUP_IDE
         help
           Machine support for Samsung SMDKC110
           S5PC110(MCP) is one of package option of S5PV210
@@ -154,6 +154,13 @@ config MACH_SMDKV210
         select S3C_DEV_RTC
         select S3C_DEV_USB_HSOTG
         select S3C_DEV_WDT
+        select S5PV210_SETUP_FB_24BPP
+        select S5PV210_SETUP_I2C1
+        select S5PV210_SETUP_I2C2
+        select S5PV210_SETUP_IDE
+        select S5PV210_SETUP_KEYPAD
+        select S5PV210_SETUP_SDHCI
+        select S5PV210_SETUP_USB_PHY
         select S5P_DEV_FIMC0
         select S5P_DEV_FIMC1
         select S5P_DEV_FIMC2
@@ -165,20 +172,13 @@ config MACH_SMDKV210
         select SAMSUNG_DEV_KEYPAD
         select SAMSUNG_DEV_PWM
         select SAMSUNG_DEV_TS
-        select S5PV210_SETUP_FB_24BPP
-        select S5PV210_SETUP_I2C1
-        select S5PV210_SETUP_I2C2
-        select S5PV210_SETUP_IDE
-        select S5PV210_SETUP_KEYPAD
-        select S5PV210_SETUP_SDHCI
-        select S5PV210_SETUP_USB_PHY
         help
           Machine support for Samsung SMDKV210
 
 config MACH_TORBRECK
         bool "Torbreck"
-        select CPU_S5PV210
         select ARCH_SPARSEMEM_ENABLE
+        select CPU_S5PV210
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index 42625e4d949a..ca14dbdcfb22 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -49,15 +49,15 @@ config SA1100_COLLIE
         bool "Sharp Zaurus SL5500"
         # FIXME: select CPU_FREQ_SA11x0
         select SHARP_LOCOMO
-        select SHARP_SCOOP
         select SHARP_PARAM
+        select SHARP_SCOOP
         help
           Say Y here to support the Sharp Zaurus SL5500 PDAs.
 
 config SA1100_H3100
         bool "Compaq iPAQ H3100"
-        select HTC_EGPIO
         select CPU_FREQ_SA1110
+        select HTC_EGPIO
         help
           Say Y here if you intend to run this kernel on the Compaq iPAQ
           H3100 handheld computer.  Information about this machine and the
@@ -67,8 +67,8 @@ config SA1100_H3100
 
 config SA1100_H3600
         bool "Compaq iPAQ H3600/H3700"
-        select HTC_EGPIO
         select CPU_FREQ_SA1110
+        select HTC_EGPIO
         help
           Say Y here if you intend to run this kernel on the Compaq iPAQ
           H3600 handheld computer.  Information about this machine and the
@@ -78,16 +78,16 @@ config SA1100_H3600
 
 config SA1100_BADGE4
         bool "HP Labs BadgePAD 4"
-        select SA1111
         select CPU_FREQ_SA1100
+        select SA1111
         help
           Say Y here if you want to build a kernel for the HP Laboratories
           BadgePAD 4.
 
 config SA1100_JORNADA720
         bool "HP Jornada 720"
-        select SA1111
         # FIXME: select CPU_FREQ_SA11x0
+        select SA1111
         help
           Say Y here if you want to build a kernel for the HP Jornada 720
           handheld computer.  See 
@@ -95,8 +95,8 @@ config SA1100_JORNADA720
 
 config SA1100_JORNADA720_SSP
         bool "HP Jornada 720 Extended SSP driver"
-        select SA1100_SSP
         depends on SA1100_JORNADA720
+        select SA1100_SSP
         help
           Say Y here if you have a HP Jornada 7xx handheld computer and you
           want to access devices connected to the MCU. Those include the
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 4cacc2d22fbe..8ae100cc655c 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -4,49 +4,49 @@ comment "SH-Mobile System Type"
 
 config ARCH_SH7367
         bool "SH-Mobile G3 (SH7367)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         select CPU_V6
         select SH_CLK_CPG
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_SH7377
         bool "SH-Mobile G4 (SH7377)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         select CPU_V7
         select SH_CLK_CPG
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_SH7372
         bool "SH-Mobile AP4 (SH7372)"
-        select CPU_V7
-        select SH_CLK_CPG
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_CPU_SUSPEND if PM || CPU_IDLE
+        select CPU_V7
+        select SH_CLK_CPG
 
 config ARCH_SH73A0
         bool "SH-Mobile AG5 (R8A73A00)"
-        select CPU_V7
-        select SH_CLK_CPG
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
+        select CPU_V7
         select I2C
+        select SH_CLK_CPG
 
 config ARCH_R8A7740
         bool "R-Mobile A1 (R8A77400)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         select CPU_V7
         select SH_CLK_CPG
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_R8A7779
         bool "R-Car H1 (R8A77790)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARM_GIC
         select CPU_V7
         select SH_CLK_CPG
-        select ARM_GIC
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_EMEV2
         bool "Emma Mobile EV2"
-        select CPU_V7
-        select ARM_GIC
         select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARM_GIC
+        select CPU_V7
 
 comment "SH-Mobile Board Type"
 
@@ -65,9 +65,9 @@ config MACH_AP4EVB
         bool "AP4EVB board"
         depends on ARCH_SH7372
         select ARCH_REQUIRE_GPIOLIB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select SH_LCD_MIPI_DSI
         select SND_SOC_AK4642 if SND_SIMPLE_CARD
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 choice
         prompt "AP4EVB LCD panel selection"
@@ -84,37 +84,37 @@ endchoice
 
 config MACH_AG5EVM
         bool "AG5EVM board"
+        depends on ARCH_SH73A0
         select ARCH_REQUIRE_GPIOLIB
-        select SH_LCD_MIPI_DSI
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        depends on ARCH_SH73A0
+        select SH_LCD_MIPI_DSI
 
 config MACH_MACKEREL
         bool "mackerel board"
         depends on ARCH_SH7372
         select ARCH_REQUIRE_GPIOLIB
-        select SND_SOC_AK4642 if SND_SIMPLE_CARD
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
 config MACH_KOTA2
         bool "KOTA2 board"
+        depends on ARCH_SH73A0
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        depends on ARCH_SH73A0
 
 config MACH_BONITO
         bool "bonito board"
+        depends on ARCH_R8A7740
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        depends on ARCH_R8A7740
 
 config MACH_ARMADILLO800EVA
         bool "Armadillo-800 EVA board"
         depends on ARCH_R8A7740
         select ARCH_REQUIRE_GPIOLIB
-        select USE_OF
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select SND_SOC_WM8978 if SND_SIMPLE_CARD
+        select USE_OF
 
 config MACH_MARZEN
         bool "MARZEN board"
@@ -125,16 +125,16 @@ config MACH_MARZEN
 config MACH_KZM9D
         bool "KZM9D board"
         depends on ARCH_EMEV2
-        select USE_OF
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select USE_OF
 
 config MACH_KZM9G
         bool "KZM-A9-GT board"
         depends on ARCH_SH73A0
         select ARCH_REQUIRE_GPIOLIB
-        select USE_OF
-        select SND_SOC_AK4642 if SND_SIMPLE_CARD
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SND_SOC_AK4642 if SND_SIMPLE_CARD
+        select USE_OF
 
 comment "SH-Mobile System Configuration"
 
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 11680c532b38..9ff6f6ea3617 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -4,42 +4,42 @@ comment "NVIDIA Tegra options"
 
 config ARCH_TEGRA_2x_SOC
         bool "Enable support for Tegra20 family"
-        select CPU_V7
-        select ARM_GIC
         select ARCH_REQUIRE_GPIOLIB
-        select PINCTRL
-        select PINCTRL_TEGRA20
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select USB_ULPI if USB
-        select USB_ULPI_VIEWPORT if USB_SUPPORT
         select ARM_ERRATA_720789
         select ARM_ERRATA_742230
         select ARM_ERRATA_751472
         select ARM_ERRATA_754327
         select ARM_ERRATA_764369 if SMP
+        select ARM_GIC
+        select CPU_FREQ_TABLE if CPU_FREQ
+        select CPU_V7
+        select PINCTRL
+        select PINCTRL_TEGRA20
         select PL310_ERRATA_727915 if CACHE_L2X0
         select PL310_ERRATA_769419 if CACHE_L2X0
-        select CPU_FREQ_TABLE if CPU_FREQ
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
+        select USB_ULPI if USB
+        select USB_ULPI_VIEWPORT if USB_SUPPORT
         help
           Support for NVIDIA Tegra AP20 and T20 processors, based on the
           ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
 
 config ARCH_TEGRA_3x_SOC
         bool "Enable support for Tegra30 family"
-        select CPU_V7
-        select ARM_GIC
         select ARCH_REQUIRE_GPIOLIB
-        select PINCTRL
-        select PINCTRL_TEGRA30
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select USB_ULPI if USB
-        select USB_ULPI_VIEWPORT if USB_SUPPORT
         select ARM_ERRATA_743622
         select ARM_ERRATA_751472
         select ARM_ERRATA_754322
         select ARM_ERRATA_764369 if SMP
-        select PL310_ERRATA_769419 if CACHE_L2X0
+        select ARM_GIC
         select CPU_FREQ_TABLE if CPU_FREQ
+        select CPU_V7
+        select PINCTRL
+        select PINCTRL_TEGRA30
+        select PL310_ERRATA_769419 if CACHE_L2X0
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
+        select USB_ULPI if USB
+        select USB_ULPI_VIEWPORT if USB_SUPPORT
         help
           Support for NVIDIA Tegra T30 processor family, based on the
           ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index f7e12ede008c..1f597647d431 100644
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -7,8 +7,8 @@ comment "ST-Ericsson Mobile Platform Products"
 config MACH_U300
         bool "U300"
         select PINCTRL
-        select PINCTRL_U300
         select PINCTRL_COH901
+        select PINCTRL_U300
 
 comment "ST-Ericsson U300/U335 Feature Selections"
 
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 5848206ee9b9..e8c3f0d70ca6 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -3,33 +3,33 @@ if ARCH_U8500
 config UX500_SOC_COMMON
         bool
         default y
-        select ARM_GIC
-        select HAS_MTU
-        select PL310_ERRATA_753970 if CACHE_PL310
         select ARM_ERRATA_754322
         select ARM_ERRATA_764369 if SMP
+        select ARM_GIC
         select CACHE_L2X0
+        select COMMON_CLK
+        select HAS_MTU
         select PINCTRL
         select PINCTRL_NOMADIK
-        select COMMON_CLK
+        select PL310_ERRATA_753970 if CACHE_PL310
 
 config UX500_SOC_DB8500
         bool
+        select CPU_FREQ_TABLE if CPU_FREQ
         select MFD_DB8500_PRCMU
+        select PINCTRL_DB8500
         select REGULATOR
         select REGULATOR_DB8500_PRCMU
-        select CPU_FREQ_TABLE if CPU_FREQ
-        select PINCTRL_DB8500
 
 menu "Ux500 target platform (boards)"
 
 config MACH_MOP500
         bool "U8500 Development platform, MOP500 versions"
-        select UX500_SOC_DB8500
         select I2C
         select I2C_NOMADIK
-        select SOC_BUS
         select REGULATOR_FIXED_VOLTAGE
+        select SOC_BUS
+        select UX500_SOC_DB8500
         help
           Include support for the MOP500 development platform.
 
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index c1f38f6625b2..63d8e9f81b99 100644
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -3,9 +3,9 @@ menu "Versatile platform type"
 
 config ARCH_VERSATILE_PB
         bool "Support Versatile Platform Baseboard for ARM926EJ-S"
+        default y
         select CPU_ARM926T
         select MIGHT_HAVE_PCI
-        default y
         help
           Include support for the ARM(R) Versatile Platform Baseboard
           for the ARM926EJ-S.
@@ -19,8 +19,8 @@ config MACH_VERSATILE_AB
 
 config MACH_VERSATILE_DT
         bool "Support Versatile platform from device tree"
-        select USE_OF
         select CPU_ARM926T
+        select USE_OF
         help
           Include support for the ARM(R) Versatile/PB platform,
           using the device tree for discovery
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index c9a4963b5c3d..94186b6c685f 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -10,8 +10,8 @@ config CPU_ARM7TDMI
         depends on !MMU
         select CPU_32v4T
         select CPU_ABRT_LV4T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4
+        select CPU_PABRT_LEGACY
         help
           A 32-bit RISC microprocessor based on the ARM7 processor core
           which has no memory control unit and cache.
@@ -24,11 +24,11 @@ config CPU_ARM720T
         bool "Support ARM720T processor" if ARCH_INTEGRATOR
         select CPU_32v4T
         select CPU_ABRT_LV4T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WT if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WT if MMU
         help
           A 32-bit RISC processor with 8kByte Cache, Write Buffer and
@@ -43,9 +43,9 @@ config CPU_ARM740T
         depends on !MMU
         select CPU_32v4T
         select CPU_ABRT_LV4T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V3     # although the core is v4t
         select CPU_CP15_MPU
+        select CPU_PABRT_LEGACY
         help
           A 32-bit RISC processor with 8KB cache or 4KB variants,
           write buffer and MPU(Protection Unit) built around
@@ -60,8 +60,8 @@ config CPU_ARM9TDMI
         depends on !MMU
         select CPU_32v4T
         select CPU_ABRT_NOMMU
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4
+        select CPU_PABRT_LEGACY
         help
           A 32-bit RISC microprocessor based on the ARM9 processor core
           which has no memory control unit and cache.
@@ -74,11 +74,11 @@ config CPU_ARM920T
         bool "Support ARM920T processor" if ARCH_INTEGRATOR
         select CPU_32v4T
         select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
         help
           The ARM920T is licensed to be produced by numerous vendors,
@@ -92,11 +92,11 @@ config CPU_ARM922T
         bool "Support ARM922T processor" if ARCH_INTEGRATOR
         select CPU_32v4T
         select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
         help
           The ARM922T is a version of the ARM920T, but with smaller
@@ -111,11 +111,11 @@ config CPU_ARM925T
         bool "Support ARM925T processor" if ARCH_OMAP1
         select CPU_32v4T
         select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
         help
           The ARM925T is a mix between the ARM920T and ARM926T, but with
@@ -130,10 +130,10 @@ config CPU_ARM926T
         bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
         select CPU_32v5
         select CPU_ABRT_EV5TJ
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
         help
           This is a variant of the ARM920.  It has slightly different
@@ -148,11 +148,11 @@ config CPU_FA526
         bool
         select CPU_32v4
         select CPU_ABRT_EV4
-        select CPU_PABRT_LEGACY
-        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_CACHE_FA
+        select CPU_CACHE_VIVT
         select CPU_COPY_FA if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_FA if MMU
         help
           The FA526 is a version of the ARMv4 compatible processor with
@@ -167,9 +167,9 @@ config CPU_ARM940T
         depends on !MMU
         select CPU_32v4T
         select CPU_ABRT_NOMMU
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_VIVT
         select CPU_CP15_MPU
+        select CPU_PABRT_LEGACY
         help
           ARM940T is a member of the ARM9TDMI family of general-
           purpose microprocessors with MPU and separate 4KB
@@ -185,9 +185,9 @@ config CPU_ARM946E
         depends on !MMU
         select CPU_32v5
         select CPU_ABRT_NOMMU
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_VIVT
         select CPU_CP15_MPU
+        select CPU_PABRT_LEGACY
         help
           ARM946E-S is a member of the ARM9E-S family of high-
           performance, 32-bit system-on-chip processor solutions.
@@ -201,11 +201,11 @@ config CPU_ARM1020
         bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR
         select CPU_32v5
         select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
         help
           The ARM1020 is the 32K cached version of the ARM10 processor,
@@ -217,25 +217,25 @@ config CPU_ARM1020
 # ARM1020E - needs validating
 config CPU_ARM1020E
         bool "Support ARM1020E processor" if ARCH_INTEGRATOR
+        depends on n
         select CPU_32v5
         select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4WT
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
-        depends on n
 
 # ARM1022E
 config CPU_ARM1022
         bool "Support ARM1022E processor" if ARCH_INTEGRATOR
         select CPU_32v5
         select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WB if MMU # can probably do better
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
         help
           The ARM1022E is an implementation of the ARMv5TE architecture
@@ -250,10 +250,10 @@ config CPU_ARM1026
         bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR
         select CPU_32v5
         select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WB if MMU # can probably do better
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
         help
           The ARM1026EJ-S is an implementation of the ARMv5TEJ architecture
@@ -268,11 +268,11 @@ config CPU_SA110
         select CPU_32v3 if ARCH_RPC
         select CPU_32v4 if !ARCH_RPC
         select CPU_ABRT_EV4
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4WB
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WB if MMU
         help
           The Intel StrongARM(R) SA-110 is a 32-bit microprocessor and
@@ -288,10 +288,10 @@ config CPU_SA1100
         bool
         select CPU_32v4
         select CPU_ABRT_EV4
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_V4WB
         select CPU_CACHE_VIVT
         select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WB if MMU
 
 # XScale
@@ -299,9 +299,9 @@ config CPU_XSCALE
         bool
         select CPU_32v5
         select CPU_ABRT_EV5T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_VIVT
         select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
 
 # XScale Core Version 3
@@ -309,9 +309,9 @@ config CPU_XSC3
         bool
         select CPU_32v5
         select CPU_ABRT_EV5T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_VIVT
         select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
         select IO_36
 
@@ -320,21 +320,21 @@ config CPU_MOHAWK
         bool
         select CPU_32v5
         select CPU_ABRT_EV5T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_VIVT
+        select CPU_COPY_V4WB if MMU
         select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_V4WBI if MMU
-        select CPU_COPY_V4WB if MMU
 
 # Feroceon
 config CPU_FEROCEON
         bool
         select CPU_32v5
         select CPU_ABRT_EV5T
-        select CPU_PABRT_LEGACY
         select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
         select CPU_COPY_FEROCEON if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
         select CPU_TLB_FEROCEON if MMU
 
 config CPU_FEROCEON_OLD_ID
@@ -349,20 +349,20 @@ config CPU_FEROCEON_OLD_ID
 # Marvell PJ4
 config CPU_PJ4
         bool
-        select CPU_V7
         select ARM_THUMBEE
+        select CPU_V7
 
 # ARMv6
 config CPU_V6
         bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
         select CPU_32v6
         select CPU_ABRT_EV6
-        select CPU_PABRT_V6
         select CPU_CACHE_V6
         select CPU_CACHE_VIPT
+        select CPU_COPY_V6 if MMU
         select CPU_CP15_MMU
         select CPU_HAS_ASID if MMU
-        select CPU_COPY_V6 if MMU
+        select CPU_PABRT_V6
         select CPU_TLB_V6 if MMU
 
 # ARMv6k
@@ -371,12 +371,12 @@ config CPU_V6K
         select CPU_32v6
         select CPU_32v6K
         select CPU_ABRT_EV6
-        select CPU_PABRT_V6
         select CPU_CACHE_V6
         select CPU_CACHE_VIPT
+        select CPU_COPY_V6 if MMU
         select CPU_CP15_MMU
         select CPU_HAS_ASID if MMU
-        select CPU_COPY_V6 if MMU
+        select CPU_PABRT_V6
         select CPU_TLB_V6 if MMU
 
 # ARMv7
@@ -385,44 +385,44 @@ config CPU_V7
         select CPU_32v6K
         select CPU_32v7
         select CPU_ABRT_EV7
-        select CPU_PABRT_V7
         select CPU_CACHE_V7
         select CPU_CACHE_VIPT
+        select CPU_COPY_V6 if MMU
         select CPU_CP15_MMU
         select CPU_HAS_ASID if MMU
-        select CPU_COPY_V6 if MMU
+        select CPU_PABRT_V7
         select CPU_TLB_V7 if MMU
 
 # Figure out what processor architecture version we should be using.
 # This defines the compiler instruction set which depends on the machine type.
 config CPU_32v3
         bool
-        select TLS_REG_EMUL if SMP || !MMU
-        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
         select CPU_USE_DOMAINS if MMU
+        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
+        select TLS_REG_EMUL if SMP || !MMU
 
 config CPU_32v4
         bool
-        select TLS_REG_EMUL if SMP || !MMU
-        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
         select CPU_USE_DOMAINS if MMU
+        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
+        select TLS_REG_EMUL if SMP || !MMU
 
 config CPU_32v4T
         bool
-        select TLS_REG_EMUL if SMP || !MMU
-        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
         select CPU_USE_DOMAINS if MMU
+        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
+        select TLS_REG_EMUL if SMP || !MMU
 
 config CPU_32v5
         bool
-        select TLS_REG_EMUL if SMP || !MMU
-        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
         select CPU_USE_DOMAINS if MMU
+        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
+        select TLS_REG_EMUL if SMP || !MMU
 
 config CPU_32v6
         bool
-        select TLS_REG_EMUL if !CPU_32v6K && !MMU
         select CPU_USE_DOMAINS if CPU_V6 && MMU
+        select TLS_REG_EMUL if !CPU_32v6K && !MMU
 
 config CPU_32v6K
         bool
@@ -644,8 +644,8 @@ config ARM_VIRT_EXT
 config SWP_EMULATE
         bool "Emulate SWP/SWPB instructions"
         depends on !CPU_USE_DOMAINS && CPU_V7
-        select HAVE_PROC_CPU if PROC_FS
         default y if SMP
+        select HAVE_PROC_CPU if PROC_FS
         help
           ARMv6 architecture deprecates use of the SWP/SWPB instructions.
           ARMv7 multiprocessing extensions introduce the ability to disable
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index baf9064c0844..88e1e2e7a20d 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -10,16 +10,16 @@ choice
 
 config ARCH_IMX_V4_V5
         bool "i.MX1, i.MX21, i.MX25, i.MX27"
-        select AUTO_ZRELADDR if !ZBOOT_ROM
         select ARM_PATCH_PHYS_VIRT
+        select AUTO_ZRELADDR if !ZBOOT_ROM
         help
           This enables support for systems based on the Freescale i.MX ARMv4
           and ARMv5 SoCs
 
 config ARCH_IMX_V6_V7
         bool "i.MX3, i.MX5, i.MX6"
-        select AUTO_ZRELADDR if !ZBOOT_ROM
         select ARM_PATCH_PHYS_VIRT
+        select AUTO_ZRELADDR if !ZBOOT_ROM
         select MIGHT_HAVE_CACHE_L2X0
         help
           This enables support for systems based on the Freescale i.MX3, i.MX5
diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig
index 6b46cee2f9cd..a35d9841f494 100644
--- a/arch/arm/plat-mxc/devices/Kconfig
+++ b/arch/arm/plat-mxc/devices/Kconfig
@@ -3,8 +3,8 @@ config IMX_HAVE_PLATFORM_FEC
         default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX50 || SOC_IMX51 || SOC_IMX53
 
 config IMX_HAVE_PLATFORM_FLEXCAN
-        select HAVE_CAN_FLEXCAN if CAN
         bool
+        select HAVE_CAN_FLEXCAN if CAN
 
 config IMX_HAVE_PLATFORM_FSL_USB2_UDC
         bool
diff --git a/arch/arm/plat-nomadik/Kconfig b/arch/arm/plat-nomadik/Kconfig
index 4c48c8b60b54..19f55cae5d73 100644
--- a/arch/arm/plat-nomadik/Kconfig
+++ b/arch/arm/plat-nomadik/Kconfig
@@ -5,8 +5,8 @@
 config PLAT_NOMADIK
         bool
         depends on ARCH_NOMADIK || ARCH_U8500
-        select CLKSRC_MMIO
         default y
+        select CLKSRC_MMIO
         help
           Common platform code for Nomadik and other ST-Ericsson
           platforms.
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index c9d1c3603bbf..7cd56ed5cd94 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -14,10 +14,10 @@ config ARCH_OMAP1
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
         select GENERIC_IRQ_CHIP
-        select IRQ_DOMAIN
         select HAVE_IDE
-        select NEED_MACH_MEMORY_H
+        select IRQ_DOMAIN
         select NEED_MACH_IO_H if PCCARD
+        select NEED_MACH_MEMORY_H
         help
           "Systems based on omap7xx, omap15xx or omap16xx"
 
@@ -25,10 +25,10 @@ config ARCH_OMAP2PLUS
         bool "TI OMAP2/3/4"
         select CLKDEV_LOOKUP
         select GENERIC_IRQ_CHIP
-        select SPARSE_IRQ
         select OMAP_DM_TIMER
-        select USE_OF
         select PROC_DEVICETREE if PROC_FS
+        select SPARSE_IRQ
+        select USE_OF
         help
           "Systems based on OMAP2, OMAP3, OMAP4 or OMAP5"
 
@@ -43,8 +43,8 @@ config OMAP_DEBUG_DEVICES
 
 config OMAP_DEBUG_LEDS
         def_bool y if NEW_LEDS
-        select LEDS_CLASS
         depends on OMAP_DEBUG_DEVICES
+        select LEDS_CLASS
 
 config POWER_AVS_OMAP
         bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2"
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index 21bf6adb9198..eef3b6a2f8a8 100644
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -6,8 +6,8 @@ config PLAT_S3C24XX
         bool
         depends on ARCH_S3C24XX
         default y
-        select NO_IOPORT
         select ARCH_REQUIRE_GPIOLIB
+        select NO_IOPORT
         select S3C_DEV_NAND
         help
           Base platform code for any Samsung S3C24XX device
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 9c3b90c3538e..59401e1cc530 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -7,9 +7,9 @@
 config PLAT_SAMSUNG
         bool
         depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P
-        select NO_IOPORT
-        select GENERIC_IRQ_CHIP
         default y
+        select GENERIC_IRQ_CHIP
+        select NO_IOPORT
         help
           Base platform code for all Samsung SoC based systems
 
@@ -17,16 +17,16 @@ config PLAT_S5P
         bool
         depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
         default y
-        select ARM_VIC if !ARCH_EXYNOS
+        select ARCH_REQUIRE_GPIOLIB
         select ARM_GIC if ARCH_EXYNOS
+        select ARM_VIC if !ARCH_EXYNOS
         select GIC_NON_BANKED if ARCH_EXYNOS4
         select NO_IOPORT
-        select ARCH_REQUIRE_GPIOLIB
+        select PLAT_SAMSUNG
         select S3C_GPIO_TRACK
         select S5P_GPIO_DRVSTR
-        select SAMSUNG_GPIOLIB_4BIT
-        select PLAT_SAMSUNG
         select SAMSUNG_CLKSRC
+        select SAMSUNG_GPIOLIB_4BIT
         select SAMSUNG_IRQ_VIC_TIMER
         help
           Base platform code for Samsung's S5P series SoC.
@@ -423,10 +423,10 @@ config S3C_DMA
 
 config SAMSUNG_DMADEV
         bool
+        select ARM_AMBA
         select DMADEVICES
         select PL330_DMA if (ARCH_EXYNOS5 || ARCH_EXYNOS4 || CPU_S5PV210 || CPU_S5PC100 || \
                                         CPU_S5P6450 || CPU_S5P6440)
-        select ARM_AMBA
         help
           Use DMA device engine for PL330 DMAC.
 
diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig
index 4404f82d5979..f8db7b2deb36 100644
--- a/arch/arm/plat-spear/Kconfig
+++ b/arch/arm/plat-spear/Kconfig
@@ -12,10 +12,10 @@ config ARCH_SPEAR13XX
         bool "ST SPEAr13xx with Device Tree"
         select ARM_GIC
         select CPU_V7
-        select USE_OF
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
         select PINCTRL
+        select USE_OF
         help
           Supports for ARM's SPEAR13XX family
 
@@ -23,8 +23,8 @@ config ARCH_SPEAR3XX
         bool "ST SPEAr3xx with Device Tree"
         select ARM_VIC
         select CPU_ARM926T
-        select USE_OF
         select PINCTRL
+        select USE_OF
         help
           Supports for ARM's SPEAR3XX family
 
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 5ade51c8a87f..06e73bf665e9 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -15,6 +15,8 @@ config AVR32
         select ARCH_WANT_IPC_PARSE_VERSION
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select GENERIC_CLOCKEVENTS
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
         help
           AVR32 is a high-performance 32-bit RISC microprocessor core,
           designed for cost-sensitive embedded applications, with particular
diff --git a/arch/avr32/include/asm/module.h b/arch/avr32/include/asm/module.h
index 451444538a1b..3f083d385a64 100644
--- a/arch/avr32/include/asm/module.h
+++ b/arch/avr32/include/asm/module.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_AVR32_MODULE_H
 #define __ASM_AVR32_MODULE_H
 
+#include <asm-generic/module.h>
+
 struct mod_arch_syminfo {
         unsigned long got_offset;
         int got_initialized;
@@ -17,10 +19,6 @@ struct mod_arch_specific {
         struct mod_arch_syminfo *syminfo;
 };
 
-#define Elf_Shdr                Elf32_Shdr
-#define Elf_Sym                 Elf32_Sym
-#define Elf_Ehdr                Elf32_Ehdr
-
 #define MODULE_PROC_FAMILY "AVR32v1"
 
 #define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index ccd9193932b2..b6f3ad5441c5 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -43,6 +43,8 @@ config BLACKFIN
         select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
         select GENERIC_SMP_IDLE_THREAD
         select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
 
 config GENERIC_CSUM
         def_bool y
diff --git a/arch/blackfin/include/asm/module.h b/arch/blackfin/include/asm/module.h
index ed5689b82c9f..231a149b3f77 100644
--- a/arch/blackfin/include/asm/module.h
+++ b/arch/blackfin/include/asm/module.h
@@ -7,9 +7,7 @@
 #ifndef _ASM_BFIN_MODULE_H
 #define _ASM_BFIN_MODULE_H
 
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
+#include <asm-generic/module.h>
 
 struct mod_arch_specific {
         Elf_Shdr        *text_l1;
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 45268b50c0c8..aee1b569ee6e 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -18,6 +18,7 @@ config C6X
         select OF_EARLY_FLATTREE
         select GENERIC_CLOCKEVENTS
         select GENERIC_KERNEL_THREAD
+        select MODULES_USE_ELF_RELA
 
 config MMU
         def_bool n
diff --git a/arch/c6x/include/asm/module.h b/arch/c6x/include/asm/module.h
index a453f9744f42..5c7269c7ef73 100644
--- a/arch/c6x/include/asm/module.h
+++ b/arch/c6x/include/asm/module.h
@@ -13,17 +13,7 @@
 #ifndef _ASM_C6X_MODULE_H
 #define _ASM_C6X_MODULE_H
 
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-#define Elf_Addr        Elf32_Addr
-#define Elf_Word        Elf32_Word
-
-/*
- * This file contains the C6x architecture specific module code.
- */
-struct mod_arch_specific {
-};
+#include <asm-generic/module.h>
 
 struct loaded_sections {
         unsigned int new_vaddr;
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index a118163b04ee..a67244473a39 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -48,6 +48,7 @@ config CRIS
         select GENERIC_IOMAP
         select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
         select GENERIC_CMOS_UPDATE
+        select MODULES_USE_ELF_RELA
 
 config HZ
         int
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index ff1bf7fcae8e..6d43a951b5ec 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -10,3 +10,4 @@ header-y += sync_serial.h
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += module.h
diff --git a/arch/cris/include/asm/module.h b/arch/cris/include/asm/module.h
deleted file mode 100644
index 7ee72311bd78..000000000000
--- a/arch/cris/include/asm/module.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _ASM_CRIS_MODULE_H
-#define _ASM_CRIS_MODULE_H
-/* cris is simple */
-struct mod_arch_specific { };
-
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-#endif /* _ASM_CRIS_MODULE_H */
diff --git a/arch/frv/include/asm/module.h b/arch/frv/include/asm/module.h
index 3d5c6360289a..a8848f09a217 100644
--- a/arch/frv/include/asm/module.h
+++ b/arch/frv/include/asm/module.h
@@ -11,13 +11,7 @@
 #ifndef _ASM_MODULE_H
 #define _ASM_MODULE_H
 
-struct mod_arch_specific
-{
-};
-
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
+#include <asm-generic/module.h>
 
 /*
  * Include the architecture version.
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 90462eb23d02..98fabd10e95f 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -7,6 +7,7 @@ config H8300
         select ARCH_WANT_IPC_PARSE_VERSION
         select GENERIC_IRQ_SHOW
         select GENERIC_CPU_DEVICES
+        select MODULES_USE_ELF_RELA
 
 config SYMBOL_PREFIX
         string
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
index fccd81eddff1..50bbf387b2f8 100644
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@ -2,3 +2,4 @@ include include/asm-generic/Kbuild.asm
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += module.h
diff --git a/arch/h8300/include/asm/module.h b/arch/h8300/include/asm/module.h
deleted file mode 100644
index 8e46724b7c09..000000000000
--- a/arch/h8300/include/asm/module.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _ASM_H8300_MODULE_H
-#define _ASM_H8300_MODULE_H
-/*
- * This file contains the H8/300 architecture specific module code.
- */
-struct mod_arch_specific { };
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-
-#endif /* _ASM_H8/300_MODULE_H */
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index b2fdfb700f50..0744f7d7b1fd 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -30,6 +30,7 @@ config HEXAGON
         select KTIME_SCALAR
         select GENERIC_CLOCKEVENTS
         select GENERIC_CLOCKEVENTS_BROADCAST
+        select MODULES_USE_ELF_RELA
         ---help---
           Qualcomm Hexagon is a processor architecture designed for high
           performance and low power across a wide variety of applications.
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 4c10e607c908..3279646120e3 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -40,6 +40,8 @@ config IA64
         select ARCH_THREAD_INFO_ALLOCATOR
         select ARCH_CLOCKSOURCE_DATA
         select GENERIC_TIME_VSYSCALL_OLD
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
         default y
         help
           The Itanium Processor Family is Intel's 64-bit successor to
diff --git a/arch/ia64/include/asm/module.h b/arch/ia64/include/asm/module.h
index 908eaef42a08..dfba22a872c3 100644
--- a/arch/ia64/include/asm/module.h
+++ b/arch/ia64/include/asm/module.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_IA64_MODULE_H
 #define _ASM_IA64_MODULE_H
 
+#include <asm-generic/module.h>
+
 /*
  * IA-64-specific support for kernel module loader.
  *
@@ -29,10 +31,6 @@ struct mod_arch_specific {
         unsigned int next_got_entry;    /* index of next available got entry */
 };
 
-#define Elf_Shdr        Elf64_Shdr
-#define Elf_Sym         Elf64_Sym
-#define Elf_Ehdr        Elf64_Ehdr
-
 #define MODULE_PROC_FAMILY      "ia64"
 #define MODULE_ARCH_VERMAGIC    MODULE_PROC_FAMILY \
         "gcc-" __stringify(__GNUC__) "." __stringify(__GNUC_MINOR__)
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index e875fc3ce9cb..f807721e19a5 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -14,6 +14,7 @@ config M32R
         select GENERIC_IRQ_SHOW
         select GENERIC_ATOMIC64
         select ARCH_USES_GETTIMEOFFSET
+        select MODULES_USE_ELF_RELA
 
 config SBUS
         bool
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index fccd81eddff1..50bbf387b2f8 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -2,3 +2,4 @@ include include/asm-generic/Kbuild.asm
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += module.h
diff --git a/arch/m32r/include/asm/module.h b/arch/m32r/include/asm/module.h
deleted file mode 100644
index eb73ee011215..000000000000
--- a/arch/m32r/include/asm/module.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_M32R_MODULE_H
-#define _ASM_M32R_MODULE_H
-
-struct mod_arch_specific { };
-
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-
-#endif /* _ASM_M32R_MODULE_H */
diff --git a/arch/m32r/kernel/module.c b/arch/m32r/kernel/module.c
index 3071fe83ffc8..38233b6596b6 100644
--- a/arch/m32r/kernel/module.c
+++ b/arch/m32r/kernel/module.c
@@ -201,18 +201,3 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
         }
         return 0;
 }
-
-int apply_relocate(Elf32_Shdr *sechdrs,
-                       const char *strtab,
-                       unsigned int symindex,
-                       unsigned int relsec,
-                       struct module *me)
-{
-#if 0
-        printk(KERN_ERR "module %s: REL RELOCATION unsupported\n",
-               me->name);
-        return -ENOEXEC;
-#endif
-        return 0;
-
-}
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 76fd6e2f71da..e7c161433eae 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -16,6 +16,9 @@ config M68K
         select ARCH_WANT_IPC_PARSE_VERSION
         select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
         select GENERIC_KERNEL_THREAD
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_REL
+        select MODULES_USE_ELF_RELA
 
 config RWSEM_GENERIC_SPINLOCK
         bool
diff --git a/arch/m68k/include/asm/module.h b/arch/m68k/include/asm/module.h
index edffe66b7f49..8b58fce843dd 100644
--- a/arch/m68k/include/asm/module.h
+++ b/arch/m68k/include/asm/module.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_M68K_MODULE_H
 #define _ASM_M68K_MODULE_H
 
+#include <asm-generic/module.h>
+
 enum m68k_fixup_type {
         m68k_fixup_memoffset,
         m68k_fixup_vnode_shift,
@@ -36,8 +38,4 @@ struct module;
 extern void module_fixup(struct module *mod, struct m68k_fixup_info *start,
                          struct m68k_fixup_info *end);
 
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-
 #endif /* _ASM_M68K_MODULE_H */
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 53fd94ab60f0..4cba7439f9de 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -25,6 +25,7 @@ config MICROBLAZE
         select GENERIC_CPU_DEVICES
         select GENERIC_ATOMIC64
         select GENERIC_CLOCKEVENTS
+        select MODULES_USE_ELF_RELA
 
 config SWAP
         def_bool n
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 35453eaeffb5..dba9390d37cf 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -37,6 +37,9 @@ config MIPS
         select BUILDTIME_EXTABLE_SORT
         select GENERIC_CLOCKEVENTS
         select GENERIC_CMOS_UPDATE
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_REL
+        select MODULES_USE_ELF_RELA if 64BIT
 
 menu "Machine selection"
 
@@ -1928,6 +1931,7 @@ config MIPS_MT_SMP
         select SYS_SUPPORTS_SCHED_SMT if SMP
         select SYS_SUPPORTS_SMP
         select SMP_UP
+        select MIPS_PERF_SHARED_TC_COUNTERS
         help
           This is a kernel model which is known a VSMP but lately has been
           marketesed into SMVP.
@@ -2038,16 +2042,6 @@ config MIPS_VPE_APSP_API
         depends on MIPS_VPE_LOADER
         help
 
-config MIPS_APSP_KSPD
-        bool "Enable KSPD"
-        depends on MIPS_VPE_APSP_API
-        default y
-        help
-          KSPD is a kernel daemon that accepts syscall requests from the SP
-          side, actions them and returns the results. It also handles the
-          "exit" syscall notifying other kernel modules the SP program is
-          exiting.  You probably want to say yes here.
-
 config MIPS_CMP
         bool "MIPS CMP framework support"
         depends on SYS_SUPPORTS_MIPS_CMP
@@ -2277,6 +2271,9 @@ config NR_CPUS
           performance should round up your number of processors to the next
           power of two.
 
+config MIPS_PERF_SHARED_TC_COUNTERS
+        bool
+
 #
 # Timer Interrupt Frequency Configuration
 #
diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index 0faaab24376e..c8862bdc2ff2 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -27,7 +27,7 @@ config MIPS_MTX1
         select SYS_HAS_EARLY_PRINTK
 
 config MIPS_DB1000
-        bool "Alchemy DB1000/DB1500/DB1100 boards"
+        bool "Alchemy DB1000/DB1500/DB1100 PB1500/1100 boards"
         select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select HW_HAS_PCI
@@ -36,57 +36,15 @@ config MIPS_DB1000
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
-config MIPS_DB1200
-        bool "Alchemy DB1200/PB1200 board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_COHERENT
-        select MIPS_DISABLE_OBSOLETE_IDE
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
-config MIPS_DB1300
-        bool "NetLogic DB1300 board"
-        select ALCHEMY_GPIOINT_AU1300
-        select DMA_COHERENT
-        select MIPS_DISABLE_OBSOLETE_IDE
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
-config MIPS_DB1550
-        bool "Alchemy DB1550 board"
-        select ALCHEMY_GPIOINT_AU1000
+config MIPS_DB1235
+        bool "Alchemy DB1200/PB1200/DB1300/DB1550/PB1550 boards"
+        select ARCH_REQUIRE_GPIOLIB
         select HW_HAS_PCI
         select DMA_COHERENT
         select MIPS_DISABLE_OBSOLETE_IDE
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
-config MIPS_PB1100
-        bool "Alchemy PB1100 board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select SWAP_IO_SPACE
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
-config MIPS_PB1500
-        bool "Alchemy PB1500 board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
-config MIPS_PB1550
-        bool "Alchemy PB1550 board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select MIPS_DISABLE_OBSOLETE_IDE
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
 config MIPS_XXS1500
         bool "MyCable XXS1500 board"
         select DMA_NONCOHERENT
diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
index 7956274de15f..942c5800a684 100644
--- a/arch/mips/alchemy/Platform
+++ b/arch/mips/alchemy/Platform
@@ -30,25 +30,11 @@ cflags-$(CONFIG_MIPS_DB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00
 load-$(CONFIG_MIPS_DB1000)      += 0xffffffff80100000
 
 #
-# AMD Alchemy Db1550 eval board
+# AMD Alchemy Db1200/Pb1200/Db1550/Db1300 eval boards
 #
-platform-$(CONFIG_MIPS_DB1550)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1550)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1550)      += 0xffffffff80100000
-
-#
-# AMD Alchemy Db1200/Pb1200 eval boards
-#
-platform-$(CONFIG_MIPS_DB1200)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1200)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1200)      += 0xffffffff80100000
-
-#
-# NetLogic DBAu1300 development platform
-#
-platform-$(CONFIG_MIPS_DB1300)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1300)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1300)      += 0xffffffff80100000
+platform-$(CONFIG_MIPS_DB1235)  += alchemy/devboards/
+cflags-$(CONFIG_MIPS_DB1235)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+load-$(CONFIG_MIPS_DB1235)      += 0xffffffff80100000
 
 #
 # 4G-Systems MTX-1 "MeshCube" wireless router
diff --git a/arch/mips/alchemy/devboards/Makefile b/arch/mips/alchemy/devboards/Makefile
index c9e747dd9fc2..15bf7306648b 100644
--- a/arch/mips/alchemy/devboards/Makefile
+++ b/arch/mips/alchemy/devboards/Makefile
@@ -4,10 +4,5 @@
 
 obj-y += bcsr.o platform.o
 obj-$(CONFIG_PM)                += pm.o
-obj-$(CONFIG_MIPS_PB1100)       += pb1100.o
-obj-$(CONFIG_MIPS_PB1500)       += pb1500.o
-obj-$(CONFIG_MIPS_PB1550)       += pb1550.o
 obj-$(CONFIG_MIPS_DB1000)       += db1000.o
-obj-$(CONFIG_MIPS_DB1200)       += db1200.o
-obj-$(CONFIG_MIPS_DB1300)       += db1300.o
-obj-$(CONFIG_MIPS_DB1550)       += db1550.o
+obj-$(CONFIG_MIPS_DB1235)       += db1235.o db1200.o db1300.o db1550.o
diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c
index 1b81dbf6b804..8187845650f7 100644
--- a/arch/mips/alchemy/devboards/db1000.c
+++ b/arch/mips/alchemy/devboards/db1000.c
@@ -1,5 +1,5 @@
 /*
- * DBAu1000/1500/1100 board support
+ * DBAu1000/1500/1100 PBAu1100/1500 board support
  *
  * Copyright 2000, 2008 MontaVista Software Inc.
  * Author: MontaVista Software, Inc. <source@mvista.com>
@@ -52,6 +52,11 @@ static const char *board_type_str(void)
                 return "DB1500";
         case BCSR_WHOAMI_DB1100:
                 return "DB1100";
+        case BCSR_WHOAMI_PB1500:
+        case BCSR_WHOAMI_PB1500R2:
+                return "PB1500";
+        case BCSR_WHOAMI_PB1100:
+                return "PB1100";
         default:
                 return "(unknown)";
         }
@@ -111,7 +116,9 @@ static struct platform_device db1500_pci_host_dev = {
 
 static int __init db1500_pci_init(void)
 {
-        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1500)
+        int id = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
+        if ((id == BCSR_WHOAMI_DB1500) || (id == BCSR_WHOAMI_PB1500) ||
+            (id == BCSR_WHOAMI_PB1500R2))
                 return platform_device_register(&db1500_pci_host_dev);
         return 0;
 }
@@ -199,27 +206,37 @@ static irqreturn_t db1100_mmc_cd(int irq, void *ptr)
 
 static int db1100_mmc_cd_setup(void *mmc_host, int en)
 {
-        int ret = 0;
+        int ret = 0, irq;
+
+        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)
+                irq = AU1100_GPIO19_INT;
+        else
+                irq = AU1100_GPIO14_INT;        /* PB1100 SD0 CD# */
 
         if (en) {
-                irq_set_irq_type(AU1100_GPIO19_INT, IRQ_TYPE_EDGE_BOTH);
-                ret = request_irq(AU1100_GPIO19_INT, db1100_mmc_cd, 0,
+                irq_set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
+                ret = request_irq(irq, db1100_mmc_cd, 0,
                                   "sd0_cd", mmc_host);
         } else
-                free_irq(AU1100_GPIO19_INT, mmc_host);
+                free_irq(irq, mmc_host);
         return ret;
 }
 
 static int db1100_mmc1_cd_setup(void *mmc_host, int en)
 {
-        int ret = 0;
+        int ret = 0, irq;
+
+        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)
+                irq = AU1100_GPIO20_INT;
+        else
+                irq = AU1100_GPIO15_INT;        /* PB1100 SD1 CD# */
 
         if (en) {
-                irq_set_irq_type(AU1100_GPIO20_INT, IRQ_TYPE_EDGE_BOTH);
-                ret = request_irq(AU1100_GPIO20_INT, db1100_mmc_cd, 0,
+                irq_set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
+                ret = request_irq(irq, db1100_mmc_cd, 0,
                                   "sd1_cd", mmc_host);
         } else
-                free_irq(AU1100_GPIO20_INT, mmc_host);
+                free_irq(irq, mmc_host);
         return ret;
 }
 
@@ -236,11 +253,18 @@ static int db1100_mmc_card_inserted(void *mmc_host)
 
 static void db1100_mmc_set_power(void *mmc_host, int state)
 {
+        int bit;
+
+        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)
+                bit = BCSR_BOARD_SD0PWR;
+        else
+                bit = BCSR_BOARD_PB1100_SD0PWR;
+
         if (state) {
-                bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD0PWR);
+                bcsr_mod(BCSR_BOARD, 0, bit);
                 msleep(400);    /* stabilization time */
         } else
-                bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD0PWR, 0);
+                bcsr_mod(BCSR_BOARD, bit, 0);
 }
 
 static void db1100_mmcled_set(struct led_classdev *led, enum led_brightness b)
@@ -267,11 +291,18 @@ static int db1100_mmc1_card_inserted(void *mmc_host)
 
 static void db1100_mmc1_set_power(void *mmc_host, int state)
 {
+        int bit;
+
+        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)
+                bit = BCSR_BOARD_SD1PWR;
+        else
+                bit = BCSR_BOARD_PB1100_SD1PWR;
+
         if (state) {
-                bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD1PWR);
+                bcsr_mod(BCSR_BOARD, 0, bit);
                 msleep(400);    /* stabilization time */
         } else
-                bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD1PWR, 0);
+                bcsr_mod(BCSR_BOARD, bit, 0);
 }
 
 static void db1100_mmc1led_set(struct led_classdev *led, enum led_brightness b)
@@ -480,13 +511,12 @@ static struct platform_device *db1100_devs[] = {
         &db1100_mmc0_dev,
         &db1100_mmc1_dev,
         &db1000_irda_dev,
-        &db1100_spi_dev,
 };
 
 static int __init db1000_dev_init(void)
 {
         int board = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
-        int c0, c1, d0, d1, s0, s1;
+        int c0, c1, d0, d1, s0, s1, flashsize = 32,  twosocks = 1;
         unsigned long pfc;
 
         if (board == BCSR_WHOAMI_DB1500) {
@@ -522,6 +552,7 @@ static int __init db1000_dev_init(void)
                                         ARRAY_SIZE(db1100_spi_info));
 
                 platform_add_devices(db1100_devs, ARRAY_SIZE(db1100_devs));
+                platform_device_register(&db1100_spi_dev);
         } else if (board == BCSR_WHOAMI_DB1000) {
                 c0 = AU1000_GPIO2_INT;
                 c1 = AU1000_GPIO5_INT;
@@ -530,15 +561,42 @@ static int __init db1000_dev_init(void)
                 s0 = AU1000_GPIO1_INT;
                 s1 = AU1000_GPIO4_INT;
                 platform_add_devices(db1000_devs, ARRAY_SIZE(db1000_devs));
+        } else if ((board == BCSR_WHOAMI_PB1500) ||
+                   (board == BCSR_WHOAMI_PB1500R2)) {
+                c0 = AU1500_GPIO203_INT;
+                d0 = AU1500_GPIO201_INT;
+                s0 = AU1500_GPIO202_INT;
+                twosocks = 0;
+                flashsize = 64;
+                /* RTC and daughtercard irqs */
+                irq_set_irq_type(AU1500_GPIO204_INT, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(AU1500_GPIO205_INT, IRQ_TYPE_LEVEL_LOW);
+                /* EPSON S1D13806 0x1b000000
+                 * SRAM 1MB/2MB   0x1a000000
+                 * DS1693 RTC     0x0c000000
+                 */
+        } else if (board == BCSR_WHOAMI_PB1100) {
+                c0 = AU1100_GPIO11_INT;
+                d0 = AU1100_GPIO9_INT;
+                s0 = AU1100_GPIO10_INT;
+                twosocks = 0;
+                flashsize = 64;
+                /* pendown, rtc, daughtercard irqs */
+                irq_set_irq_type(AU1100_GPIO8_INT, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(AU1100_GPIO12_INT, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(AU1100_GPIO13_INT, IRQ_TYPE_LEVEL_LOW);
+                /* EPSON S1D13806 0x1b000000
+                 * SRAM 1MB/2MB   0x1a000000
+                 * DiskOnChip     0x0d000000
+                 * DS1693 RTC     0x0c000000
+                 */
+                platform_add_devices(db1100_devs, ARRAY_SIZE(db1100_devs));
         } else
                 return 0; /* unknown board, no further dev setup to do */
 
         irq_set_irq_type(d0, IRQ_TYPE_EDGE_BOTH);
-        irq_set_irq_type(d1, IRQ_TYPE_EDGE_BOTH);
         irq_set_irq_type(c0, IRQ_TYPE_LEVEL_LOW);
-        irq_set_irq_type(c1, IRQ_TYPE_LEVEL_LOW);
         irq_set_irq_type(s0, IRQ_TYPE_LEVEL_LOW);
-        irq_set_irq_type(s1, IRQ_TYPE_LEVEL_LOW);
 
         db1x_register_pcmcia_socket(
                 AU1000_PCMCIA_ATTR_PHYS_ADDR,
@@ -549,17 +607,23 @@ static int __init db1000_dev_init(void)
                 AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
                 c0, d0, /*s0*/0, 0, 0);
 
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
-                c1, d1, /*s1*/0, 0, 1);
+        if (twosocks) {
+                irq_set_irq_type(d1, IRQ_TYPE_EDGE_BOTH);
+                irq_set_irq_type(c1, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(s1, IRQ_TYPE_LEVEL_LOW);
+
+                db1x_register_pcmcia_socket(
+                        AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
+                        AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
+                        AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,
+                        AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,
+                        AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,
+                        AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
+                        c1, d1, /*s1*/0, 0, 1);
+        }
 
         platform_add_devices(db1x00_devs, ARRAY_SIZE(db1x00_devs));
-        db1x_register_norflash(32 << 20, 4 /* 32bit */, F_SWAPPED);
+        db1x_register_norflash(flashsize << 20, 4 /* 32bit */, F_SWAPPED);
         return 0;
 }
 device_initcall(db1000_dev_init);
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index bf2248474fa8..299b7d202bea 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -45,25 +45,9 @@
 
 #include "platform.h"
 
-static const char *board_type_str(void)
-{
-        switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
-        case BCSR_WHOAMI_PB1200_DDR1:
-        case BCSR_WHOAMI_PB1200_DDR2:
-                return "PB1200";
-        case BCSR_WHOAMI_DB1200:
-                return "DB1200";
-        default:
-                return "(unknown)";
-        }
-}
+const char *get_system_type(void);
 
-const char *get_system_type(void)
-{
-        return board_type_str();
-}
-
-static int __init detect_board(void)
+static int __init db1200_detect_board(void)
 {
         int bid;
 
@@ -96,19 +80,17 @@ static int __init detect_board(void)
         return 1;       /* it's neither */
 }
 
-void __init board_setup(void)
+int __init db1200_board_setup(void)
 {
         unsigned long freq0, clksrc, div, pfc;
         unsigned short whoami;
 
-        if (detect_board()) {
-                printk(KERN_ERR "NOT running on a DB1200/PB1200 board!\n");
-                return;
-        }
+        if (db1200_detect_board())
+                return -ENODEV;
 
         whoami = bcsr_read(BCSR_WHOAMI);
         printk(KERN_INFO "Alchemy/AMD/RMI %s Board, CPLD Rev %d"
-                "  Board-ID %d  Daughtercard ID %d\n", board_type_str(),
+                "  Board-ID %d  Daughtercard ID %d\n", get_system_type(),
                 (whoami >> 4) & 0xf, (whoami >> 8) & 0xf, whoami & 0xf);
 
         /* SMBus/SPI on PSC0, Audio on PSC1 */
@@ -138,6 +120,8 @@ void __init board_setup(void)
         clksrc = SYS_CS_MUX_FQ0 << SYS_CS_ME0_BIT;
         __raw_writel(clksrc, (void __iomem *)SYS_CLKSRC);
         wmb();
+
+        return 0;
 }
 
 /******************************************************************************/
@@ -796,7 +780,7 @@ static int __init pb1200_res_fixup(void)
         return 0;
 }
 
-static int __init db1200_dev_init(void)
+int __init db1200_dev_setup(void)
 {
         unsigned long pfc;
         unsigned short sw;
@@ -846,7 +830,7 @@ static int __init db1200_dev_init(void)
         gpio_request(215, "otg-vbus");
         gpio_direction_output(215, 1);
 
-        printk(KERN_INFO "%s device configuration:\n", board_type_str());
+        printk(KERN_INFO "%s device configuration:\n", get_system_type());
 
         sw = bcsr_read(BCSR_SWITCHES);
         if (sw & BCSR_SWITCHES_DIP_8) {
@@ -922,4 +906,3 @@ static int __init db1200_dev_init(void)
 
         return 0;
 }
-device_initcall(db1200_dev_init);
diff --git a/arch/mips/alchemy/devboards/db1235.c b/arch/mips/alchemy/devboards/db1235.c
new file mode 100644
index 000000000000..c76a90f78664
--- /dev/null
+++ b/arch/mips/alchemy/devboards/db1235.c
@@ -0,0 +1,94 @@
+/*
+ * DB1200/PB1200 / DB1550 / DB1300 board support.
+ *
+ * These 4 boards can reliably be supported in a single kernel image.
+ */
+
+#include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-db1x00/bcsr.h>
+
+int __init db1200_board_setup(void);
+int __init db1200_dev_setup(void);
+int __init db1300_board_setup(void);
+int __init db1300_dev_setup(void);
+int __init db1550_board_setup(void);
+int __init db1550_dev_setup(void);
+int __init db1550_pci_setup(int);
+
+static const char *board_type_str(void)
+{
+        switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
+        case BCSR_WHOAMI_PB1200_DDR1:
+        case BCSR_WHOAMI_PB1200_DDR2:
+                return "PB1200";
+        case BCSR_WHOAMI_DB1200:
+                return "DB1200";
+        case BCSR_WHOAMI_DB1300:
+                return "DB1300";
+        case BCSR_WHOAMI_DB1550:
+                return "DB1550";
+        case BCSR_WHOAMI_PB1550_SDR:
+        case BCSR_WHOAMI_PB1550_DDR:
+                return "PB1550";
+        default:
+                return "(unknown)";
+        }
+}
+
+const char *get_system_type(void)
+{
+        return board_type_str();
+}
+
+void __init board_setup(void)
+{
+        int ret;
+
+        switch (alchemy_get_cputype()) {
+        case ALCHEMY_CPU_AU1550:
+                ret = db1550_board_setup();
+                break;
+        case ALCHEMY_CPU_AU1200:
+                ret = db1200_board_setup();
+                break;
+        case ALCHEMY_CPU_AU1300:
+                ret = db1300_board_setup();
+                break;
+        default:
+                pr_err("unsupported CPU on board\n");
+                ret = -ENODEV;
+        }
+        if (ret)
+                panic("cannot initialize board support\n");
+}
+
+int __init db1235_arch_init(void)
+{
+        int id = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
+        if (id == BCSR_WHOAMI_DB1550)
+                return db1550_pci_setup(0);
+        else if ((id == BCSR_WHOAMI_PB1550_SDR) ||
+                 (id == BCSR_WHOAMI_PB1550_DDR))
+                return db1550_pci_setup(1);
+
+        return 0;
+}
+arch_initcall(db1235_arch_init);
+
+int __init db1235_dev_init(void)
+{
+        switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
+        case BCSR_WHOAMI_PB1200_DDR1:
+        case BCSR_WHOAMI_PB1200_DDR2:
+        case BCSR_WHOAMI_DB1200:
+                return db1200_dev_setup();
+        case BCSR_WHOAMI_DB1300:
+                return db1300_dev_setup();
+        case BCSR_WHOAMI_DB1550:
+        case BCSR_WHOAMI_PB1550_SDR:
+        case BCSR_WHOAMI_PB1550_DDR:
+                return db1550_dev_setup();
+        }
+        return 0;
+}
+device_initcall(db1235_dev_init);
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index c56e0246694e..cdf37cbd3d1f 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -110,11 +110,6 @@ static void __init db1300_gpio_config(void)
         au1300_set_dbdma_gpio(1, AU1300_PIN_FG3AUX);
 }
 
-char *get_system_type(void)
-{
-        return "DB1300";
-}
-
 /**********************************************************************/
 
 static void au1300_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
@@ -701,7 +696,7 @@ static struct platform_device *db1300_dev[] __initdata = {
         &db1300_sndi2s_dev,
 };
 
-static int __init db1300_device_init(void)
+int __init db1300_dev_setup(void)
 {
         int swapped, cpldirq;
 
@@ -758,10 +753,9 @@ static int __init db1300_device_init(void)
 
         return platform_add_devices(db1300_dev, ARRAY_SIZE(db1300_dev));
 }
-device_initcall(db1300_device_init);
 
 
-void __init board_setup(void)
+int __init db1300_board_setup(void)
 {
         unsigned short whoami;
 
@@ -779,4 +773,6 @@ void __init board_setup(void)
         alchemy_uart_enable(AU1300_UART0_PHYS_ADDR);
         alchemy_uart_enable(AU1300_UART1_PHYS_ADDR);
         alchemy_uart_enable(AU1300_UART3_PHYS_ADDR);
+
+        return 0;
 }
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index 9eb79062f46e..5a9ae6095428 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -1,5 +1,5 @@
 /*
- * Alchemy Db1550 board support
+ * Alchemy Db1550/Pb1550 board support
  *
  * (c) 2011 Manuel Lauss <manuel.lauss@googlemail.com>
  */
@@ -17,34 +17,29 @@
 #include <linux/pm.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
+#include <asm/bootinfo.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_eth.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
 #include <asm/mach-au1x00/au1xxx_psc.h>
 #include <asm/mach-au1x00/au1550_spi.h>
+#include <asm/mach-au1x00/au1550nd.h>
 #include <asm/mach-db1x00/bcsr.h>
 #include <prom.h>
 #include "platform.h"
 
-
-const char *get_system_type(void)
-{
-        return "DB1550";
-}
-
 static void __init db1550_hw_setup(void)
 {
         void __iomem *base;
 
-        alchemy_gpio_direction_output(203, 0);  /* red led on */
-
         /* complete SPI setup: link psc0_intclk to a 48MHz source,
-         * and assign GPIO16 to PSC0_SYNC1 (SPI cs# line)
+         * and assign GPIO16 to PSC0_SYNC1 (SPI cs# line) as well as PSC1_SYNC
+         * for AC97 on PB1550.
          */
         base = (void __iomem *)SYS_CLKSRC;
         __raw_writel(__raw_readl(base) | 0x000001e0, base);
         base = (void __iomem *)SYS_PINFUNC;
-        __raw_writel(__raw_readl(base) | 1, base);
+        __raw_writel(__raw_readl(base) | 1 | SYS_PF_PSC1_S1, base);
         wmb();
 
         /* reset the AC97 codec now, the reset time in the psc-ac97 driver
@@ -57,23 +52,27 @@ static void __init db1550_hw_setup(void)
         wmb();
         __raw_writel(PSC_AC97RST_RST, base + PSC_AC97RST_OFFSET);
         wmb();
-
-        alchemy_gpio_direction_output(202, 0);  /* green led on */
 }
 
-void __init board_setup(void)
+int __init db1550_board_setup(void)
 {
         unsigned short whoami;
 
         bcsr_init(DB1550_BCSR_PHYS_ADDR,
                   DB1550_BCSR_PHYS_ADDR + DB1550_BCSR_HEXLED_OFS);
 
-        whoami = bcsr_read(BCSR_WHOAMI);
-        printk(KERN_INFO "Alchemy/AMD DB1550 Board, CPLD Rev %d"
-                "  Board-ID %d  Daughtercard ID %d\n",
+        whoami = bcsr_read(BCSR_WHOAMI); /* PB1550 hexled offset differs */
+        if ((BCSR_WHOAMI_BOARD(whoami) == BCSR_WHOAMI_PB1550_SDR) ||
+            (BCSR_WHOAMI_BOARD(whoami) == BCSR_WHOAMI_PB1550_DDR))
+                bcsr_init(PB1550_BCSR_PHYS_ADDR,
+                          PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);
+
+        pr_info("Alchemy/AMD %s Board, CPLD Rev %d Board-ID %d  "       \
+                "Daughtercard ID %d\n", get_system_type(),
                 (whoami >> 4) & 0xf, (whoami >> 8) & 0xf, whoami & 0xf);
 
         db1550_hw_setup();
+        return 0;
 }
 
 /*****************************************************************************/
@@ -194,6 +193,39 @@ static struct platform_device db1550_nand_dev = {
         }
 };
 
+static struct au1550nd_platdata pb1550_nand_pd = {
+        .parts          = db1550_nand_parts,
+        .num_parts      = ARRAY_SIZE(db1550_nand_parts),
+        .devwidth       = 0,    /* x8 NAND default, needs fixing up */
+};
+
+static struct platform_device pb1550_nand_dev = {
+        .name           = "au1550-nand",
+        .id             = -1,
+        .resource       = db1550_nand_res,
+        .num_resources  = ARRAY_SIZE(db1550_nand_res),
+        .dev            = {
+                .platform_data  = &pb1550_nand_pd,
+        },
+};
+
+static void __init pb1550_nand_setup(void)
+{
+        int boot_swapboot = (au_readl(MEM_STSTAT) & (0x7 << 1)) |
+                            ((bcsr_read(BCSR_STATUS) >> 6) & 0x1);
+
+        gpio_direction_input(206);      /* de-assert NAND CS# */
+        switch (boot_swapboot) {
+        case 0: case 2: case 8: case 0xC: case 0xD:
+                /* x16 NAND Flash */
+                pb1550_nand_pd.devwidth = 1;
+                /* fallthrough */
+        case 1: case 3: case 9: case 0xE: case 0xF:
+                /* x8 NAND, already set up */
+                platform_device_register(&pb1550_nand_dev);
+        }
+}
+
 /**********************************************************************/
 
 static struct resource au1550_psc0_res[] = {
@@ -394,6 +426,29 @@ static int db1550_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
         return -1;
 }
 
+static int pb1550_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
+{
+        if ((slot < 12) || (slot > 13) || pin == 0)
+                return -1;
+        if (slot == 12) {
+                switch (pin) {
+                case 1: return AU1500_PCI_INTB;
+                case 2: return AU1500_PCI_INTC;
+                case 3: return AU1500_PCI_INTD;
+                case 4: return AU1500_PCI_INTA;
+                }
+        }
+        if (slot == 13) {
+                switch (pin) {
+                case 1: return AU1500_PCI_INTA;
+                case 2: return AU1500_PCI_INTB;
+                case 3: return AU1500_PCI_INTC;
+                case 4: return AU1500_PCI_INTD;
+                }
+        }
+        return -1;
+}
+
 static struct resource alchemy_pci_host_res[] = {
         [0] = {
                 .start  = AU1500_PCI_PHYS_ADDR,
@@ -417,7 +472,6 @@ static struct platform_device db1550_pci_host_dev = {
 /**********************************************************************/
 
 static struct platform_device *db1550_devs[] __initdata = {
-        &db1550_nand_dev,
         &db1550_i2c_dev,
         &db1550_ac97_dev,
         &db1550_spi_dev,
@@ -430,15 +484,16 @@ static struct platform_device *db1550_devs[] __initdata = {
 };
 
 /* must be arch_initcall; MIPS PCI scans busses in a subsys_initcall */
-static int __init db1550_pci_init(void)
+int __init db1550_pci_setup(int id)
 {
+        if (id)
+                db1550_pci_pd.board_map_irq = pb1550_map_pci_irq;
         return platform_device_register(&db1550_pci_host_dev);
 }
-arch_initcall(db1550_pci_init);
 
-static int __init db1550_dev_init(void)
+static void __init db1550_devices(void)
 {
-        int swapped;
+        alchemy_gpio_direction_output(203, 0);  /* red led on */
 
         irq_set_irq_type(AU1550_GPIO0_INT, IRQ_TYPE_EDGE_BOTH);  /* CD0# */
         irq_set_irq_type(AU1550_GPIO1_INT, IRQ_TYPE_EDGE_BOTH);  /* CD1# */
@@ -447,6 +502,75 @@ static int __init db1550_dev_init(void)
         irq_set_irq_type(AU1550_GPIO21_INT, IRQ_TYPE_LEVEL_LOW); /* STSCHG0# */
         irq_set_irq_type(AU1550_GPIO22_INT, IRQ_TYPE_LEVEL_LOW); /* STSCHG1# */
 
+        db1x_register_pcmcia_socket(
+                AU1000_PCMCIA_ATTR_PHYS_ADDR,
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
+                AU1000_PCMCIA_MEM_PHYS_ADDR,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
+                AU1000_PCMCIA_IO_PHYS_ADDR,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
+                AU1550_GPIO3_INT, AU1550_GPIO0_INT,
+                /*AU1550_GPIO21_INT*/0, 0, 0);
+
+        db1x_register_pcmcia_socket(
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
+                AU1550_GPIO5_INT, AU1550_GPIO1_INT,
+                /*AU1550_GPIO22_INT*/0, 0, 1);
+
+        platform_device_register(&db1550_nand_dev);
+
+        alchemy_gpio_direction_output(202, 0);  /* green led on */
+}
+
+static void __init pb1550_devices(void)
+{
+        irq_set_irq_type(AU1550_GPIO0_INT, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(AU1550_GPIO1_INT, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(AU1550_GPIO201_205_INT, IRQ_TYPE_LEVEL_HIGH);
+
+        /* enable both PCMCIA card irqs in the shared line */
+        alchemy_gpio2_enable_int(201);  /* socket 0 card irq */
+        alchemy_gpio2_enable_int(202);  /* socket 1 card irq */
+
+        /* Pb1550, like all others, also has statuschange irqs; however they're
+        * wired up on one of the Au1550's shared GPIO201_205 line, which also
+        * services the PCMCIA card interrupts.  So we ignore statuschange and
+        * use the GPIO201_205 exclusively for card interrupts, since a) pcmcia
+        * drivers are used to shared irqs and b) statuschange isn't really use-
+        * ful anyway.
+        */
+        db1x_register_pcmcia_socket(
+                AU1000_PCMCIA_ATTR_PHYS_ADDR,
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
+                AU1000_PCMCIA_MEM_PHYS_ADDR,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
+                AU1000_PCMCIA_IO_PHYS_ADDR,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
+                AU1550_GPIO201_205_INT, AU1550_GPIO0_INT, 0, 0, 0);
+
+        db1x_register_pcmcia_socket(
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008000000,
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008000000,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008400000 - 1,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008000000,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008010000 - 1,
+                AU1550_GPIO201_205_INT, AU1550_GPIO1_INT, 0, 0, 1);
+
+        pb1550_nand_setup();
+}
+
+int __init db1550_dev_setup(void)
+{
+        int swapped, id;
+
+        id = (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) != BCSR_WHOAMI_DB1550);
+
         i2c_register_board_info(0, db1550_i2c_devs,
                                 ARRAY_SIZE(db1550_i2c_devs));
         spi_register_board_info(db1550_spi_devs,
@@ -467,29 +591,11 @@ static int __init db1550_dev_init(void)
             (void __iomem *)KSEG1ADDR(AU1550_PSC2_PHYS_ADDR) + PSC_SEL_OFFSET);
         wmb();
 
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
-                AU1550_GPIO3_INT, AU1550_GPIO0_INT,
-                /*AU1550_GPIO21_INT*/0, 0, 0);
-
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
-                AU1550_GPIO5_INT, AU1550_GPIO1_INT,
-                /*AU1550_GPIO22_INT*/0, 0, 1);
+        id ? pb1550_devices() : db1550_devices();
 
-        swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT;
+        swapped = bcsr_read(BCSR_STATUS) &
+               (id ? BCSR_STATUS_PB1550_SWAPBOOT : BCSR_STATUS_DB1000_SWAPBOOT);
         db1x_register_norflash(128 << 20, 4, swapped);
 
         return platform_add_devices(db1550_devs, ARRAY_SIZE(db1550_devs));
 }
-device_initcall(db1550_dev_init);
diff --git a/arch/mips/alchemy/devboards/pb1100.c b/arch/mips/alchemy/devboards/pb1100.c
deleted file mode 100644
index 78c77a44a317..000000000000
--- a/arch/mips/alchemy/devboards/pb1100.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Pb1100 board platform device registration
- *
- * Copyright (C) 2009 Manuel Lauss
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-db1x00/bcsr.h>
-#include <prom.h>
-#include "platform.h"
-
-const char *get_system_type(void)
-{
-        return "PB1100";
-}
-
-void __init board_setup(void)
-{
-        volatile void __iomem *base = (volatile void __iomem *)0xac000000UL;
-
-        bcsr_init(DB1000_BCSR_PHYS_ADDR,
-                  DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);
-
-        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
-        au_writel(8, SYS_AUXPLL);
-        alchemy_gpio1_input_enable();
-        udelay(100);
-
-#if IS_ENABLED(CONFIG_USB_OHCI_HCD)
-        {
-                u32 pin_func, sys_freqctrl, sys_clksrc;
-
-                /* Configure pins GPIO[14:9] as GPIO */
-                pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_UR3;
-
-                /* Zero and disable FREQ2 */
-                sys_freqctrl = au_readl(SYS_FREQCTRL0);
-                sys_freqctrl &= ~0xFFF00000;
-                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-
-                /* Zero and disable USBH/USBD/IrDA clock */
-                sys_clksrc = au_readl(SYS_CLKSRC);
-                sys_clksrc &= ~(SYS_CS_CIR | SYS_CS_DIR | SYS_CS_MIR_MASK);
-                au_writel(sys_clksrc, SYS_CLKSRC);
-
-                sys_freqctrl = au_readl(SYS_FREQCTRL0);
-                sys_freqctrl &= ~0xFFF00000;
-
-                sys_clksrc = au_readl(SYS_CLKSRC);
-                sys_clksrc &= ~(SYS_CS_CIR | SYS_CS_DIR | SYS_CS_MIR_MASK);
-
-                /* FREQ2 = aux / 2 = 48 MHz */
-                sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) |
-                                SYS_FC_FE2 | SYS_FC_FS2;
-                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-
-                /*
-                 * Route 48 MHz FREQ2 into USBH/USBD/IrDA
-                 */
-                sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MIR_BIT;
-                au_writel(sys_clksrc, SYS_CLKSRC);
-
-                /* Setup the static bus controller */
-                au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
-                au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
-                au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
-
-                /*
-                 * Get USB Functionality pin state (device vs host drive pins).
-                 */
-                pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_USB;
-                /* 2nd USB port is USB host. */
-                pin_func |= SYS_PF_USB;
-                au_writel(pin_func, SYS_PINFUNC);
-        }
-#endif /* IS_ENABLED(CONFIG_USB_OHCI_HCD) */
-
-        /* Enable sys bus clock divider when IDLE state or no bus activity. */
-        au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
-
-        /* Enable the RTC if not already enabled. */
-        if (!(readb(base + 0x28) & 0x20)) {
-                writeb(readb(base + 0x28) | 0x20, base + 0x28);
-                au_sync();
-        }
-        /* Put the clock in BCD mode. */
-        if (readb(base + 0x2C) & 0x4) { /* reg B */
-                writeb(readb(base + 0x2c) & ~0x4, base + 0x2c);
-                au_sync();
-        }
-}
-
-/******************************************************************************/
-
-static struct resource au1100_lcd_resources[] = {
-        [0] = {
-                .start  = AU1100_LCD_PHYS_ADDR,
-                .end    = AU1100_LCD_PHYS_ADDR + 0x800 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AU1100_LCD_INT,
-                .end    = AU1100_LCD_INT,
-                .flags  = IORESOURCE_IRQ,
-        }
-};
-
-static u64 au1100_lcd_dmamask = DMA_BIT_MASK(32);
-
-static struct platform_device au1100_lcd_device = {
-        .name           = "au1100-lcd",
-        .id             = 0,
-        .dev = {
-                .dma_mask               = &au1100_lcd_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-        .num_resources  = ARRAY_SIZE(au1100_lcd_resources),
-        .resource       = au1100_lcd_resources,
-};
-
-static int __init pb1100_dev_init(void)
-{
-        int swapped;
-
-        irq_set_irq_type(AU1100_GPIO9_INT, IRQF_TRIGGER_LOW); /* PCCD# */
-        irq_set_irq_type(AU1100_GPIO10_INT, IRQF_TRIGGER_LOW); /* PCSTSCHG# */
-        irq_set_irq_type(AU1100_GPIO11_INT, IRQF_TRIGGER_LOW); /* PCCard# */
-        irq_set_irq_type(AU1100_GPIO13_INT, IRQF_TRIGGER_LOW); /* DC_IRQ# */
-
-        /* PCMCIA. single socket, identical to Pb1500 */
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
-                AU1100_GPIO11_INT, AU1100_GPIO9_INT,     /* card / insert */
-                /*AU1100_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */
-
-        swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1000_SWAPBOOT;
-        db1x_register_norflash(64 * 1024 * 1024, 4, swapped);
-        platform_device_register(&au1100_lcd_device);
-
-        return 0;
-}
-device_initcall(pb1100_dev_init);
diff --git a/arch/mips/alchemy/devboards/pb1500.c b/arch/mips/alchemy/devboards/pb1500.c
deleted file mode 100644
index 232fee942000..000000000000
--- a/arch/mips/alchemy/devboards/pb1500.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Pb1500 board support.
- *
- * Copyright (C) 2009 Manuel Lauss
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/delay.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-db1x00/bcsr.h>
-#include <prom.h>
-#include "platform.h"
-
-const char *get_system_type(void)
-{
-        return "PB1500";
-}
-
-void __init board_setup(void)
-{
-        u32 pin_func;
-        u32 sys_freqctrl, sys_clksrc;
-
-        bcsr_init(DB1000_BCSR_PHYS_ADDR,
-                  DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);
-
-        sys_clksrc = sys_freqctrl = pin_func = 0;
-        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
-        au_writel(8, SYS_AUXPLL);
-        alchemy_gpio1_input_enable();
-        udelay(100);
-
-        /* GPIO201 is input for PCMCIA card detect */
-        /* GPIO203 is input for PCMCIA interrupt request */
-        alchemy_gpio_direction_input(201);
-        alchemy_gpio_direction_input(203);
-
-#if IS_ENABLED(CONFIG_USB_OHCI_HCD)
-
-        /* Zero and disable FREQ2 */
-        sys_freqctrl = au_readl(SYS_FREQCTRL0);
-        sys_freqctrl &= ~0xFFF00000;
-        au_writel(sys_freqctrl, SYS_FREQCTRL0);
-
-        /* zero and disable USBH/USBD clocks */
-        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
-                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-        au_writel(sys_clksrc, SYS_CLKSRC);
-
-        sys_freqctrl = au_readl(SYS_FREQCTRL0);
-        sys_freqctrl &= ~0xFFF00000;
-
-        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
-                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-
-        /* FREQ2 = aux/2 = 48 MHz */
-        sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) | SYS_FC_FE2 | SYS_FC_FS2;
-        au_writel(sys_freqctrl, SYS_FREQCTRL0);
-
-        /*
-         * Route 48MHz FREQ2 into USB Host and/or Device
-         */
-        sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MUH_BIT;
-        au_writel(sys_clksrc, SYS_CLKSRC);
-
-        pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_USB;
-        /* 2nd USB port is USB host */
-        pin_func |= SYS_PF_USB;
-        au_writel(pin_func, SYS_PINFUNC);
-#endif /* IS_ENABLED(CONFIG_USB_OHCI_HCD) */
-
-#ifdef CONFIG_PCI
-        {
-                void __iomem *base =
-                                (void __iomem *)KSEG1ADDR(AU1500_PCI_PHYS_ADDR);
-                /* Setup PCI bus controller */
-                __raw_writel(0x00003fff, base + PCI_REG_CMEM);
-                __raw_writel(0xf0000000, base + PCI_REG_MWMASK_DEV);
-                __raw_writel(0, base + PCI_REG_MWBASE_REV_CCL);
-                __raw_writel(0x02a00356, base + PCI_REG_STATCMD);
-                __raw_writel(0x00003c04, base + PCI_REG_PARAM);
-                __raw_writel(0x00000008, base + PCI_REG_MBAR);
-                wmb();
-        }
-#endif
-
-        /* Enable sys bus clock divider when IDLE state or no bus activity. */
-        au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
-
-        /* Enable the RTC if not already enabled */
-        if (!(au_readl(0xac000028) & 0x20)) {
-                printk(KERN_INFO "enabling clock ...\n");
-                au_writel((au_readl(0xac000028) | 0x20), 0xac000028);
-        }
-        /* Put the clock in BCD mode */
-        if (au_readl(0xac00002c) & 0x4) { /* reg B */
-                au_writel(au_readl(0xac00002c) & ~0x4, 0xac00002c);
-                au_sync();
-        }
-}
-
-/******************************************************************************/
-
-static int pb1500_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
-{
-        if ((slot < 12) || (slot > 13) || pin == 0)
-                return -1;
-        if (slot == 12)
-                return (pin == 1) ? AU1500_PCI_INTA : 0xff;
-        if (slot == 13) {
-                switch (pin) {
-                case 1: return AU1500_PCI_INTA;
-                case 2: return AU1500_PCI_INTB;
-                case 3: return AU1500_PCI_INTC;
-                case 4: return AU1500_PCI_INTD;
-                }
-        }
-        return -1;
-}
-
-static struct resource alchemy_pci_host_res[] = {
-        [0] = {
-                .start  = AU1500_PCI_PHYS_ADDR,
-                .end    = AU1500_PCI_PHYS_ADDR + 0xfff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct alchemy_pci_platdata pb1500_pci_pd = {
-        .board_map_irq  = pb1500_map_pci_irq,
-        .pci_cfg_set    = PCI_CONFIG_AEN | PCI_CONFIG_R2H | PCI_CONFIG_R1H |
-                          PCI_CONFIG_CH |
-#if defined(__MIPSEB__)
-                          PCI_CONFIG_SIC_HWA_DAT | PCI_CONFIG_SM,
-#else
-                          0,
-#endif
-};
-
-static struct platform_device pb1500_pci_host = {
-        .dev.platform_data = &pb1500_pci_pd,
-        .name           = "alchemy-pci",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(alchemy_pci_host_res),
-        .resource       = alchemy_pci_host_res,
-};
-
-static int __init pb1500_dev_init(void)
-{
-        int swapped;
-
-        irq_set_irq_type(AU1500_GPIO9_INT,   IRQF_TRIGGER_LOW);   /* CD0# */
-        irq_set_irq_type(AU1500_GPIO10_INT,  IRQF_TRIGGER_LOW);  /* CARD0 */
-        irq_set_irq_type(AU1500_GPIO11_INT,  IRQF_TRIGGER_LOW);  /* STSCHG0# */
-        irq_set_irq_type(AU1500_GPIO204_INT, IRQF_TRIGGER_HIGH);
-        irq_set_irq_type(AU1500_GPIO201_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1500_GPIO202_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1500_GPIO203_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1500_GPIO205_INT, IRQF_TRIGGER_LOW);
-
-        /* PCMCIA. single socket, identical to Pb1100 */
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
-                AU1500_GPIO11_INT, AU1500_GPIO9_INT,     /* card / insert */
-                /*AU1500_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */
-
-        swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1000_SWAPBOOT;
-        db1x_register_norflash(64 * 1024 * 1024, 4, swapped);
-        platform_device_register(&pb1500_pci_host);
-
-        return 0;
-}
-arch_initcall(pb1500_dev_init);
diff --git a/arch/mips/alchemy/devboards/pb1550.c b/arch/mips/alchemy/devboards/pb1550.c
deleted file mode 100644
index b37e7de8d920..000000000000
--- a/arch/mips/alchemy/devboards/pb1550.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Pb1550 board support.
- *
- * Copyright (C) 2009-2011 Manuel Lauss
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-au1x00/au1xxx_dbdma.h>
-#include <asm/mach-au1x00/au1550nd.h>
-#include <asm/mach-au1x00/gpio.h>
-#include <asm/mach-db1x00/bcsr.h>
-#include "platform.h"
-
-const char *get_system_type(void)
-{
-        return "PB1550";
-}
-
-void __init board_setup(void)
-{
-        u32 pin_func;
-
-        bcsr_init(PB1550_BCSR_PHYS_ADDR,
-                  PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);
-
-        alchemy_gpio2_enable();
-
-        /*
-         * Enable PSC1 SYNC for AC'97.  Normaly done in audio driver,
-         * but it is board specific code, so put it here.
-         */
-        pin_func = au_readl(SYS_PINFUNC);
-        au_sync();
-        pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
-        au_writel(pin_func, SYS_PINFUNC);
-
-        bcsr_write(BCSR_PCMCIA, 0);     /* turn off PCMCIA power */
-
-        printk(KERN_INFO "AMD Alchemy Pb1550 Board\n");
-}
-
-/******************************************************************************/
-
-static int pb1550_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
-{
-        if ((slot < 12) || (slot > 13) || pin == 0)
-                return -1;
-        if (slot == 12) {
-                switch (pin) {
-                case 1: return AU1500_PCI_INTB;
-                case 2: return AU1500_PCI_INTC;
-                case 3: return AU1500_PCI_INTD;
-                case 4: return AU1500_PCI_INTA;
-                }
-        }
-        if (slot == 13) {
-                switch (pin) {
-                case 1: return AU1500_PCI_INTA;
-                case 2: return AU1500_PCI_INTB;
-                case 3: return AU1500_PCI_INTC;
-                case 4: return AU1500_PCI_INTD;
-                }
-        }
-        return -1;
-}
-
-static struct resource alchemy_pci_host_res[] = {
-        [0] = {
-                .start  = AU1500_PCI_PHYS_ADDR,
-                .end    = AU1500_PCI_PHYS_ADDR + 0xfff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct alchemy_pci_platdata pb1550_pci_pd = {
-        .board_map_irq  = pb1550_map_pci_irq,
-};
-
-static struct platform_device pb1550_pci_host = {
-        .dev.platform_data = &pb1550_pci_pd,
-        .name           = "alchemy-pci",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(alchemy_pci_host_res),
-        .resource       = alchemy_pci_host_res,
-};
-
-static struct resource au1550_psc2_res[] = {
-        [0] = {
-                .start  = AU1550_PSC2_PHYS_ADDR,
-                .end    = AU1550_PSC2_PHYS_ADDR + 0xfff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AU1550_PSC2_INT,
-                .end    = AU1550_PSC2_INT,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = AU1550_DSCR_CMD0_PSC2_TX,
-                .end    = AU1550_DSCR_CMD0_PSC2_TX,
-                .flags  = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start  = AU1550_DSCR_CMD0_PSC2_RX,
-                .end    = AU1550_DSCR_CMD0_PSC2_RX,
-                .flags  = IORESOURCE_DMA,
-        },
-};
-
-static struct platform_device pb1550_i2c_dev = {
-        .name           = "au1xpsc_smbus",
-        .id             = 0,    /* bus number */
-        .num_resources  = ARRAY_SIZE(au1550_psc2_res),
-        .resource       = au1550_psc2_res,
-};
-
-static struct mtd_partition pb1550_nand_parts[] = {
-        [0] = {
-                .name   = "NAND FS 0",
-                .offset = 0,
-                .size   = 8 * 1024 * 1024,
-        },
-        [1] = {
-                .name   = "NAND FS 1",
-                .offset = MTDPART_OFS_APPEND,
-                .size   = MTDPART_SIZ_FULL,
-        },
-};
-
-static struct au1550nd_platdata pb1550_nand_pd = {
-        .parts          = pb1550_nand_parts,
-        .num_parts      = ARRAY_SIZE(pb1550_nand_parts),
-        .devwidth       = 0,    /* x8 NAND default, needs fixing up */
-};
-
-static struct resource pb1550_nand_res[] = {
-        [0] = {
-                .start  = 0x20000000,
-                .end    = 0x20000fff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device pb1550_nand_dev = {
-        .name           = "au1550-nand",
-        .id             = -1,
-        .resource       = pb1550_nand_res,
-        .num_resources  = ARRAY_SIZE(pb1550_nand_res),
-        .dev            = {
-                .platform_data  = &pb1550_nand_pd,
-        },
-};
-
-static void __init pb1550_nand_setup(void)
-{
-        int boot_swapboot = (au_readl(MEM_STSTAT) & (0x7 << 1)) |
-                            ((bcsr_read(BCSR_STATUS) >> 6) & 0x1);
-
-        switch (boot_swapboot) {
-        case 0:
-        case 2:
-        case 8:
-        case 0xC:
-        case 0xD:
-                /* x16 NAND Flash */
-                pb1550_nand_pd.devwidth = 1;
-                /* fallthrough */
-        case 1:
-        case 9:
-        case 3:
-        case 0xE:
-        case 0xF:
-                /* x8 NAND, already set up */
-                platform_device_register(&pb1550_nand_dev);
-        }
-}
-
-static int __init pb1550_dev_init(void)
-{
-        int swapped;
-
-        irq_set_irq_type(AU1550_GPIO0_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1550_GPIO1_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1550_GPIO201_205_INT, IRQF_TRIGGER_HIGH);
-
-        /* enable both PCMCIA card irqs in the shared line */
-        alchemy_gpio2_enable_int(201);
-        alchemy_gpio2_enable_int(202);
-
-        /* Pb1550, like all others, also has statuschange irqs; however they're
-        * wired up on one of the Au1550's shared GPIO201_205 line, which also
-        * services the PCMCIA card interrupts.  So we ignore statuschange and
-        * use the GPIO201_205 exclusively for card interrupts, since a) pcmcia
-        * drivers are used to shared irqs and b) statuschange isn't really use-
-        * ful anyway.
-        */
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
-                AU1550_GPIO201_205_INT, AU1550_GPIO0_INT, 0, 0, 0);
-
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008000000,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008000000,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008000000,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008010000 - 1,
-                AU1550_GPIO201_205_INT, AU1550_GPIO1_INT, 0, 0, 1);
-
-        /* NAND setup */
-        gpio_direction_input(206);      /* GPIO206 high */
-        pb1550_nand_setup();
-
-        swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_PB1550_SWAPBOOT;
-        db1x_register_norflash(128 * 1024 * 1024, 4, swapped);
-        platform_device_register(&pb1550_pci_host);
-        platform_device_register(&pb1550_i2c_dev);
-
-        return 0;
-}
-arch_initcall(pb1550_dev_init);
diff --git a/arch/mips/alchemy/devboards/platform.c b/arch/mips/alchemy/devboards/platform.c
index f39042e99d0d..8df86eb94972 100644
--- a/arch/mips/alchemy/devboards/platform.c
+++ b/arch/mips/alchemy/devboards/platform.c
@@ -36,11 +36,10 @@ void __init prom_init(void)
 
 void prom_putchar(unsigned char c)
 {
-#ifdef CONFIG_MIPS_DB1300
-        alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);
-#else
-        alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
-#endif
+        if (alchemy_get_cputype() == ALCHEMY_CPU_AU1300)
+                alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);
+        else
+                alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
 }
 
 
diff --git a/arch/mips/boot/compressed/uart-alchemy.c b/arch/mips/boot/compressed/uart-alchemy.c
index 3112df8f90db..4bee55b93f6a 100644
--- a/arch/mips/boot/compressed/uart-alchemy.c
+++ b/arch/mips/boot/compressed/uart-alchemy.c
@@ -2,9 +2,5 @@
 
 void putc(char c)
 {
-#ifdef CONFIG_MIPS_DB1300
-        alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);
-#else
         alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
-#endif
 }
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
deleted file mode 100644
index 1f69249b839a..000000000000
--- a/arch/mips/configs/db1200_defconfig
+++ /dev/null
@@ -1,170 +0,0 @@
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_DB1200=y
-CONFIG_KSM=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-# CONFIG_SECCOMP is not set
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-db1200"
-CONFIG_KERNEL_LZMA=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_PCCARD=y
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_MISC=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-# CONFIG_MISC_DEVICES is not set
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_IDE_TASK_IOCTL=y
-# CONFIG_IDE_PROC_FS is not set
-CONFIG_BLK_DEV_IDE_AU1XXX=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMC91X=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=2
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_AU1550=y
-CONFIG_SPI=y
-CONFIG_SPI_AU1550=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_SENSORS_ADM1025=y
-CONFIG_SENSORS_LM70=y
-CONFIG_FB=y
-CONFIG_FB_AU1200=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x16=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_DYNAMIC_MINORS=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_USB is not set
-# CONFIG_SND_PCMCIA is not set
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_AU1XPSC=y
-CONFIG_SND_SOC_DB1200=y
-CONFIG_HIDRAW=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_MMC=y
-# CONFIG_MMC_BLOCK_BOUNCE is not set
-CONFIG_MMC_AU1X=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_EFI_PARTITION=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_FTRACE is not set
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0,115200"
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITYFS=y
diff --git a/arch/mips/configs/db1235_defconfig b/arch/mips/configs/db1235_defconfig
new file mode 100644
index 000000000000..c48998ffd198
--- /dev/null
+++ b/arch/mips/configs/db1235_defconfig
@@ -0,0 +1,434 @@
+CONFIG_MIPS_ALCHEMY=y
+CONFIG_MIPS_DB1235=y
+CONFIG_COMPACTION=y
+CONFIG_KSM=y
+CONFIG_HZ_100=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCALVERSION="-db1235"
+CONFIG_KERNEL_LZMA=y
+CONFIG_DEFAULT_HOSTNAME="db1235"
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_FHANDLE=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_AUDIT=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=16
+CONFIG_NAMESPACES=y
+CONFIG_EMBEDDED=y
+CONFIG_SLAB=y
+CONFIG_JUMP_LABEL=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_LDM_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_PCI=y
+CONFIG_PCCARD=y
+CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
+CONFIG_PM_RUNTIME=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=y
+CONFIG_XFRM_USER=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_UDP_DIAG=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=y
+CONFIG_TCP_CONG_HYBLA=y
+CONFIG_TCP_CONG_SCALABLE=y
+CONFIG_TCP_CONG_LP=y
+CONFIG_TCP_CONG_VENO=y
+CONFIG_TCP_CONG_YEAH=y
+CONFIG_TCP_CONG_ILLINOIS=y
+CONFIG_DEFAULT_HYBLA=y
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_IPV6_MIP6=y
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_TUNNEL=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_IRC=y
+CONFIG_NF_CONNTRACK_NETBIOS_NS=y
+CONFIG_NF_CONNTRACK_SNMP=y
+CONFIG_NF_CONNTRACK_PPTP=y
+CONFIG_NF_CONNTRACK_SANE=y
+CONFIG_NF_CONNTRACK_SIP=y
+CONFIG_NF_CONNTRACK_TFTP=y
+CONFIG_NF_CT_NETLINK=y
+CONFIG_NF_CT_NETLINK_TIMEOUT=y
+CONFIG_NF_CT_NETLINK_HELPER=y
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_HMARK=y
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
+CONFIG_NETFILTER_XT_TARGET_LED=y
+CONFIG_NETFILTER_XT_TARGET_LOG=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+CONFIG_NETFILTER_XT_TARGET_TEE=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=y
+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_CPU=y
+CONFIG_NETFILTER_XT_MATCH_DCCP=y
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=y
+CONFIG_NETFILTER_XT_MATCH_DSCP=y
+CONFIG_NETFILTER_XT_MATCH_ESP=y
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_HELPER=y
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
+CONFIG_NETFILTER_XT_MATCH_LENGTH=y
+CONFIG_NETFILTER_XT_MATCH_LIMIT=y
+CONFIG_NETFILTER_XT_MATCH_MAC=y
+CONFIG_NETFILTER_XT_MATCH_MARK=y
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_NFACCT=y
+CONFIG_NETFILTER_XT_MATCH_OSF=y
+CONFIG_NETFILTER_XT_MATCH_OWNER=y
+CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA=y
+CONFIG_NETFILTER_XT_MATCH_RATEEST=y
+CONFIG_NETFILTER_XT_MATCH_REALM=y
+CONFIG_NETFILTER_XT_MATCH_RECENT=y
+CONFIG_NETFILTER_XT_MATCH_SCTP=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
+CONFIG_NETFILTER_XT_MATCH_STRING=y
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
+CONFIG_NETFILTER_XT_MATCH_TIME=y
+CONFIG_NETFILTER_XT_MATCH_U32=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_AH=y
+CONFIG_IP_NF_MATCH_ECN=y
+CONFIG_IP_NF_MATCH_RPFILTER=y
+CONFIG_IP_NF_MATCH_TTL=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_ULOG=y
+CONFIG_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_TARGET_CLUSTERIP=y
+CONFIG_IP_NF_TARGET_ECN=y
+CONFIG_IP_NF_TARGET_TTL=y
+CONFIG_IP_NF_RAW=y
+CONFIG_IP_NF_ARPTABLES=y
+CONFIG_IP_NF_ARPFILTER=y
+CONFIG_IP_NF_ARP_MANGLE=y
+CONFIG_NF_CONNTRACK_IPV6=y
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_MATCH_AH=y
+CONFIG_IP6_NF_MATCH_EUI64=y
+CONFIG_IP6_NF_MATCH_FRAG=y
+CONFIG_IP6_NF_MATCH_OPTS=y
+CONFIG_IP6_NF_MATCH_HL=y
+CONFIG_IP6_NF_MATCH_IPV6HEADER=y
+CONFIG_IP6_NF_MATCH_MH=y
+CONFIG_IP6_NF_MATCH_RPFILTER=y
+CONFIG_IP6_NF_MATCH_RT=y
+CONFIG_IP6_NF_TARGET_HL=y
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_TARGET_REJECT=y
+CONFIG_IP6_NF_MANGLE=y
+CONFIG_IP6_NF_RAW=y
+CONFIG_BRIDGE_NF_EBTABLES=y
+CONFIG_BRIDGE_EBT_BROUTE=y
+CONFIG_BRIDGE_EBT_T_FILTER=y
+CONFIG_BRIDGE_EBT_T_NAT=y
+CONFIG_BRIDGE_EBT_802_3=y
+CONFIG_BRIDGE_EBT_AMONG=y
+CONFIG_BRIDGE_EBT_ARP=y
+CONFIG_BRIDGE_EBT_IP=y
+CONFIG_BRIDGE_EBT_IP6=y
+CONFIG_BRIDGE_EBT_LIMIT=y
+CONFIG_BRIDGE_EBT_MARK=y
+CONFIG_BRIDGE_EBT_PKTTYPE=y
+CONFIG_BRIDGE_EBT_STP=y
+CONFIG_BRIDGE_EBT_VLAN=y
+CONFIG_BRIDGE_EBT_ARPREPLY=y
+CONFIG_BRIDGE_EBT_DNAT=y
+CONFIG_BRIDGE_EBT_MARK_T=y
+CONFIG_BRIDGE_EBT_REDIRECT=y
+CONFIG_BRIDGE_EBT_SNAT=y
+CONFIG_BRIDGE_EBT_LOG=y
+CONFIG_BRIDGE_EBT_NFLOG=y
+CONFIG_L2TP=y
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=y
+CONFIG_L2TP_ETH=y
+CONFIG_BRIDGE=y
+CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_LLC2=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_HFSC=y
+CONFIG_NET_SCH_PRIO=y
+CONFIG_NET_SCH_MULTIQ=y
+CONFIG_NET_SCH_RED=y
+CONFIG_NET_SCH_SFB=y
+CONFIG_NET_SCH_SFQ=y
+CONFIG_NET_SCH_TEQL=y
+CONFIG_NET_SCH_TBF=y
+CONFIG_NET_SCH_GRED=y
+CONFIG_NET_SCH_DSMARK=y
+CONFIG_NET_SCH_NETEM=y
+CONFIG_NET_SCH_DRR=y
+CONFIG_NET_SCH_MQPRIO=y
+CONFIG_NET_SCH_CHOKE=y
+CONFIG_NET_SCH_QFQ=y
+CONFIG_NET_SCH_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_SCH_PLUG=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_TCINDEX=y
+CONFIG_NET_CLS_ROUTE4=y
+CONFIG_NET_CLS_FW=y
+CONFIG_NET_CLS_U32=y
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=y
+CONFIG_NET_CLS_RSVP6=y
+CONFIG_NET_CLS_FLOW=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=y
+CONFIG_NET_EMATCH_NBYTE=y
+CONFIG_NET_EMATCH_U32=y
+CONFIG_NET_EMATCH_META=y
+CONFIG_NET_EMATCH_TEXT=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=y
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=y
+CONFIG_NET_ACT_NAT=y
+CONFIG_NET_ACT_PEDIT=y
+CONFIG_NET_ACT_SIMP=y
+CONFIG_NET_ACT_SKBEDIT=y
+CONFIG_NET_ACT_CSUM=y
+CONFIG_NET_CLS_IND=y
+CONFIG_BT=y
+CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=y
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=y
+CONFIG_BT_HCIBTUSB=y
+CONFIG_CFG80211=y
+CONFIG_CFG80211_CERTIFICATION_ONUS=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_PLATFORM=y
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE_AU1XXX=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_ATA=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_PCMCIA=y
+CONFIG_PATA_PLATFORM=y
+CONFIG_NETDEVICES=y
+CONFIG_MIPS_AU1X00_ENET=y
+CONFIG_SMC91X=y
+CONFIG_SMSC911X=y
+CONFIG_AMD_PHY=y
+CONFIG_SMSC_PHY=y
+CONFIG_RT2X00=y
+CONFIG_RT73USB=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_WM97XX=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_TTY_PRINTK=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_AU1550=y
+CONFIG_SPI=y
+CONFIG_SPI_AU1550=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_SENSORS_ADM1025=y
+CONFIG_SENSORS_LM70=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_HRTIMER=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_AU1XPSC=y
+CONFIG_SND_SOC_DB1200=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=y
+CONFIG_USB_HIDDEV=y
+CONFIG_USB=y
+CONFIG_USB_DYNAMIC_MINORS=y
+CONFIG_USB_SUSPEND=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_MMC=y
+CONFIG_MMC_CLKGATE=y
+CONFIG_MMC_AU1X=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_AU1XXX=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_XFS_FS=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_CODEPAGE_852=y
+CONFIG_NLS_CODEPAGE_1250=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_NLS_UTF8=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_SECURITYFS=y
+CONFIG_CRYPTO_USER=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=y
+CONFIG_CRYPTO_RMD160=y
+CONFIG_CRYPTO_RMD256=y
+CONFIG_CRYPTO_RMD320=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=y
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_ZLIB=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
diff --git a/arch/mips/configs/db1300_defconfig b/arch/mips/configs/db1300_defconfig
deleted file mode 100644
index 3590ab5d9791..000000000000
--- a/arch/mips/configs/db1300_defconfig
+++ /dev/null
@@ -1,391 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_ALCHEMY_GPIOINT_AU1300=y
-CONFIG_MIPS_DB1300=y
-CONFIG_SOC_AU1300=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_DMA_COHERENT=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_IRQ_CPU=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-CONFIG_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_ZBOOT=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPSR1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_32BIT=y
-CONFIG_PAGE_SIZE_4KB=y
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_MIPS_MT_DISABLED=y
-CONFIG_64BIT_PHYS_ADDR=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_NEED_PER_CPU_KM=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_HZ_100=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=100
-CONFIG_PREEMPT_NONE=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-CONFIG_HAVE_IRQ_WORK=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-db1300"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_KERNEL_LZMA=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_FHANDLE=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_EMBEDDED=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_SLAB=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-# CONFIG_UNINLINE_SPIN_UNLOCK is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_MMU=y
-CONFIG_PCCARD=y
-CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_BINFMT_ELF=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_TRAD_SIGNALS=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_INET_TUNNEL=y
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_IPV6=y
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-CONFIG_IPV6_SIT=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_IDE_TASK_IOCTL=y
-CONFIG_IDE_PROC_FS=y
-CONFIG_BLK_DEV_PLATFORM=y
-CONFIG_SCSI_MOD=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_PHYLIB=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMSC911X=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_WM97XX=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_SMBUS=y
-CONFIG_I2C_AU1550=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_AU1550=y
-CONFIG_SPI_BITBANG=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=y
-CONFIG_SENSORS_ADM1025=y
-CONFIG_FB=y
-CONFIG_FB_AU1200=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_ACORN_8x8=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_JACK=y
-CONFIG_SND_HRTIMER=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VERBOSE_PRINTK=y
-CONFIG_SND_VMASTER=y
-CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_AU1XPSC=y
-CONFIG_SND_SOC_AU1XPSC_I2S=y
-CONFIG_SND_SOC_AU1XPSC_AC97=y
-CONFIG_SND_SOC_DB1300=y
-CONFIG_SND_SOC_I2C_AND_SPI=y
-CONFIG_SND_SOC_WM8731=y
-CONFIG_SND_SOC_WM9712=y
-CONFIG_AC97_BUS=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-CONFIG_HIDRAW=y
-CONFIG_USB_HID=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_GENERIC_ACL=y
-CONFIG_FAT_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_JFFS2_CMODE_PRIORITY=y
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="video=au1200fb:panel:bs console=tty console=ttyS2,115200"
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_CRYPTO=y
-CONFIG_BITREVERSE=y
-CONFIG_CRC32=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_NLATTR=y
-CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
deleted file mode 100644
index 36cda27725e7..000000000000
--- a/arch/mips/configs/db1550_defconfig
+++ /dev/null
@@ -1,285 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_DB1550=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-CONFIG_HZ=100
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="-db1550"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_KERNEL_LZMA=y
-CONFIG_DEFAULT_HOSTNAME="db1550"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_FHANDLE=y
-CONFIG_AUDIT=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_EXPERT=y
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_EMBEDDED=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLAB=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-CONFIG_PCI=y
-CONFIG_PCCARD=y
-CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_BINFMT_ELF=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_MISC=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_INET_TUNNEL=y
-CONFIG_INET_LRO=y
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_IPV6=y
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-CONFIG_IPV6_SIT=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_DNS_RESOLVER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_MISC_DEVICES=y
-CONFIG_EEPROM_AT24=y
-CONFIG_SCSI_MOD=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_ATA=y
-CONFIG_ATA_SFF=y
-CONFIG_ATA_BMDMA=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_PCMCIA=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_PHYLIB=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MIPS_AU1X00_ENET=y
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=y
-CONFIG_PCMCIA_PCNET=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_DEVKMEM=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_DEVPORT=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_AU1550=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_AU1550=y
-CONFIG_SPI_BITBANG=y
-CONFIG_HWMON=y
-CONFIG_SENSORS_ADM1025=y
-CONFIG_SENSORS_LM70=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_JACK=y
-CONFIG_SND_VMASTER=y
-CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_AU1XPSC=y
-CONFIG_SND_SOC_AU1XPSC_I2S=y
-CONFIG_SND_SOC_AU1XPSC_AC97=y
-CONFIG_SND_SOC_DB1200=y
-CONFIG_SND_SOC_I2C_AND_SPI=y
-CONFIG_SND_SOC_AC97_CODEC=y
-CONFIG_SND_SOC_WM8731=y
-CONFIG_SND_SOC_WM9712=y
-CONFIG_AC97_BUS=y
-CONFIG_USB=y
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_JBD2=y
-CONFIG_FS_MBCACHE=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_JFFS2_CMODE_PRIORITY=y
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_V4_1=y
-CONFIG_PNFS_FILE_LAYOUT=y
-CONFIG_PNFS_BLOCK=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_USE_NEW_IDMAPPER=y
-CONFIG_NFSD=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_FRAME_WARN=1024
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="noirqdebug console=ttyS0,115200 root=/dev/sda1 rootfstype=ext4"
-CONFIG_KEYS=y
-CONFIG_SECURITYFS=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_BITREVERSE=y
-CONFIG_CRC16=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_BCH=y
-CONFIG_NLATTR=y
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
deleted file mode 100644
index 75eb1b1f316c..000000000000
--- a/arch/mips/configs/pb1100_defconfig
+++ /dev/null
@@ -1,124 +0,0 @@
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_PB1100=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-# CONFIG_SECCOMP is not set
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-pb1100"
-CONFIG_KERNEL_LZMA=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_PCCARD=y
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_PM=y
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-# CONFIG_MISC_DEVICES is not set
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_IDE_TASK_IOCTL=y
-# CONFIG_IDE_PROC_FS is not set
-CONFIG_NETDEVICES=y
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_NATIONAL_PHY=y
-CONFIG_STE10XP=y
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MIPS_AU1X00_ENET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_HIDRAW=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-# CONFIG_JFFS2_FS_POSIX_ACL is not set
-# CONFIG_JFFS2_FS_SECURITY is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITYFS=y
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
deleted file mode 100644
index fa00487146f8..000000000000
--- a/arch/mips/configs/pb1500_defconfig
+++ /dev/null
@@ -1,141 +0,0 @@
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_PB1500=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-# CONFIG_SECCOMP is not set
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-pb1500"
-CONFIG_KERNEL_LZMA=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_PCI=y
-CONFIG_PCCARD=y
-# CONFIG_CARDBUS is not set
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_PM=y
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-# CONFIG_MISC_DEVICES is not set
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_IDE_TASK_IOCTL=y
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_NETDEVICES=y
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_NATIONAL_PHY=y
-CONFIG_STE10XP=y
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MIPS_AU1X00_ENET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_PCI is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_VGA_ARB is not set
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FB_S1D13XXX=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITYFS=y
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
deleted file mode 100644
index e83d6497e8b4..000000000000
--- a/arch/mips/configs/pb1550_defconfig
+++ /dev/null
@@ -1,145 +0,0 @@
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_PB1550=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-# CONFIG_SECCOMP is not set
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-pb1550"
-CONFIG_KERNEL_LZMA=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_PCI=y
-CONFIG_PCCARD=y
-# CONFIG_CARDBUS is not set
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_PM=y
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_AU1550=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-# CONFIG_MISC_DEVICES is not set
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_BLK_DEV_IDECD=y
-# CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS is not set
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_NETDEVICES=y
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_NATIONAL_PHY=y
-CONFIG_STE10XP=y
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MIPS_AU1X00_ENET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_PCI is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_AU1550=y
-# CONFIG_HWMON is not set
-# CONFIG_VGA_ARB is not set
-CONFIG_HIDRAW=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITYFS=y
diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index f53f9ca73996..e69de29bb2d1 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -1,5 +0,0 @@
-include include/asm-generic/Kbuild.asm
-
-header-y += cachectl.h
-header-y += sgidefs.h
-header-y += sysmips.h
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
index 3f4c5cb6433e..01cc6ba64831 100644
--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
@@ -59,8 +59,8 @@ static __inline__ void atomic_add(int i, atomic_t * v)
                 "       sc      %0, %1                                  \n"
                 "       beqzl   %0, 1b                                  \n"
                 "       .set    mips0                                   \n"
-                : "=&r" (temp), "=m" (v->counter)
-                : "Ir" (i), "m" (v->counter));
+                : "=&r" (temp), "+m" (v->counter)
+                : "Ir" (i));
         } else if (kernel_uses_llsc) {
                 int temp;
 
@@ -71,8 +71,8 @@ static __inline__ void atomic_add(int i, atomic_t * v)
                         "       addu    %0, %2                          \n"
                         "       sc      %0, %1                          \n"
                         "       .set    mips0                           \n"
-                        : "=&r" (temp), "=m" (v->counter)
-                        : "Ir" (i), "m" (v->counter));
+                        : "=&r" (temp), "+m" (v->counter)
+                        : "Ir" (i));
                 } while (unlikely(!temp));
         } else {
                 unsigned long flags;
@@ -102,8 +102,8 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
                 "       sc      %0, %1                                  \n"
                 "       beqzl   %0, 1b                                  \n"
                 "       .set    mips0                                   \n"
-                : "=&r" (temp), "=m" (v->counter)
-                : "Ir" (i), "m" (v->counter));
+                : "=&r" (temp), "+m" (v->counter)
+                : "Ir" (i));
         } else if (kernel_uses_llsc) {
                 int temp;
 
@@ -114,8 +114,8 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
                         "       subu    %0, %2                          \n"
                         "       sc      %0, %1                          \n"
                         "       .set    mips0                           \n"
-                        : "=&r" (temp), "=m" (v->counter)
-                        : "Ir" (i), "m" (v->counter));
+                        : "=&r" (temp), "+m" (v->counter)
+                        : "Ir" (i));
                 } while (unlikely(!temp));
         } else {
                 unsigned long flags;
@@ -146,9 +146,8 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
                 "       beqzl   %0, 1b                                  \n"
                 "       addu    %0, %1, %3                              \n"
                 "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-                : "Ir" (i), "m" (v->counter)
-                : "memory");
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
+                : "Ir" (i));
         } else if (kernel_uses_llsc) {
                 int temp;
 
@@ -159,9 +158,8 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
                         "       addu    %0, %1, %3                      \n"
                         "       sc      %0, %2                          \n"
                         "       .set    mips0                           \n"
-                        : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-                        : "Ir" (i), "m" (v->counter)
-                        : "memory");
+                        : "=&r" (result), "=&r" (temp), "+m" (v->counter)
+                        : "Ir" (i));
                 } while (unlikely(!result));
 
                 result = temp + i;
@@ -212,9 +210,8 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
                         "       subu    %0, %1, %3                      \n"
                         "       sc      %0, %2                          \n"
                         "       .set    mips0                           \n"
-                        : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-                        : "Ir" (i), "m" (v->counter)
-                        : "memory");
+                        : "=&r" (result), "=&r" (temp), "+m" (v->counter)
+                        : "Ir" (i));
                 } while (unlikely(!result));
 
                 result = temp - i;
@@ -262,7 +259,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
                 "       .set    reorder                                 \n"
                 "1:                                                     \n"
                 "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
                 : "Ir" (i), "m" (v->counter)
                 : "memory");
         } else if (kernel_uses_llsc) {
@@ -280,9 +277,8 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
                 "       .set    reorder                                 \n"
                 "1:                                                     \n"
                 "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-                : "Ir" (i), "m" (v->counter)
-                : "memory");
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
+                : "Ir" (i));
         } else {
                 unsigned long flags;
 
@@ -430,8 +426,8 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
                 "       scd     %0, %1                                  \n"
                 "       beqzl   %0, 1b                                  \n"
                 "       .set    mips0                                   \n"
-                : "=&r" (temp), "=m" (v->counter)
-                : "Ir" (i), "m" (v->counter));
+                : "=&r" (temp), "+m" (v->counter)
+                : "Ir" (i));
         } else if (kernel_uses_llsc) {
                 long temp;
 
@@ -442,8 +438,8 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
                         "       daddu   %0, %2                          \n"
                         "       scd     %0, %1                          \n"
                         "       .set    mips0                           \n"
-                        : "=&r" (temp), "=m" (v->counter)
-                        : "Ir" (i), "m" (v->counter));
+                        : "=&r" (temp), "+m" (v->counter)
+                        : "Ir" (i));
                 } while (unlikely(!temp));
         } else {
                 unsigned long flags;
@@ -473,8 +469,8 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
                 "       scd     %0, %1                                  \n"
                 "       beqzl   %0, 1b                                  \n"
                 "       .set    mips0                                   \n"
-                : "=&r" (temp), "=m" (v->counter)
-                : "Ir" (i), "m" (v->counter));
+                : "=&r" (temp), "+m" (v->counter)
+                : "Ir" (i));
         } else if (kernel_uses_llsc) {
                 long temp;
 
@@ -485,8 +481,8 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
                         "       dsubu   %0, %2                          \n"
                         "       scd     %0, %1                          \n"
                         "       .set    mips0                           \n"
-                        : "=&r" (temp), "=m" (v->counter)
-                        : "Ir" (i), "m" (v->counter));
+                        : "=&r" (temp), "+m" (v->counter)
+                        : "Ir" (i));
                 } while (unlikely(!temp));
         } else {
                 unsigned long flags;
@@ -517,9 +513,8 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
                 "       beqzl   %0, 1b                                  \n"
                 "       daddu   %0, %1, %3                              \n"
                 "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-                : "Ir" (i), "m" (v->counter)
-                : "memory");
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
+                : "Ir" (i));
         } else if (kernel_uses_llsc) {
                 long temp;
 
@@ -649,9 +644,8 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
                 "       .set    reorder                                 \n"
                 "1:                                                     \n"
                 "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-                : "Ir" (i), "m" (v->counter)
-                : "memory");
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
+                : "Ir" (i));
         } else {
                 unsigned long flags;
 
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index 63002a240c73..c507b931b484 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -171,6 +171,10 @@
 #define cpu_has_dsp             (cpu_data[0].ases & MIPS_ASE_DSP)
 #endif
 
+#ifndef cpu_has_dsp2
+#define cpu_has_dsp2            (cpu_data[0].ases & MIPS_ASE_DSP2P)
+#endif
+
 #ifndef cpu_has_mipsmt
 #define cpu_has_mipsmt          (cpu_data[0].ases & MIPS_ASE_MIPSMT)
 #endif
@@ -252,4 +256,8 @@
 #define cpu_hwrena_impl_bits            0
 #endif
 
+#ifndef cpu_has_perf_cntr_intr_bit
+#define cpu_has_perf_cntr_intr_bit      (cpu_data[0].options & MIPS_CPU_PCI)
+#endif
+
 #endif /* __ASM_CPU_FEATURES_H */
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 554e2d29965d..52c4e914f95a 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -320,7 +320,8 @@ enum cpu_type_enum {
 #define MIPS_CPU_VINT           0x00080000 /* CPU supports MIPSR2 vectored interrupts */
 #define MIPS_CPU_VEIC           0x00100000 /* CPU supports MIPSR2 external interrupt controller mode */
 #define MIPS_CPU_ULRI           0x00200000 /* CPU has ULRI feature */
-#define MIPS_CPU_RIXI           0x00400000 /* CPU has TLB Read/eXec Inhibit */
+#define MIPS_CPU_PCI            0x00400000 /* CPU has Perf Ctr Int indicator */
+#define MIPS_CPU_RIXI           0x00800000 /* CPU has TLB Read/eXec Inhibit */
 
 /*
  * CPU ASE encodings
@@ -331,6 +332,7 @@ enum cpu_type_enum {
 #define MIPS_ASE_SMARTMIPS      0x00000008 /* SmartMIPS */
 #define MIPS_ASE_DSP            0x00000010 /* Signal Processing ASE */
 #define MIPS_ASE_MIPSMT         0x00000020 /* CPU supports MIPS MT */
+#define MIPS_ASE_DSP2P          0x00000040 /* Signal Processing ASE Rev 2 */
 
 
 #endif /* _ASM_CPU_H */
diff --git a/arch/mips/include/asm/errno.h b/arch/mips/include/asm/errno.h
index 6dcd3583ed04..21d91cdfe3c9 100644
--- a/arch/mips/include/asm/errno.h
+++ b/arch/mips/include/asm/errno.h
@@ -8,128 +8,10 @@
 #ifndef _ASM_ERRNO_H
 #define _ASM_ERRNO_H
 
-/*
- * These error numbers are intended to be MIPS ABI compatible
- */
-
-#include <asm-generic/errno-base.h>
-
-#define ENOMSG          35      /* No message of desired type */
-#define EIDRM           36      /* Identifier removed */
-#define ECHRNG          37      /* Channel number out of range */
-#define EL2NSYNC        38      /* Level 2 not synchronized */
-#define EL3HLT          39      /* Level 3 halted */
-#define EL3RST          40      /* Level 3 reset */
-#define ELNRNG          41      /* Link number out of range */
-#define EUNATCH         42      /* Protocol driver not attached */
-#define ENOCSI          43      /* No CSI structure available */
-#define EL2HLT          44      /* Level 2 halted */
-#define EDEADLK         45      /* Resource deadlock would occur */
-#define ENOLCK          46      /* No record locks available */
-#define EBADE           50      /* Invalid exchange */
-#define EBADR           51      /* Invalid request descriptor */
-#define EXFULL          52      /* Exchange full */
-#define ENOANO          53      /* No anode */
-#define EBADRQC         54      /* Invalid request code */
-#define EBADSLT         55      /* Invalid slot */
-#define EDEADLOCK       56      /* File locking deadlock error */
-#define EBFONT          59      /* Bad font file format */
-#define ENOSTR          60      /* Device not a stream */
-#define ENODATA         61      /* No data available */
-#define ETIME           62      /* Timer expired */
-#define ENOSR           63      /* Out of streams resources */
-#define ENONET          64      /* Machine is not on the network */
-#define ENOPKG          65      /* Package not installed */
-#define EREMOTE         66      /* Object is remote */
-#define ENOLINK         67      /* Link has been severed */
-#define EADV            68      /* Advertise error */
-#define ESRMNT          69      /* Srmount error */
-#define ECOMM           70      /* Communication error on send */
-#define EPROTO          71      /* Protocol error */
-#define EDOTDOT         73      /* RFS specific error */
-#define EMULTIHOP       74      /* Multihop attempted */
-#define EBADMSG         77      /* Not a data message */
-#define ENAMETOOLONG    78      /* File name too long */
-#define EOVERFLOW       79      /* Value too large for defined data type */
-#define ENOTUNIQ        80      /* Name not unique on network */
-#define EBADFD          81      /* File descriptor in bad state */
-#define EREMCHG         82      /* Remote address changed */
-#define ELIBACC         83      /* Can not access a needed shared library */
-#define ELIBBAD         84      /* Accessing a corrupted shared library */
-#define ELIBSCN         85      /* .lib section in a.out corrupted */
-#define ELIBMAX         86      /* Attempting to link in too many shared libraries */
-#define ELIBEXEC        87      /* Cannot exec a shared library directly */
-#define EILSEQ          88      /* Illegal byte sequence */
-#define ENOSYS          89      /* Function not implemented */
-#define ELOOP           90      /* Too many symbolic links encountered */
-#define ERESTART        91      /* Interrupted system call should be restarted */
-#define ESTRPIPE        92      /* Streams pipe error */
-#define ENOTEMPTY       93      /* Directory not empty */
-#define EUSERS          94      /* Too many users */
-#define ENOTSOCK        95      /* Socket operation on non-socket */
-#define EDESTADDRREQ    96      /* Destination address required */
-#define EMSGSIZE        97      /* Message too long */
-#define EPROTOTYPE      98      /* Protocol wrong type for socket */
-#define ENOPROTOOPT     99      /* Protocol not available */
-#define EPROTONOSUPPORT 120     /* Protocol not supported */
-#define ESOCKTNOSUPPORT 121     /* Socket type not supported */
-#define EOPNOTSUPP      122     /* Operation not supported on transport endpoint */
-#define EPFNOSUPPORT    123     /* Protocol family not supported */
-#define EAFNOSUPPORT    124     /* Address family not supported by protocol */
-#define EADDRINUSE      125     /* Address already in use */
-#define EADDRNOTAVAIL   126     /* Cannot assign requested address */
-#define ENETDOWN        127     /* Network is down */
-#define ENETUNREACH     128     /* Network is unreachable */
-#define ENETRESET       129     /* Network dropped connection because of reset */
-#define ECONNABORTED    130     /* Software caused connection abort */
-#define ECONNRESET      131     /* Connection reset by peer */
-#define ENOBUFS         132     /* No buffer space available */
-#define EISCONN         133     /* Transport endpoint is already connected */
-#define ENOTCONN        134     /* Transport endpoint is not connected */
-#define EUCLEAN         135     /* Structure needs cleaning */
-#define ENOTNAM         137     /* Not a XENIX named type file */
-#define ENAVAIL         138     /* No XENIX semaphores available */
-#define EISNAM          139     /* Is a named type file */
-#define EREMOTEIO       140     /* Remote I/O error */
-#define EINIT           141     /* Reserved */
-#define EREMDEV         142     /* Error 142 */
-#define ESHUTDOWN       143     /* Cannot send after transport endpoint shutdown */
-#define ETOOMANYREFS    144     /* Too many references: cannot splice */
-#define ETIMEDOUT       145     /* Connection timed out */
-#define ECONNREFUSED    146     /* Connection refused */
-#define EHOSTDOWN       147     /* Host is down */
-#define EHOSTUNREACH    148     /* No route to host */
-#define EWOULDBLOCK     EAGAIN  /* Operation would block */
-#define EALREADY        149     /* Operation already in progress */
-#define EINPROGRESS     150     /* Operation now in progress */
-#define ESTALE          151     /* Stale NFS file handle */
-#define ECANCELED       158     /* AIO operation canceled */
-
-/*
- * These error are Linux extensions.
- */
-#define ENOMEDIUM       159     /* No medium found */
-#define EMEDIUMTYPE     160     /* Wrong medium type */
-#define ENOKEY          161     /* Required key not available */
-#define EKEYEXPIRED     162     /* Key has expired */
-#define EKEYREVOKED     163     /* Key has been revoked */
-#define EKEYREJECTED    164     /* Key was rejected by service */
-
-/* for robust mutexes */
-#define EOWNERDEAD      165     /* Owner died */
-#define ENOTRECOVERABLE 166     /* State not recoverable */
-
-#define ERFKILL         167     /* Operation not possible due to RF-kill */
+#include <uapi/asm/errno.h>
 
-#define EHWPOISON       168     /* Memory page has hardware error */
-
-#define EDQUOT          1133    /* Quota exceeded */
-
-#ifdef __KERNEL__
 
 /* The biggest error number defined here or in <linux/errno.h>. */
 #define EMAXERRNO       1133
 
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_ERRNO_H */
diff --git a/arch/mips/include/asm/kspd.h b/arch/mips/include/asm/kspd.h
index 4e9e724c8935..ec6832950ace 100644
--- a/arch/mips/include/asm/kspd.h
+++ b/arch/mips/include/asm/kspd.h
@@ -25,12 +25,8 @@ struct kspd_notifications {
         struct list_head list;
 };
 
-#ifdef CONFIG_MIPS_APSP_KSPD
-extern void kspd_notify(struct kspd_notifications *notify);
-#else
 static inline void kspd_notify(struct kspd_notifications *notify)
 {
 }
-#endif
 
 #endif
diff --git a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
index 6ddae926bf79..ea4b66dccf6e 100644
--- a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
@@ -42,6 +42,8 @@
 #define cpu_has_mips64r1        0
 #define cpu_has_mips64r2        0
 
+#define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 
 #define cpu_has_64bits          0
diff --git a/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h b/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h
index 3f741af37d47..09f45e6afade 100644
--- a/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h
@@ -37,6 +37,7 @@
 #define cpu_has_mips64r1                0
 #define cpu_has_mips64r2                0
 #define cpu_has_dsp                     0
+#define cpu_has_dsp2                    0
 #define cpu_has_mipsmt                  0
 #define cpu_has_userlocal               0
 #define cpu_has_nofpuex                 0
diff --git a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
index f453c01d0672..e9c408e8ff4c 100644
--- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
@@ -37,6 +37,7 @@
 #define cpu_has_mips64r2                0
 
 #define cpu_has_dsp                     0
+#define cpu_has_dsp2                    0
 #define cpu_has_mipsmt                  0
 #define cpu_has_userlocal               0
 
diff --git a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
index 375ad0c815fe..94ed063eec92 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
@@ -53,6 +53,7 @@
 #define cpu_has_mips64r2        1
 #define cpu_has_mips_r2_exec_hazard 0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_vint            0
 #define cpu_has_veic            0
diff --git a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
index b3314cf53194..babc8374e378 100644
--- a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
@@ -45,6 +45,7 @@
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_icache_snoops_remote_store  0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
 
diff --git a/arch/mips/include/asm/mach-db1x00/bcsr.h b/arch/mips/include/asm/mach-db1x00/bcsr.h
index bb9fc23d853a..16f1cf5982b9 100644
--- a/arch/mips/include/asm/mach-db1x00/bcsr.h
+++ b/arch/mips/include/asm/mach-db1x00/bcsr.h
@@ -162,6 +162,8 @@ enum bcsr_whoami_boards {
 #define BCSR_BOARD_PCIEXTARB            0x0200
 #define BCSR_BOARD_GPIO200RST           0x0400
 #define BCSR_BOARD_PCICLKOUT            0x0800
+#define BCSR_BOARD_PB1100_SD0PWR        0x0400
+#define BCSR_BOARD_PB1100_SD1PWR        0x0800
 #define BCSR_BOARD_PCICFG               0x1000
 #define BCSR_BOARD_SPISEL               0x2000  /* PB/DB1550 */
 #define BCSR_BOARD_SD0WP                0x4000  /* DB1100 */
diff --git a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
index 9c8735158da1..f4caacd25552 100644
--- a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
@@ -30,6 +30,7 @@
 #define cpu_has_ic_fills_f_dc   0
 
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
 
diff --git a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
index 7d3112b148d9..1d2b6ff60d33 100644
--- a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
@@ -26,6 +26,7 @@
 #define cpu_has_dc_aliases      0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_icache_snoops_remote_store  1
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
diff --git a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
index 9a53b326f848..50d344ca60a8 100644
--- a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
@@ -27,6 +27,7 @@
 #define cpu_has_dc_aliases      0 /* see probe_pcache() */
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_icache_snoops_remote_store  1
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
diff --git a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
index 6782fccebe8d..2e1ec6cfedd5 100644
--- a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
@@ -37,6 +37,7 @@
 #define cpu_has_vtag_icache     0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_4k_cache        1
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
diff --git a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h b/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h
index d12e5c6477b9..a225baaa215d 100644
--- a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h
@@ -38,6 +38,7 @@
 #define cpu_has_mips64r1        0
 #define cpu_has_mips64r2        0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
 #define cpu_has_nofpuex 0
diff --git a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
index 675bd8641d5a..1a05d854e34c 100644
--- a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
@@ -32,6 +32,7 @@
 #define cpu_has_dc_aliases      (PAGE_SIZE < 0x4000)
 #define cpu_has_divec           0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_ejtag           0
 #define cpu_has_fpu             1
 #define cpu_has_ic_fills_f_dc   0
diff --git a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h
index 966db4be377c..091deb1700e5 100644
--- a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h
@@ -26,6 +26,7 @@
 #define cpu_has_vtag_icache     0
 #define cpu_has_ic_fills_f_dc   1
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_icache_snoops_remote_store  1
 
diff --git a/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h b/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
index f751e3ec56fb..58c76ec32a19 100644
--- a/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
@@ -45,6 +45,7 @@
 #define cpu_has_mips64r1                0
 #define cpu_has_mips64r2                0
 #define cpu_has_dsp                     0
+#define cpu_has_dsp2                    0
 #define cpu_has_mipsmt                  0
 #define cpu_has_userlocal               0
 #define cpu_has_nofpuex                 0
diff --git a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
index c3e4d3a4c95d..b15307597ee3 100644
--- a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
@@ -60,6 +60,7 @@
 #define cpu_has_mips64r2                0
 
 #define cpu_has_dsp                     0
+#define cpu_has_dsp2                    0
 #define cpu_has_mipsmt                  0
 
 /* #define cpu_has_nofpuex              ? */
diff --git a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
index ccf543363537..f095c529c48c 100644
--- a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
@@ -30,6 +30,7 @@
 #define cpu_has_dc_aliases      (PAGE_SIZE < 0x4000)
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_nofpuex         0
 #define cpu_has_64bits          1
 #define cpu_has_mipsmt          0
diff --git a/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h b/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h
index 1c1f92415b9a..92927b62b5a0 100644
--- a/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h
@@ -26,6 +26,7 @@
 #define cpu_has_dc_aliases      0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
 #define cpu_icache_snoops_remote_store  0
diff --git a/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
index 275eaf92c748..7f5144c6ce2d 100644
--- a/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
@@ -12,6 +12,7 @@
 #define cpu_has_vtag_icache     0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp     0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt  0
 #define cpu_has_userlocal       0
 
diff --git a/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h b/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h
index 470e5e9e10d6..56bdd3298600 100644
--- a/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h
@@ -26,6 +26,7 @@
 #define cpu_has_dc_aliases      0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
 #define cpu_icache_snoops_remote_store  0
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 528fda1e957c..eb742895dcbe 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -458,6 +458,8 @@
 #define  CAUSEF_IP7             (_ULCAST_(1)   << 15)
 #define  CAUSEB_IV              23
 #define  CAUSEF_IV              (_ULCAST_(1)   << 23)
+#define  CAUSEB_PCI             26
+#define  CAUSEF_PCI             (_ULCAST_(1)   << 26)
 #define  CAUSEB_CE              28
 #define  CAUSEF_CE              (_ULCAST_(3)   << 28)
 #define  CAUSEB_TI              30
@@ -590,6 +592,7 @@
 #define MIPS_CONF3_VEIC         (_ULCAST_(1) <<  6)
 #define MIPS_CONF3_LPA          (_ULCAST_(1) <<  7)
 #define MIPS_CONF3_DSP          (_ULCAST_(1) << 10)
+#define MIPS_CONF3_DSP2P        (_ULCAST_(1) << 11)
 #define MIPS_CONF3_RXI          (_ULCAST_(1) << 12)
 #define MIPS_CONF3_ULRI         (_ULCAST_(1) << 13)
 
diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h
index dca8bce8c7ab..26137da1c713 100644
--- a/arch/mips/include/asm/module.h
+++ b/arch/mips/include/asm/module.h
@@ -35,11 +35,14 @@ typedef struct {
 } Elf64_Mips_Rela;
 
 #ifdef CONFIG_32BIT
-
 #define Elf_Shdr        Elf32_Shdr
 #define Elf_Sym         Elf32_Sym
 #define Elf_Ehdr        Elf32_Ehdr
 #define Elf_Addr        Elf32_Addr
+#define Elf_Rel         Elf32_Rel
+#define Elf_Rela        Elf32_Rela
+#define ELF_R_TYPE(X)   ELF32_R_TYPE(X)
+#define ELF_R_SYM(X)    ELF32_R_SYM(X)
 
 #define Elf_Mips_Rel    Elf32_Rel
 #define Elf_Mips_Rela   Elf32_Rela
@@ -50,11 +53,14 @@ typedef struct {
 #endif
 
 #ifdef CONFIG_64BIT
-
 #define Elf_Shdr        Elf64_Shdr
 #define Elf_Sym         Elf64_Sym
 #define Elf_Ehdr        Elf64_Ehdr
 #define Elf_Addr        Elf64_Addr
+#define Elf_Rel         Elf64_Rel
+#define Elf_Rela        Elf64_Rela
+#define ELF_R_TYPE(X)   ELF64_R_TYPE(X)
+#define ELF_R_SYM(X)    ELF64_R_SYM(X)
 
 #define Elf_Mips_Rel    Elf64_Mips_Rel
 #define Elf_Mips_Rela   Elf64_Mips_Rela
diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h
index 55908fd56b1f..c26e18250079 100644
--- a/arch/mips/include/asm/pgtable-64.h
+++ b/arch/mips/include/asm/pgtable-64.h
@@ -162,7 +162,6 @@ typedef struct { unsigned long pmd; } pmd_t;
 
 
 extern pmd_t invalid_pmd_table[PTRS_PER_PMD];
-extern pmd_t empty_bad_pmd_table[PTRS_PER_PMD];
 #endif
 
 /*
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h b/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h
index a80801b094bd..016fa9446ba9 100644
--- a/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h
@@ -10,6 +10,7 @@
 
 #define cpu_has_mips16          1
 #define cpu_has_dsp             1
+/* #define cpu_has_dsp2         ??? - do runtime detection */
 #define cpu_has_mipsmt          1
 #define cpu_has_fpu             0
 
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h
index 4b7f5252d2fd..4f5da948a777 100644
--- a/arch/mips/include/asm/ptrace.h
+++ b/arch/mips/include/asm/ptrace.h
@@ -9,115 +9,12 @@
 #ifndef _ASM_PTRACE_H
 #define _ASM_PTRACE_H
 
-/* 0 - 31 are integer registers, 32 - 63 are fp registers.  */
-#define FPR_BASE        32
-#define PC              64
-#define CAUSE           65
-#define BADVADDR        66
-#define MMHI            67
-#define MMLO            68
-#define FPC_CSR         69
-#define FPC_EIR         70
-#define DSP_BASE        71              /* 3 more hi / lo register pairs */
-#define DSP_CONTROL     77
-#define ACX             78
-
-/*
- * This struct defines the way the registers are stored on the stack during a
- * system call/exception. As usual the registers k0/k1 aren't being saved.
- */
-struct pt_regs {
-#ifdef CONFIG_32BIT
-        /* Pad bytes for argument save space on the stack. */
-        unsigned long pad0[6];
-#endif
-
-        /* Saved main processor registers. */
-        unsigned long regs[32];
-
-        /* Saved special registers. */
-        unsigned long cp0_status;
-        unsigned long hi;
-        unsigned long lo;
-#ifdef CONFIG_CPU_HAS_SMARTMIPS
-        unsigned long acx;
-#endif
-        unsigned long cp0_badvaddr;
-        unsigned long cp0_cause;
-        unsigned long cp0_epc;
-#ifdef CONFIG_MIPS_MT_SMTC
-        unsigned long cp0_tcstatus;
-#endif /* CONFIG_MIPS_MT_SMTC */
-#ifdef CONFIG_CPU_CAVIUM_OCTEON
-        unsigned long long mpl[3];        /* MTM{0,1,2} */
-        unsigned long long mtp[3];        /* MTP{0,1,2} */
-#endif
-} __attribute__ ((aligned (8)));
-
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS                14
-#define PTRACE_SETFPREGS                15
-/* #define PTRACE_GETFPXREGS            18 */
-/* #define PTRACE_SETFPXREGS            19 */
-
-#define PTRACE_OLDSETOPTIONS    21
-
-#define PTRACE_GET_THREAD_AREA  25
-#define PTRACE_SET_THREAD_AREA  26
-
-/* Calls to trace a 64bit program from a 32bit program.  */
-#define PTRACE_PEEKTEXT_3264    0xc0
-#define PTRACE_PEEKDATA_3264    0xc1
-#define PTRACE_POKETEXT_3264    0xc2
-#define PTRACE_POKEDATA_3264    0xc3
-#define PTRACE_GET_THREAD_AREA_3264     0xc4
-
-/* Read and write watchpoint registers.  */
-enum pt_watch_style {
-        pt_watch_style_mips32,
-        pt_watch_style_mips64
-};
-struct mips32_watch_regs {
-        unsigned int watchlo[8];
-        /* Lower 16 bits of watchhi. */
-        unsigned short watchhi[8];
-        /* Valid mask and I R W bits.
-         * bit 0 -- 1 if W bit is usable.
-         * bit 1 -- 1 if R bit is usable.
-         * bit 2 -- 1 if I bit is usable.
-         * bits 3 - 11 -- Valid watchhi mask bits.
-         */
-        unsigned short watch_masks[8];
-        /* The number of valid watch register pairs.  */
-        unsigned int num_valid;
-} __attribute__((aligned(8)));
-
-struct mips64_watch_regs {
-        unsigned long long watchlo[8];
-        unsigned short watchhi[8];
-        unsigned short watch_masks[8];
-        unsigned int num_valid;
-} __attribute__((aligned(8)));
-
-struct pt_watch_regs {
-        enum pt_watch_style style;
-        union {
-                struct mips32_watch_regs mips32;
-                struct mips64_watch_regs mips64;
-        };
-};
-
-#define PTRACE_GET_WATCH_REGS   0xd0
-#define PTRACE_SET_WATCH_REGS   0xd1
-
-#ifdef __KERNEL__
 
 #include <linux/compiler.h>
 #include <linux/linkage.h>
 #include <linux/types.h>
 #include <asm/isadep.h>
+#include <uapi/asm/ptrace.h>
 
 struct task_struct;
 
@@ -164,6 +61,4 @@ static inline void die_if_kernel(const char *str, struct pt_regs *regs)
                 die(str, regs);
 }
 
-#endif
-
 #endif /* _ASM_PTRACE_H */
diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h
index 2560b6b6a7d8..e26589ef36ee 100644
--- a/arch/mips/include/asm/setup.h
+++ b/arch/mips/include/asm/setup.h
@@ -1,9 +1,8 @@
 #ifndef _MIPS_SETUP_H
 #define _MIPS_SETUP_H
 
-#define COMMAND_LINE_SIZE       4096
+#include <uapi/asm/setup.h>
 
-#ifdef  __KERNEL__
 extern void setup_early_printk(void);
 
 extern void set_handler(unsigned long offset, void *addr, unsigned long len);
@@ -17,6 +16,4 @@ extern unsigned long ebase;
 extern void per_cpu_trap_init(bool);
 extern void cpu_cache_init(void);
 
-#endif /* __KERNEL__ */
-
 #endif /* __SETUP_H */
diff --git a/arch/mips/include/asm/sigcontext.h b/arch/mips/include/asm/sigcontext.h
index 9e89cf99d4e4..eeeb0f48c767 100644
--- a/arch/mips/include/asm/sigcontext.h
+++ b/arch/mips/include/asm/sigcontext.h
@@ -9,71 +9,10 @@
 #ifndef _ASM_SIGCONTEXT_H
 #define _ASM_SIGCONTEXT_H
 
-#include <linux/types.h>
-#include <asm/sgidefs.h>
-
-#if _MIPS_SIM == _MIPS_SIM_ABI32
-
-/*
- * Keep this struct definition in sync with the sigcontext fragment
- * in arch/mips/tools/offset.c
- */
-struct sigcontext {
-        unsigned int            sc_regmask;     /* Unused */
-        unsigned int            sc_status;      /* Unused */
-        unsigned long long      sc_pc;
-        unsigned long long      sc_regs[32];
-        unsigned long long      sc_fpregs[32];
-        unsigned int            sc_acx;         /* Was sc_ownedfp */
-        unsigned int            sc_fpc_csr;
-        unsigned int            sc_fpc_eir;     /* Unused */
-        unsigned int            sc_used_math;
-        unsigned int            sc_dsp;         /* dsp status, was sc_ssflags */
-        unsigned long long      sc_mdhi;
-        unsigned long long      sc_mdlo;
-        unsigned long           sc_hi1;         /* Was sc_cause */
-        unsigned long           sc_lo1;         /* Was sc_badvaddr */
-        unsigned long           sc_hi2;         /* Was sc_sigset[4] */
-        unsigned long           sc_lo2;
-        unsigned long           sc_hi3;
-        unsigned long           sc_lo3;
-};
-
-#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
+#include <uapi/asm/sigcontext.h>
 
 #if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
 
-#include <linux/posix_types.h>
-/*
- * Keep this struct definition in sync with the sigcontext fragment
- * in arch/mips/tools/offset.c
- *
- * Warning: this structure illdefined with sc_badvaddr being just an unsigned
- * int so it was changed to unsigned long in 2.6.0-test1.  This may break
- * binary compatibility - no prisoners.
- * DSP ASE in 2.6.12-rc4.  Turn sc_mdhi and sc_mdlo into an array of four
- * entries, add sc_dsp and sc_reserved for padding.  No prisoners.
- */
-struct sigcontext {
-        __u64   sc_regs[32];
-        __u64   sc_fpregs[32];
-        __u64   sc_mdhi;
-        __u64   sc_hi1;
-        __u64   sc_hi2;
-        __u64   sc_hi3;
-        __u64   sc_mdlo;
-        __u64   sc_lo1;
-        __u64   sc_lo2;
-        __u64   sc_lo3;
-        __u64   sc_pc;
-        __u32   sc_fpc_csr;
-        __u32   sc_used_math;
-        __u32   sc_dsp;
-        __u32   sc_reserved;
-};
-
-#ifdef __KERNEL__
-
 struct sigcontext32 {
         __u32           sc_regmask;     /* Unused */
         __u32           sc_status;      /* Unused */
@@ -94,8 +33,5 @@ struct sigcontext32 {
         __u32           sc_hi3;
         __u32           sc_lo3;
 };
-#endif /* __KERNEL__ */
-
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
-
 #endif /* _ASM_SIGCONTEXT_H */
diff --git a/arch/mips/include/asm/siginfo.h b/arch/mips/include/asm/siginfo.h
index 20ebeb875ee6..dd9a762646fc 100644
--- a/arch/mips/include/asm/siginfo.h
+++ b/arch/mips/include/asm/siginfo.h
@@ -9,108 +9,8 @@
 #ifndef _ASM_SIGINFO_H
 #define _ASM_SIGINFO_H
 
+#include <uapi/asm/siginfo.h>
 
-#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))
-#undef __ARCH_SI_TRAPNO /* exception code needs to fill this ...  */
-
-#define HAVE_ARCH_SIGINFO_T
-
-/*
- * We duplicate the generic versions - <asm-generic/siginfo.h> is just borked
- * by design ...
- */
-#define HAVE_ARCH_COPY_SIGINFO
-struct siginfo;
-
-/*
- * Careful to keep union _sifields from shifting ...
- */
-#ifdef CONFIG_32BIT
-#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
-#endif
-#ifdef CONFIG_64BIT
-#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
-#endif
-
-#include <asm-generic/siginfo.h>
-
-typedef struct siginfo {
-        int si_signo;
-        int si_code;
-        int si_errno;
-        int __pad0[SI_MAX_SIZE / sizeof(int) - SI_PAD_SIZE - 3];
-
-        union {
-                int _pad[SI_PAD_SIZE];
-
-                /* kill() */
-                struct {
-                        pid_t _pid;             /* sender's pid */
-                        __ARCH_SI_UID_T _uid;   /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        timer_t _tid;           /* timer id */
-                        int _overrun;           /* overrun count */
-                        char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
-                        sigval_t _sigval;       /* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        pid_t _pid;             /* sender's pid */
-                        __ARCH_SI_UID_T _uid;   /* sender's uid */
-                        sigval_t _sigval;
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        pid_t _pid;             /* which child */
-                        __ARCH_SI_UID_T _uid;   /* sender's uid */
-                        int _status;            /* exit code */
-                        clock_t _utime;
-                        clock_t _stime;
-                } _sigchld;
-
-                /* IRIX SIGCHLD */
-                struct {
-                        pid_t _pid;             /* which child */
-                        clock_t _utime;
-                        int _status;            /* exit code */
-                        clock_t _stime;
-                } _irix_sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        void __user *_addr; /* faulting insn/memory ref. */
-#ifdef __ARCH_SI_TRAPNO
-                        int _trapno;    /* TRAP # which caused the signal */
-#endif
-                        short _addr_lsb;
-                } _sigfault;
-
-                /* SIGPOLL, SIGXFSZ (To do ...)  */
-                struct {
-                        __ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-} siginfo_t;
-
-/*
- * si_code values
- * Again these have been chosen to be IRIX compatible.
- */
-#undef SI_ASYNCIO
-#undef SI_TIMER
-#undef SI_MESGQ
-#define SI_ASYNCIO      -2      /* sent by AIO completion */
-#define SI_TIMER __SI_CODE(__SI_TIMER, -3) /* sent by timer expiration */
-#define SI_MESGQ __SI_CODE(__SI_MESGQ, -4) /* sent by real time mesq state change */
-
-#ifdef __KERNEL__
 
 /*
  * Duplicated here because of <asm-generic/siginfo.h> braindamage ...
@@ -126,6 +26,4 @@ static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
                 memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld));
 }
 
-#endif
-
 #endif /* _ASM_SIGINFO_H */
diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h
index c783f364938c..880240dff8b7 100644
--- a/arch/mips/include/asm/signal.h
+++ b/arch/mips/include/asm/signal.h
@@ -9,93 +9,8 @@
 #ifndef _ASM_SIGNAL_H
 #define _ASM_SIGNAL_H
 
-#include <linux/types.h>
+#include <uapi/asm/signal.h>
 
-#define _NSIG           128
-#define _NSIG_BPW       (sizeof(unsigned long) * 8)
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-
-#define SIGHUP           1      /* Hangup (POSIX).  */
-#define SIGINT           2      /* Interrupt (ANSI).  */
-#define SIGQUIT          3      /* Quit (POSIX).  */
-#define SIGILL           4      /* Illegal instruction (ANSI).  */
-#define SIGTRAP          5      /* Trace trap (POSIX).  */
-#define SIGIOT           6      /* IOT trap (4.2 BSD).  */
-#define SIGABRT          SIGIOT /* Abort (ANSI).  */
-#define SIGEMT           7
-#define SIGFPE           8      /* Floating-point exception (ANSI).  */
-#define SIGKILL          9      /* Kill, unblockable (POSIX).  */
-#define SIGBUS          10      /* BUS error (4.2 BSD).  */
-#define SIGSEGV         11      /* Segmentation violation (ANSI).  */
-#define SIGSYS          12
-#define SIGPIPE         13      /* Broken pipe (POSIX).  */
-#define SIGALRM         14      /* Alarm clock (POSIX).  */
-#define SIGTERM         15      /* Termination (ANSI).  */
-#define SIGUSR1         16      /* User-defined signal 1 (POSIX).  */
-#define SIGUSR2         17      /* User-defined signal 2 (POSIX).  */
-#define SIGCHLD         18      /* Child status has changed (POSIX).  */
-#define SIGCLD          SIGCHLD /* Same as SIGCHLD (System V).  */
-#define SIGPWR          19      /* Power failure restart (System V).  */
-#define SIGWINCH        20      /* Window size change (4.3 BSD, Sun).  */
-#define SIGURG          21      /* Urgent condition on socket (4.2 BSD).  */
-#define SIGIO           22      /* I/O now possible (4.2 BSD).  */
-#define SIGPOLL         SIGIO   /* Pollable event occurred (System V).  */
-#define SIGSTOP         23      /* Stop, unblockable (POSIX).  */
-#define SIGTSTP         24      /* Keyboard stop (POSIX).  */
-#define SIGCONT         25      /* Continue (POSIX).  */
-#define SIGTTIN         26      /* Background read from tty (POSIX).  */
-#define SIGTTOU         27      /* Background write to tty (POSIX).  */
-#define SIGVTALRM       28      /* Virtual alarm clock (4.2 BSD).  */
-#define SIGPROF         29      /* Profiling alarm clock (4.2 BSD).  */
-#define SIGXCPU         30      /* CPU limit exceeded (4.2 BSD).  */
-#define SIGXFSZ         31      /* File size limit exceeded (4.2 BSD).  */
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        _NSIG
-
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_ONSTACK      0x08000000
-#define SA_RESETHAND    0x80000000
-#define SA_RESTART      0x10000000
-#define SA_SIGINFO      0x00000008
-#define SA_NODEFER      0x40000000
-#define SA_NOCLDWAIT    0x00010000
-#define SA_NOCLDSTOP    0x00000001
-
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-
-#define SA_RESTORER     0x04000000      /* Only for o32 */
-
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK     1
-#define SS_DISABLE     2
-
-#define MINSIGSTKSZ    2048
-#define SIGSTKSZ       8192
-
-#ifdef __KERNEL__
 
 #ifdef CONFIG_TRAD_SIGNALS
 #define sig_uses_siginfo(ka)    ((ka)->sa.sa_flags & SA_SIGINFO)
@@ -103,37 +18,9 @@ typedef unsigned long old_sigset_t;		/* at least 32 bits */
 #define sig_uses_siginfo(ka)    (1)
 #endif
 
-#endif /* __KERNEL__ */
-
-#define SIG_BLOCK       1       /* for blocking signals */
-#define SIG_UNBLOCK     2       /* for unblocking signals */
-#define SIG_SETMASK     3       /* for setting the signal mask */
-
-#include <asm-generic/signal-defs.h>
-
-struct sigaction {
-        unsigned int    sa_flags;
-        __sighandler_t  sa_handler;
-        sigset_t        sa_mask;
-};
-
-struct k_sigaction {
-        struct sigaction sa;
-};
-
-/* IRIX compatible stack_t  */
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        size_t ss_size;
-        int ss_flags;
-} stack_t;
-
-#ifdef __KERNEL__
 #include <asm/sigcontext.h>
 #include <asm/siginfo.h>
 
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_SIGNAL_H */
diff --git a/arch/mips/include/asm/socket.h b/arch/mips/include/asm/socket.h
index a2ed6fdad4e0..4724a563c5bf 100644
--- a/arch/mips/include/asm/socket.h
+++ b/arch/mips/include/asm/socket.h
@@ -9,87 +9,8 @@
 #ifndef _ASM_SOCKET_H
 #define _ASM_SOCKET_H
 
-#include <asm/sockios.h>
+#include <uapi/asm/socket.h>
 
-/*
- * For setsockopt(2)
- *
- * This defines are ABI conformant as far as Linux supports these ...
- */
-#define SOL_SOCKET      0xffff
-
-#define SO_DEBUG        0x0001  /* Record debugging information.  */
-#define SO_REUSEADDR    0x0004  /* Allow reuse of local addresses.  */
-#define SO_KEEPALIVE    0x0008  /* Keep connections alive and send
-                                   SIGPIPE when they die.  */
-#define SO_DONTROUTE    0x0010  /* Don't do local routing.  */
-#define SO_BROADCAST    0x0020  /* Allow transmission of
-                                   broadcast messages.  */
-#define SO_LINGER       0x0080  /* Block on close of a reliable
-                                   socket to transmit pending data.  */
-#define SO_OOBINLINE 0x0100     /* Receive out-of-band data in-band.  */
-#if 0
-To add: #define SO_REUSEPORT 0x0200     /* Allow local address and port reuse.  */
-#endif
-
-#define SO_TYPE         0x1008  /* Compatible name for SO_STYLE.  */
-#define SO_STYLE        SO_TYPE /* Synonym */
-#define SO_ERROR        0x1007  /* get error status and clear */
-#define SO_SNDBUF       0x1001  /* Send buffer size. */
-#define SO_RCVBUF       0x1002  /* Receive buffer. */
-#define SO_SNDLOWAT     0x1003  /* send low-water mark */
-#define SO_RCVLOWAT     0x1004  /* receive low-water mark */
-#define SO_SNDTIMEO     0x1005  /* send timeout */
-#define SO_RCVTIMEO     0x1006  /* receive timeout */
-#define SO_ACCEPTCONN   0x1009
-#define SO_PROTOCOL     0x1028  /* protocol type */
-#define SO_DOMAIN       0x1029  /* domain/socket family */
-
-/* linux-specific, might as well be the same as on i386 */
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_BSDCOMPAT    14
-
-#define SO_PASSCRED     17
-#define SO_PEERCRED     18
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-
-#define SO_BINDTODEVICE         25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-
-#define SO_PEERSEC              30
-#define SO_SNDBUFFORCE          31
-#define SO_RCVBUFFORCE          33
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-
-#define SO_MARK                 36
-
-#define SO_TIMESTAMPING         37
-#define SCM_TIMESTAMPING        SO_TIMESTAMPING
-
-#define SO_RXQ_OVFL             40
-
-#define SO_WIFI_STATUS          41
-#define SCM_WIFI_STATUS         SO_WIFI_STATUS
-#define SO_PEEK_OFF             42
-
-/* Instruct lower device to use last 4-bytes of skb data as FCS */
-#define SO_NOFCS                43
-
-#ifdef __KERNEL__
 
 /** sock_type - Socket types
  *
@@ -126,6 +47,4 @@ enum sock_type {
 
 #define ARCH_HAS_SOCKET_TYPES 1
 
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/mips/include/asm/termios.h b/arch/mips/include/asm/termios.h
index abdd87aaf609..6245b68a69a8 100644
--- a/arch/mips/include/asm/termios.h
+++ b/arch/mips/include/asm/termios.h
@@ -9,58 +9,8 @@
 #ifndef _ASM_TERMIOS_H
 #define _ASM_TERMIOS_H
 
-#include <linux/errno.h>
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct sgttyb {
-        char    sg_ispeed;
-        char    sg_ospeed;
-        char    sg_erase;
-        char    sg_kill;
-        int     sg_flags;       /* SGI special - int, not short */
-};
-
-struct tchars {
-        char    t_intrc;
-        char    t_quitc;
-        char    t_startc;
-        char    t_stopc;
-        char    t_eofc;
-        char    t_brkc;
-};
-
-struct ltchars {
-        char    t_suspc;        /* stop process signal */
-        char    t_dsuspc;       /* delayed stop process signal */
-        char    t_rprntc;       /* reprint line */
-        char    t_flushc;       /* flush output (toggles) */
-        char    t_werasc;       /* word erase */
-        char    t_lnextc;       /* literal next character */
-};
-
-/* TIOCGSIZE, TIOCSSIZE not defined yet.  Only needed for SunOS source
-   compatibility anyway ... */
-
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-
-#define NCC     8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        char c_line;                    /* line discipline */
-        unsigned char c_cc[NCCS];       /* control characters */
-};
-
-#ifdef __KERNEL__
 #include <asm/uaccess.h>
+#include <uapi/asm/termios.h>
 
 /*
  *      intr=^C         quit=^\         erase=del       kill=^U
@@ -70,25 +20,6 @@ struct termio {
  *      eof=^D          eol=\0
  */
 #define INIT_C_CC "\003\034\177\025\1\0\0\0\021\023\032\0\022\017\027\026\004\0"
-#endif
-
-/* modem lines */
-#define TIOCM_LE        0x001           /* line enable */
-#define TIOCM_DTR       0x002           /* data terminal ready */
-#define TIOCM_RTS       0x004           /* request to send */
-#define TIOCM_ST        0x010           /* secondary transmit */
-#define TIOCM_SR        0x020           /* secondary receive */
-#define TIOCM_CTS       0x040           /* clear to send */
-#define TIOCM_CAR       0x100           /* carrier detect */
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RNG       0x200           /* ring */
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_DSR       0x400           /* data set ready */
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-
-#ifdef __KERNEL__
 
 #include <linux/string.h>
 
@@ -171,6 +102,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
         return copy_to_user(u, k, sizeof(struct termios)) ? -EFAULT : 0;
 }
 
-#endif /* defined(__KERNEL__) */
-
 #endif /* _ASM_TERMIOS_H */
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
index 1228b25b290a..a845aafedee4 100644
--- a/arch/mips/include/asm/types.h
+++ b/arch/mips/include/asm/types.h
@@ -11,24 +11,12 @@
 #ifndef _ASM_TYPES_H
 #define _ASM_TYPES_H
 
-/*
- * We don't use int-l64.h for the kernel anymore but still use it for
- * userspace to avoid code changes.
- */
-#ifdef __KERNEL__
 # include <asm-generic/int-ll64.h>
-#else
-# if _MIPS_SZLONG == 64
-#  include <asm-generic/int-l64.h>
-# else
-#  include <asm-generic/int-ll64.h>
-# endif
-#endif
+#include <uapi/asm/types.h>
 
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 /*
@@ -42,6 +30,4 @@ typedef unsigned long phys_t;
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_TYPES_H */
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index 161fc4d976e4..9e47cc11aa26 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -12,1027 +12,8 @@
 #ifndef _ASM_UNISTD_H
 #define _ASM_UNISTD_H
 
-#include <asm/sgidefs.h>
+#include <uapi/asm/unistd.h>
 
-#if _MIPS_SIM == _MIPS_SIM_ABI32
-
-/*
- * Linux o32 style syscalls are in the range from 4000 to 4999.
- */
-#define __NR_Linux                      4000
-#define __NR_syscall                    (__NR_Linux +   0)
-#define __NR_exit                       (__NR_Linux +   1)
-#define __NR_fork                       (__NR_Linux +   2)
-#define __NR_read                       (__NR_Linux +   3)
-#define __NR_write                      (__NR_Linux +   4)
-#define __NR_open                       (__NR_Linux +   5)
-#define __NR_close                      (__NR_Linux +   6)
-#define __NR_waitpid                    (__NR_Linux +   7)
-#define __NR_creat                      (__NR_Linux +   8)
-#define __NR_link                       (__NR_Linux +   9)
-#define __NR_unlink                     (__NR_Linux +  10)
-#define __NR_execve                     (__NR_Linux +  11)
-#define __NR_chdir                      (__NR_Linux +  12)
-#define __NR_time                       (__NR_Linux +  13)
-#define __NR_mknod                      (__NR_Linux +  14)
-#define __NR_chmod                      (__NR_Linux +  15)
-#define __NR_lchown                     (__NR_Linux +  16)
-#define __NR_break                      (__NR_Linux +  17)
-#define __NR_unused18                   (__NR_Linux +  18)
-#define __NR_lseek                      (__NR_Linux +  19)
-#define __NR_getpid                     (__NR_Linux +  20)
-#define __NR_mount                      (__NR_Linux +  21)
-#define __NR_umount                     (__NR_Linux +  22)
-#define __NR_setuid                     (__NR_Linux +  23)
-#define __NR_getuid                     (__NR_Linux +  24)
-#define __NR_stime                      (__NR_Linux +  25)
-#define __NR_ptrace                     (__NR_Linux +  26)
-#define __NR_alarm                      (__NR_Linux +  27)
-#define __NR_unused28                   (__NR_Linux +  28)
-#define __NR_pause                      (__NR_Linux +  29)
-#define __NR_utime                      (__NR_Linux +  30)
-#define __NR_stty                       (__NR_Linux +  31)
-#define __NR_gtty                       (__NR_Linux +  32)
-#define __NR_access                     (__NR_Linux +  33)
-#define __NR_nice                       (__NR_Linux +  34)
-#define __NR_ftime                      (__NR_Linux +  35)
-#define __NR_sync                       (__NR_Linux +  36)
-#define __NR_kill                       (__NR_Linux +  37)
-#define __NR_rename                     (__NR_Linux +  38)
-#define __NR_mkdir                      (__NR_Linux +  39)
-#define __NR_rmdir                      (__NR_Linux +  40)
-#define __NR_dup                        (__NR_Linux +  41)
-#define __NR_pipe                       (__NR_Linux +  42)
-#define __NR_times                      (__NR_Linux +  43)
-#define __NR_prof                       (__NR_Linux +  44)
-#define __NR_brk                        (__NR_Linux +  45)
-#define __NR_setgid                     (__NR_Linux +  46)
-#define __NR_getgid                     (__NR_Linux +  47)
-#define __NR_signal                     (__NR_Linux +  48)
-#define __NR_geteuid                    (__NR_Linux +  49)
-#define __NR_getegid                    (__NR_Linux +  50)
-#define __NR_acct                       (__NR_Linux +  51)
-#define __NR_umount2                    (__NR_Linux +  52)
-#define __NR_lock                       (__NR_Linux +  53)
-#define __NR_ioctl                      (__NR_Linux +  54)
-#define __NR_fcntl                      (__NR_Linux +  55)
-#define __NR_mpx                        (__NR_Linux +  56)
-#define __NR_setpgid                    (__NR_Linux +  57)
-#define __NR_ulimit                     (__NR_Linux +  58)
-#define __NR_unused59                   (__NR_Linux +  59)
-#define __NR_umask                      (__NR_Linux +  60)
-#define __NR_chroot                     (__NR_Linux +  61)
-#define __NR_ustat                      (__NR_Linux +  62)
-#define __NR_dup2                       (__NR_Linux +  63)
-#define __NR_getppid                    (__NR_Linux +  64)
-#define __NR_getpgrp                    (__NR_Linux +  65)
-#define __NR_setsid                     (__NR_Linux +  66)
-#define __NR_sigaction                  (__NR_Linux +  67)
-#define __NR_sgetmask                   (__NR_Linux +  68)
-#define __NR_ssetmask                   (__NR_Linux +  69)
-#define __NR_setreuid                   (__NR_Linux +  70)
-#define __NR_setregid                   (__NR_Linux +  71)
-#define __NR_sigsuspend                 (__NR_Linux +  72)
-#define __NR_sigpending                 (__NR_Linux +  73)
-#define __NR_sethostname                (__NR_Linux +  74)
-#define __NR_setrlimit                  (__NR_Linux +  75)
-#define __NR_getrlimit                  (__NR_Linux +  76)
-#define __NR_getrusage                  (__NR_Linux +  77)
-#define __NR_gettimeofday               (__NR_Linux +  78)
-#define __NR_settimeofday               (__NR_Linux +  79)
-#define __NR_getgroups                  (__NR_Linux +  80)
-#define __NR_setgroups                  (__NR_Linux +  81)
-#define __NR_reserved82                 (__NR_Linux +  82)
-#define __NR_symlink                    (__NR_Linux +  83)
-#define __NR_unused84                   (__NR_Linux +  84)
-#define __NR_readlink                   (__NR_Linux +  85)
-#define __NR_uselib                     (__NR_Linux +  86)
-#define __NR_swapon                     (__NR_Linux +  87)
-#define __NR_reboot                     (__NR_Linux +  88)
-#define __NR_readdir                    (__NR_Linux +  89)
-#define __NR_mmap                       (__NR_Linux +  90)
-#define __NR_munmap                     (__NR_Linux +  91)
-#define __NR_truncate                   (__NR_Linux +  92)
-#define __NR_ftruncate                  (__NR_Linux +  93)
-#define __NR_fchmod                     (__NR_Linux +  94)
-#define __NR_fchown                     (__NR_Linux +  95)
-#define __NR_getpriority                (__NR_Linux +  96)
-#define __NR_setpriority                (__NR_Linux +  97)
-#define __NR_profil                     (__NR_Linux +  98)
-#define __NR_statfs                     (__NR_Linux +  99)
-#define __NR_fstatfs                    (__NR_Linux + 100)
-#define __NR_ioperm                     (__NR_Linux + 101)
-#define __NR_socketcall                 (__NR_Linux + 102)
-#define __NR_syslog                     (__NR_Linux + 103)
-#define __NR_setitimer                  (__NR_Linux + 104)
-#define __NR_getitimer                  (__NR_Linux + 105)
-#define __NR_stat                       (__NR_Linux + 106)
-#define __NR_lstat                      (__NR_Linux + 107)
-#define __NR_fstat                      (__NR_Linux + 108)
-#define __NR_unused109                  (__NR_Linux + 109)
-#define __NR_iopl                       (__NR_Linux + 110)
-#define __NR_vhangup                    (__NR_Linux + 111)
-#define __NR_idle                       (__NR_Linux + 112)
-#define __NR_vm86                       (__NR_Linux + 113)
-#define __NR_wait4                      (__NR_Linux + 114)
-#define __NR_swapoff                    (__NR_Linux + 115)
-#define __NR_sysinfo                    (__NR_Linux + 116)
-#define __NR_ipc                        (__NR_Linux + 117)
-#define __NR_fsync                      (__NR_Linux + 118)
-#define __NR_sigreturn                  (__NR_Linux + 119)
-#define __NR_clone                      (__NR_Linux + 120)
-#define __NR_setdomainname              (__NR_Linux + 121)
-#define __NR_uname                      (__NR_Linux + 122)
-#define __NR_modify_ldt                 (__NR_Linux + 123)
-#define __NR_adjtimex                   (__NR_Linux + 124)
-#define __NR_mprotect                   (__NR_Linux + 125)
-#define __NR_sigprocmask                (__NR_Linux + 126)
-#define __NR_create_module              (__NR_Linux + 127)
-#define __NR_init_module                (__NR_Linux + 128)
-#define __NR_delete_module              (__NR_Linux + 129)
-#define __NR_get_kernel_syms            (__NR_Linux + 130)
-#define __NR_quotactl                   (__NR_Linux + 131)
-#define __NR_getpgid                    (__NR_Linux + 132)
-#define __NR_fchdir                     (__NR_Linux + 133)
-#define __NR_bdflush                    (__NR_Linux + 134)
-#define __NR_sysfs                      (__NR_Linux + 135)
-#define __NR_personality                (__NR_Linux + 136)
-#define __NR_afs_syscall                (__NR_Linux + 137) /* Syscall for Andrew File System */
-#define __NR_setfsuid                   (__NR_Linux + 138)
-#define __NR_setfsgid                   (__NR_Linux + 139)
-#define __NR__llseek                    (__NR_Linux + 140)
-#define __NR_getdents                   (__NR_Linux + 141)
-#define __NR__newselect                 (__NR_Linux + 142)
-#define __NR_flock                      (__NR_Linux + 143)
-#define __NR_msync                      (__NR_Linux + 144)
-#define __NR_readv                      (__NR_Linux + 145)
-#define __NR_writev                     (__NR_Linux + 146)
-#define __NR_cacheflush                 (__NR_Linux + 147)
-#define __NR_cachectl                   (__NR_Linux + 148)
-#define __NR_sysmips                    (__NR_Linux + 149)
-#define __NR_unused150                  (__NR_Linux + 150)
-#define __NR_getsid                     (__NR_Linux + 151)
-#define __NR_fdatasync                  (__NR_Linux + 152)
-#define __NR__sysctl                    (__NR_Linux + 153)
-#define __NR_mlock                      (__NR_Linux + 154)
-#define __NR_munlock                    (__NR_Linux + 155)
-#define __NR_mlockall                   (__NR_Linux + 156)
-#define __NR_munlockall                 (__NR_Linux + 157)
-#define __NR_sched_setparam             (__NR_Linux + 158)
-#define __NR_sched_getparam             (__NR_Linux + 159)
-#define __NR_sched_setscheduler         (__NR_Linux + 160)
-#define __NR_sched_getscheduler         (__NR_Linux + 161)
-#define __NR_sched_yield                (__NR_Linux + 162)
-#define __NR_sched_get_priority_max     (__NR_Linux + 163)
-#define __NR_sched_get_priority_min     (__NR_Linux + 164)
-#define __NR_sched_rr_get_interval      (__NR_Linux + 165)
-#define __NR_nanosleep                  (__NR_Linux + 166)
-#define __NR_mremap                     (__NR_Linux + 167)
-#define __NR_accept                     (__NR_Linux + 168)
-#define __NR_bind                       (__NR_Linux + 169)
-#define __NR_connect                    (__NR_Linux + 170)
-#define __NR_getpeername                (__NR_Linux + 171)
-#define __NR_getsockname                (__NR_Linux + 172)
-#define __NR_getsockopt                 (__NR_Linux + 173)
-#define __NR_listen                     (__NR_Linux + 174)
-#define __NR_recv                       (__NR_Linux + 175)
-#define __NR_recvfrom                   (__NR_Linux + 176)
-#define __NR_recvmsg                    (__NR_Linux + 177)
-#define __NR_send                       (__NR_Linux + 178)
-#define __NR_sendmsg                    (__NR_Linux + 179)
-#define __NR_sendto                     (__NR_Linux + 180)
-#define __NR_setsockopt                 (__NR_Linux + 181)
-#define __NR_shutdown                   (__NR_Linux + 182)
-#define __NR_socket                     (__NR_Linux + 183)
-#define __NR_socketpair                 (__NR_Linux + 184)
-#define __NR_setresuid                  (__NR_Linux + 185)
-#define __NR_getresuid                  (__NR_Linux + 186)
-#define __NR_query_module               (__NR_Linux + 187)
-#define __NR_poll                       (__NR_Linux + 188)
-#define __NR_nfsservctl                 (__NR_Linux + 189)
-#define __NR_setresgid                  (__NR_Linux + 190)
-#define __NR_getresgid                  (__NR_Linux + 191)
-#define __NR_prctl                      (__NR_Linux + 192)
-#define __NR_rt_sigreturn               (__NR_Linux + 193)
-#define __NR_rt_sigaction               (__NR_Linux + 194)
-#define __NR_rt_sigprocmask             (__NR_Linux + 195)
-#define __NR_rt_sigpending              (__NR_Linux + 196)
-#define __NR_rt_sigtimedwait            (__NR_Linux + 197)
-#define __NR_rt_sigqueueinfo            (__NR_Linux + 198)
-#define __NR_rt_sigsuspend              (__NR_Linux + 199)
-#define __NR_pread64                    (__NR_Linux + 200)
-#define __NR_pwrite64                   (__NR_Linux + 201)
-#define __NR_chown                      (__NR_Linux + 202)
-#define __NR_getcwd                     (__NR_Linux + 203)
-#define __NR_capget                     (__NR_Linux + 204)
-#define __NR_capset                     (__NR_Linux + 205)
-#define __NR_sigaltstack                (__NR_Linux + 206)
-#define __NR_sendfile                   (__NR_Linux + 207)
-#define __NR_getpmsg                    (__NR_Linux + 208)
-#define __NR_putpmsg                    (__NR_Linux + 209)
-#define __NR_mmap2                      (__NR_Linux + 210)
-#define __NR_truncate64                 (__NR_Linux + 211)
-#define __NR_ftruncate64                (__NR_Linux + 212)
-#define __NR_stat64                     (__NR_Linux + 213)
-#define __NR_lstat64                    (__NR_Linux + 214)
-#define __NR_fstat64                    (__NR_Linux + 215)
-#define __NR_pivot_root                 (__NR_Linux + 216)
-#define __NR_mincore                    (__NR_Linux + 217)
-#define __NR_madvise                    (__NR_Linux + 218)
-#define __NR_getdents64                 (__NR_Linux + 219)
-#define __NR_fcntl64                    (__NR_Linux + 220)
-#define __NR_reserved221                (__NR_Linux + 221)
-#define __NR_gettid                     (__NR_Linux + 222)
-#define __NR_readahead                  (__NR_Linux + 223)
-#define __NR_setxattr                   (__NR_Linux + 224)
-#define __NR_lsetxattr                  (__NR_Linux + 225)
-#define __NR_fsetxattr                  (__NR_Linux + 226)
-#define __NR_getxattr                   (__NR_Linux + 227)
-#define __NR_lgetxattr                  (__NR_Linux + 228)
-#define __NR_fgetxattr                  (__NR_Linux + 229)
-#define __NR_listxattr                  (__NR_Linux + 230)
-#define __NR_llistxattr                 (__NR_Linux + 231)
-#define __NR_flistxattr                 (__NR_Linux + 232)
-#define __NR_removexattr                (__NR_Linux + 233)
-#define __NR_lremovexattr               (__NR_Linux + 234)
-#define __NR_fremovexattr               (__NR_Linux + 235)
-#define __NR_tkill                      (__NR_Linux + 236)
-#define __NR_sendfile64                 (__NR_Linux + 237)
-#define __NR_futex                      (__NR_Linux + 238)
-#define __NR_sched_setaffinity          (__NR_Linux + 239)
-#define __NR_sched_getaffinity          (__NR_Linux + 240)
-#define __NR_io_setup                   (__NR_Linux + 241)
-#define __NR_io_destroy                 (__NR_Linux + 242)
-#define __NR_io_getevents               (__NR_Linux + 243)
-#define __NR_io_submit                  (__NR_Linux + 244)
-#define __NR_io_cancel                  (__NR_Linux + 245)
-#define __NR_exit_group                 (__NR_Linux + 246)
-#define __NR_lookup_dcookie             (__NR_Linux + 247)
-#define __NR_epoll_create               (__NR_Linux + 248)
-#define __NR_epoll_ctl                  (__NR_Linux + 249)
-#define __NR_epoll_wait                 (__NR_Linux + 250)
-#define __NR_remap_file_pages           (__NR_Linux + 251)
-#define __NR_set_tid_address            (__NR_Linux + 252)
-#define __NR_restart_syscall            (__NR_Linux + 253)
-#define __NR_fadvise64                  (__NR_Linux + 254)
-#define __NR_statfs64                   (__NR_Linux + 255)
-#define __NR_fstatfs64                  (__NR_Linux + 256)
-#define __NR_timer_create               (__NR_Linux + 257)
-#define __NR_timer_settime              (__NR_Linux + 258)
-#define __NR_timer_gettime              (__NR_Linux + 259)
-#define __NR_timer_getoverrun           (__NR_Linux + 260)
-#define __NR_timer_delete               (__NR_Linux + 261)
-#define __NR_clock_settime              (__NR_Linux + 262)
-#define __NR_clock_gettime              (__NR_Linux + 263)
-#define __NR_clock_getres               (__NR_Linux + 264)
-#define __NR_clock_nanosleep            (__NR_Linux + 265)
-#define __NR_tgkill                     (__NR_Linux + 266)
-#define __NR_utimes                     (__NR_Linux + 267)
-#define __NR_mbind                      (__NR_Linux + 268)
-#define __NR_get_mempolicy              (__NR_Linux + 269)
-#define __NR_set_mempolicy              (__NR_Linux + 270)
-#define __NR_mq_open                    (__NR_Linux + 271)
-#define __NR_mq_unlink                  (__NR_Linux + 272)
-#define __NR_mq_timedsend               (__NR_Linux + 273)
-#define __NR_mq_timedreceive            (__NR_Linux + 274)
-#define __NR_mq_notify                  (__NR_Linux + 275)
-#define __NR_mq_getsetattr              (__NR_Linux + 276)
-#define __NR_vserver                    (__NR_Linux + 277)
-#define __NR_waitid                     (__NR_Linux + 278)
-/* #define __NR_sys_setaltroot          (__NR_Linux + 279) */
-#define __NR_add_key                    (__NR_Linux + 280)
-#define __NR_request_key                (__NR_Linux + 281)
-#define __NR_keyctl                     (__NR_Linux + 282)
-#define __NR_set_thread_area            (__NR_Linux + 283)
-#define __NR_inotify_init               (__NR_Linux + 284)
-#define __NR_inotify_add_watch          (__NR_Linux + 285)
-#define __NR_inotify_rm_watch           (__NR_Linux + 286)
-#define __NR_migrate_pages              (__NR_Linux + 287)
-#define __NR_openat                     (__NR_Linux + 288)
-#define __NR_mkdirat                    (__NR_Linux + 289)
-#define __NR_mknodat                    (__NR_Linux + 290)
-#define __NR_fchownat                   (__NR_Linux + 291)
-#define __NR_futimesat                  (__NR_Linux + 292)
-#define __NR_fstatat64                  (__NR_Linux + 293)
-#define __NR_unlinkat                   (__NR_Linux + 294)
-#define __NR_renameat                   (__NR_Linux + 295)
-#define __NR_linkat                     (__NR_Linux + 296)
-#define __NR_symlinkat                  (__NR_Linux + 297)
-#define __NR_readlinkat                 (__NR_Linux + 298)
-#define __NR_fchmodat                   (__NR_Linux + 299)
-#define __NR_faccessat                  (__NR_Linux + 300)
-#define __NR_pselect6                   (__NR_Linux + 301)
-#define __NR_ppoll                      (__NR_Linux + 302)
-#define __NR_unshare                    (__NR_Linux + 303)
-#define __NR_splice                     (__NR_Linux + 304)
-#define __NR_sync_file_range            (__NR_Linux + 305)
-#define __NR_tee                        (__NR_Linux + 306)
-#define __NR_vmsplice                   (__NR_Linux + 307)
-#define __NR_move_pages                 (__NR_Linux + 308)
-#define __NR_set_robust_list            (__NR_Linux + 309)
-#define __NR_get_robust_list            (__NR_Linux + 310)
-#define __NR_kexec_load                 (__NR_Linux + 311)
-#define __NR_getcpu                     (__NR_Linux + 312)
-#define __NR_epoll_pwait                (__NR_Linux + 313)
-#define __NR_ioprio_set                 (__NR_Linux + 314)
-#define __NR_ioprio_get                 (__NR_Linux + 315)
-#define __NR_utimensat                  (__NR_Linux + 316)
-#define __NR_signalfd                   (__NR_Linux + 317)
-#define __NR_timerfd                    (__NR_Linux + 318)
-#define __NR_eventfd                    (__NR_Linux + 319)
-#define __NR_fallocate                  (__NR_Linux + 320)
-#define __NR_timerfd_create             (__NR_Linux + 321)
-#define __NR_timerfd_gettime            (__NR_Linux + 322)
-#define __NR_timerfd_settime            (__NR_Linux + 323)
-#define __NR_signalfd4                  (__NR_Linux + 324)
-#define __NR_eventfd2                   (__NR_Linux + 325)
-#define __NR_epoll_create1              (__NR_Linux + 326)
-#define __NR_dup3                       (__NR_Linux + 327)
-#define __NR_pipe2                      (__NR_Linux + 328)
-#define __NR_inotify_init1              (__NR_Linux + 329)
-#define __NR_preadv                     (__NR_Linux + 330)
-#define __NR_pwritev                    (__NR_Linux + 331)
-#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 332)
-#define __NR_perf_event_open            (__NR_Linux + 333)
-#define __NR_accept4                    (__NR_Linux + 334)
-#define __NR_recvmmsg                   (__NR_Linux + 335)
-#define __NR_fanotify_init              (__NR_Linux + 336)
-#define __NR_fanotify_mark              (__NR_Linux + 337)
-#define __NR_prlimit64                  (__NR_Linux + 338)
-#define __NR_name_to_handle_at          (__NR_Linux + 339)
-#define __NR_open_by_handle_at          (__NR_Linux + 340)
-#define __NR_clock_adjtime              (__NR_Linux + 341)
-#define __NR_syncfs                     (__NR_Linux + 342)
-#define __NR_sendmmsg                   (__NR_Linux + 343)
-#define __NR_setns                      (__NR_Linux + 344)
-#define __NR_process_vm_readv           (__NR_Linux + 345)
-#define __NR_process_vm_writev          (__NR_Linux + 346)
-#define __NR_kcmp                       (__NR_Linux + 347)
-
-/*
- * Offset of the last Linux o32 flavoured syscall
- */
-#define __NR_Linux_syscalls             347
-
-#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
-
-#define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         347
-
-#if _MIPS_SIM == _MIPS_SIM_ABI64
-
-/*
- * Linux 64-bit syscalls are in the range from 5000 to 5999.
- */
-#define __NR_Linux                      5000
-#define __NR_read                       (__NR_Linux +   0)
-#define __NR_write                      (__NR_Linux +   1)
-#define __NR_open                       (__NR_Linux +   2)
-#define __NR_close                      (__NR_Linux +   3)
-#define __NR_stat                       (__NR_Linux +   4)
-#define __NR_fstat                      (__NR_Linux +   5)
-#define __NR_lstat                      (__NR_Linux +   6)
-#define __NR_poll                       (__NR_Linux +   7)
-#define __NR_lseek                      (__NR_Linux +   8)
-#define __NR_mmap                       (__NR_Linux +   9)
-#define __NR_mprotect                   (__NR_Linux +  10)
-#define __NR_munmap                     (__NR_Linux +  11)
-#define __NR_brk                        (__NR_Linux +  12)
-#define __NR_rt_sigaction               (__NR_Linux +  13)
-#define __NR_rt_sigprocmask             (__NR_Linux +  14)
-#define __NR_ioctl                      (__NR_Linux +  15)
-#define __NR_pread64                    (__NR_Linux +  16)
-#define __NR_pwrite64                   (__NR_Linux +  17)
-#define __NR_readv                      (__NR_Linux +  18)
-#define __NR_writev                     (__NR_Linux +  19)
-#define __NR_access                     (__NR_Linux +  20)
-#define __NR_pipe                       (__NR_Linux +  21)
-#define __NR__newselect                 (__NR_Linux +  22)
-#define __NR_sched_yield                (__NR_Linux +  23)
-#define __NR_mremap                     (__NR_Linux +  24)
-#define __NR_msync                      (__NR_Linux +  25)
-#define __NR_mincore                    (__NR_Linux +  26)
-#define __NR_madvise                    (__NR_Linux +  27)
-#define __NR_shmget                     (__NR_Linux +  28)
-#define __NR_shmat                      (__NR_Linux +  29)
-#define __NR_shmctl                     (__NR_Linux +  30)
-#define __NR_dup                        (__NR_Linux +  31)
-#define __NR_dup2                       (__NR_Linux +  32)
-#define __NR_pause                      (__NR_Linux +  33)
-#define __NR_nanosleep                  (__NR_Linux +  34)
-#define __NR_getitimer                  (__NR_Linux +  35)
-#define __NR_setitimer                  (__NR_Linux +  36)
-#define __NR_alarm                      (__NR_Linux +  37)
-#define __NR_getpid                     (__NR_Linux +  38)
-#define __NR_sendfile                   (__NR_Linux +  39)
-#define __NR_socket                     (__NR_Linux +  40)
-#define __NR_connect                    (__NR_Linux +  41)
-#define __NR_accept                     (__NR_Linux +  42)
-#define __NR_sendto                     (__NR_Linux +  43)
-#define __NR_recvfrom                   (__NR_Linux +  44)
-#define __NR_sendmsg                    (__NR_Linux +  45)
-#define __NR_recvmsg                    (__NR_Linux +  46)
-#define __NR_shutdown                   (__NR_Linux +  47)
-#define __NR_bind                       (__NR_Linux +  48)
-#define __NR_listen                     (__NR_Linux +  49)
-#define __NR_getsockname                (__NR_Linux +  50)
-#define __NR_getpeername                (__NR_Linux +  51)
-#define __NR_socketpair                 (__NR_Linux +  52)
-#define __NR_setsockopt                 (__NR_Linux +  53)
-#define __NR_getsockopt                 (__NR_Linux +  54)
-#define __NR_clone                      (__NR_Linux +  55)
-#define __NR_fork                       (__NR_Linux +  56)
-#define __NR_execve                     (__NR_Linux +  57)
-#define __NR_exit                       (__NR_Linux +  58)
-#define __NR_wait4                      (__NR_Linux +  59)
-#define __NR_kill                       (__NR_Linux +  60)
-#define __NR_uname                      (__NR_Linux +  61)
-#define __NR_semget                     (__NR_Linux +  62)
-#define __NR_semop                      (__NR_Linux +  63)
-#define __NR_semctl                     (__NR_Linux +  64)
-#define __NR_shmdt                      (__NR_Linux +  65)
-#define __NR_msgget                     (__NR_Linux +  66)
-#define __NR_msgsnd                     (__NR_Linux +  67)
-#define __NR_msgrcv                     (__NR_Linux +  68)
-#define __NR_msgctl                     (__NR_Linux +  69)
-#define __NR_fcntl                      (__NR_Linux +  70)
-#define __NR_flock                      (__NR_Linux +  71)
-#define __NR_fsync                      (__NR_Linux +  72)
-#define __NR_fdatasync                  (__NR_Linux +  73)
-#define __NR_truncate                   (__NR_Linux +  74)
-#define __NR_ftruncate                  (__NR_Linux +  75)
-#define __NR_getdents                   (__NR_Linux +  76)
-#define __NR_getcwd                     (__NR_Linux +  77)
-#define __NR_chdir                      (__NR_Linux +  78)
-#define __NR_fchdir                     (__NR_Linux +  79)
-#define __NR_rename                     (__NR_Linux +  80)
-#define __NR_mkdir                      (__NR_Linux +  81)
-#define __NR_rmdir                      (__NR_Linux +  82)
-#define __NR_creat                      (__NR_Linux +  83)
-#define __NR_link                       (__NR_Linux +  84)
-#define __NR_unlink                     (__NR_Linux +  85)
-#define __NR_symlink                    (__NR_Linux +  86)
-#define __NR_readlink                   (__NR_Linux +  87)
-#define __NR_chmod                      (__NR_Linux +  88)
-#define __NR_fchmod                     (__NR_Linux +  89)
-#define __NR_chown                      (__NR_Linux +  90)
-#define __NR_fchown                     (__NR_Linux +  91)
-#define __NR_lchown                     (__NR_Linux +  92)
-#define __NR_umask                      (__NR_Linux +  93)
-#define __NR_gettimeofday               (__NR_Linux +  94)
-#define __NR_getrlimit                  (__NR_Linux +  95)
-#define __NR_getrusage                  (__NR_Linux +  96)
-#define __NR_sysinfo                    (__NR_Linux +  97)
-#define __NR_times                      (__NR_Linux +  98)
-#define __NR_ptrace                     (__NR_Linux +  99)
-#define __NR_getuid                     (__NR_Linux + 100)
-#define __NR_syslog                     (__NR_Linux + 101)
-#define __NR_getgid                     (__NR_Linux + 102)
-#define __NR_setuid                     (__NR_Linux + 103)
-#define __NR_setgid                     (__NR_Linux + 104)
-#define __NR_geteuid                    (__NR_Linux + 105)
-#define __NR_getegid                    (__NR_Linux + 106)
-#define __NR_setpgid                    (__NR_Linux + 107)
-#define __NR_getppid                    (__NR_Linux + 108)
-#define __NR_getpgrp                    (__NR_Linux + 109)
-#define __NR_setsid                     (__NR_Linux + 110)
-#define __NR_setreuid                   (__NR_Linux + 111)
-#define __NR_setregid                   (__NR_Linux + 112)
-#define __NR_getgroups                  (__NR_Linux + 113)
-#define __NR_setgroups                  (__NR_Linux + 114)
-#define __NR_setresuid                  (__NR_Linux + 115)
-#define __NR_getresuid                  (__NR_Linux + 116)
-#define __NR_setresgid                  (__NR_Linux + 117)
-#define __NR_getresgid                  (__NR_Linux + 118)
-#define __NR_getpgid                    (__NR_Linux + 119)
-#define __NR_setfsuid                   (__NR_Linux + 120)
-#define __NR_setfsgid                   (__NR_Linux + 121)
-#define __NR_getsid                     (__NR_Linux + 122)
-#define __NR_capget                     (__NR_Linux + 123)
-#define __NR_capset                     (__NR_Linux + 124)
-#define __NR_rt_sigpending              (__NR_Linux + 125)
-#define __NR_rt_sigtimedwait            (__NR_Linux + 126)
-#define __NR_rt_sigqueueinfo            (__NR_Linux + 127)
-#define __NR_rt_sigsuspend              (__NR_Linux + 128)
-#define __NR_sigaltstack                (__NR_Linux + 129)
-#define __NR_utime                      (__NR_Linux + 130)
-#define __NR_mknod                      (__NR_Linux + 131)
-#define __NR_personality                (__NR_Linux + 132)
-#define __NR_ustat                      (__NR_Linux + 133)
-#define __NR_statfs                     (__NR_Linux + 134)
-#define __NR_fstatfs                    (__NR_Linux + 135)
-#define __NR_sysfs                      (__NR_Linux + 136)
-#define __NR_getpriority                (__NR_Linux + 137)
-#define __NR_setpriority                (__NR_Linux + 138)
-#define __NR_sched_setparam             (__NR_Linux + 139)
-#define __NR_sched_getparam             (__NR_Linux + 140)
-#define __NR_sched_setscheduler         (__NR_Linux + 141)
-#define __NR_sched_getscheduler         (__NR_Linux + 142)
-#define __NR_sched_get_priority_max     (__NR_Linux + 143)
-#define __NR_sched_get_priority_min     (__NR_Linux + 144)
-#define __NR_sched_rr_get_interval      (__NR_Linux + 145)
-#define __NR_mlock                      (__NR_Linux + 146)
-#define __NR_munlock                    (__NR_Linux + 147)
-#define __NR_mlockall                   (__NR_Linux + 148)
-#define __NR_munlockall                 (__NR_Linux + 149)
-#define __NR_vhangup                    (__NR_Linux + 150)
-#define __NR_pivot_root                 (__NR_Linux + 151)
-#define __NR__sysctl                    (__NR_Linux + 152)
-#define __NR_prctl                      (__NR_Linux + 153)
-#define __NR_adjtimex                   (__NR_Linux + 154)
-#define __NR_setrlimit                  (__NR_Linux + 155)
-#define __NR_chroot                     (__NR_Linux + 156)
-#define __NR_sync                       (__NR_Linux + 157)
-#define __NR_acct                       (__NR_Linux + 158)
-#define __NR_settimeofday               (__NR_Linux + 159)
-#define __NR_mount                      (__NR_Linux + 160)
-#define __NR_umount2                    (__NR_Linux + 161)
-#define __NR_swapon                     (__NR_Linux + 162)
-#define __NR_swapoff                    (__NR_Linux + 163)
-#define __NR_reboot                     (__NR_Linux + 164)
-#define __NR_sethostname                (__NR_Linux + 165)
-#define __NR_setdomainname              (__NR_Linux + 166)
-#define __NR_create_module              (__NR_Linux + 167)
-#define __NR_init_module                (__NR_Linux + 168)
-#define __NR_delete_module              (__NR_Linux + 169)
-#define __NR_get_kernel_syms            (__NR_Linux + 170)
-#define __NR_query_module               (__NR_Linux + 171)
-#define __NR_quotactl                   (__NR_Linux + 172)
-#define __NR_nfsservctl                 (__NR_Linux + 173)
-#define __NR_getpmsg                    (__NR_Linux + 174)
-#define __NR_putpmsg                    (__NR_Linux + 175)
-#define __NR_afs_syscall                (__NR_Linux + 176)
-#define __NR_reserved177                (__NR_Linux + 177)
-#define __NR_gettid                     (__NR_Linux + 178)
-#define __NR_readahead                  (__NR_Linux + 179)
-#define __NR_setxattr                   (__NR_Linux + 180)
-#define __NR_lsetxattr                  (__NR_Linux + 181)
-#define __NR_fsetxattr                  (__NR_Linux + 182)
-#define __NR_getxattr                   (__NR_Linux + 183)
-#define __NR_lgetxattr                  (__NR_Linux + 184)
-#define __NR_fgetxattr                  (__NR_Linux + 185)
-#define __NR_listxattr                  (__NR_Linux + 186)
-#define __NR_llistxattr                 (__NR_Linux + 187)
-#define __NR_flistxattr                 (__NR_Linux + 188)
-#define __NR_removexattr                (__NR_Linux + 189)
-#define __NR_lremovexattr               (__NR_Linux + 190)
-#define __NR_fremovexattr               (__NR_Linux + 191)
-#define __NR_tkill                      (__NR_Linux + 192)
-#define __NR_reserved193                (__NR_Linux + 193)
-#define __NR_futex                      (__NR_Linux + 194)
-#define __NR_sched_setaffinity          (__NR_Linux + 195)
-#define __NR_sched_getaffinity          (__NR_Linux + 196)
-#define __NR_cacheflush                 (__NR_Linux + 197)
-#define __NR_cachectl                   (__NR_Linux + 198)
-#define __NR_sysmips                    (__NR_Linux + 199)
-#define __NR_io_setup                   (__NR_Linux + 200)
-#define __NR_io_destroy                 (__NR_Linux + 201)
-#define __NR_io_getevents               (__NR_Linux + 202)
-#define __NR_io_submit                  (__NR_Linux + 203)
-#define __NR_io_cancel                  (__NR_Linux + 204)
-#define __NR_exit_group                 (__NR_Linux + 205)
-#define __NR_lookup_dcookie             (__NR_Linux + 206)
-#define __NR_epoll_create               (__NR_Linux + 207)
-#define __NR_epoll_ctl                  (__NR_Linux + 208)
-#define __NR_epoll_wait                 (__NR_Linux + 209)
-#define __NR_remap_file_pages           (__NR_Linux + 210)
-#define __NR_rt_sigreturn               (__NR_Linux + 211)
-#define __NR_set_tid_address            (__NR_Linux + 212)
-#define __NR_restart_syscall            (__NR_Linux + 213)
-#define __NR_semtimedop                 (__NR_Linux + 214)
-#define __NR_fadvise64                  (__NR_Linux + 215)
-#define __NR_timer_create               (__NR_Linux + 216)
-#define __NR_timer_settime              (__NR_Linux + 217)
-#define __NR_timer_gettime              (__NR_Linux + 218)
-#define __NR_timer_getoverrun           (__NR_Linux + 219)
-#define __NR_timer_delete               (__NR_Linux + 220)
-#define __NR_clock_settime              (__NR_Linux + 221)
-#define __NR_clock_gettime              (__NR_Linux + 222)
-#define __NR_clock_getres               (__NR_Linux + 223)
-#define __NR_clock_nanosleep            (__NR_Linux + 224)
-#define __NR_tgkill                     (__NR_Linux + 225)
-#define __NR_utimes                     (__NR_Linux + 226)
-#define __NR_mbind                      (__NR_Linux + 227)
-#define __NR_get_mempolicy              (__NR_Linux + 228)
-#define __NR_set_mempolicy              (__NR_Linux + 229)
-#define __NR_mq_open                    (__NR_Linux + 230)
-#define __NR_mq_unlink                  (__NR_Linux + 231)
-#define __NR_mq_timedsend               (__NR_Linux + 232)
-#define __NR_mq_timedreceive            (__NR_Linux + 233)
-#define __NR_mq_notify                  (__NR_Linux + 234)
-#define __NR_mq_getsetattr              (__NR_Linux + 235)
-#define __NR_vserver                    (__NR_Linux + 236)
-#define __NR_waitid                     (__NR_Linux + 237)
-/* #define __NR_sys_setaltroot          (__NR_Linux + 238) */
-#define __NR_add_key                    (__NR_Linux + 239)
-#define __NR_request_key                (__NR_Linux + 240)
-#define __NR_keyctl                     (__NR_Linux + 241)
-#define __NR_set_thread_area            (__NR_Linux + 242)
-#define __NR_inotify_init               (__NR_Linux + 243)
-#define __NR_inotify_add_watch          (__NR_Linux + 244)
-#define __NR_inotify_rm_watch           (__NR_Linux + 245)
-#define __NR_migrate_pages              (__NR_Linux + 246)
-#define __NR_openat                     (__NR_Linux + 247)
-#define __NR_mkdirat                    (__NR_Linux + 248)
-#define __NR_mknodat                    (__NR_Linux + 249)
-#define __NR_fchownat                   (__NR_Linux + 250)
-#define __NR_futimesat                  (__NR_Linux + 251)
-#define __NR_newfstatat                 (__NR_Linux + 252)
-#define __NR_unlinkat                   (__NR_Linux + 253)
-#define __NR_renameat                   (__NR_Linux + 254)
-#define __NR_linkat                     (__NR_Linux + 255)
-#define __NR_symlinkat                  (__NR_Linux + 256)
-#define __NR_readlinkat                 (__NR_Linux + 257)
-#define __NR_fchmodat                   (__NR_Linux + 258)
-#define __NR_faccessat                  (__NR_Linux + 259)
-#define __NR_pselect6                   (__NR_Linux + 260)
-#define __NR_ppoll                      (__NR_Linux + 261)
-#define __NR_unshare                    (__NR_Linux + 262)
-#define __NR_splice                     (__NR_Linux + 263)
-#define __NR_sync_file_range            (__NR_Linux + 264)
-#define __NR_tee                        (__NR_Linux + 265)
-#define __NR_vmsplice                   (__NR_Linux + 266)
-#define __NR_move_pages                 (__NR_Linux + 267)
-#define __NR_set_robust_list            (__NR_Linux + 268)
-#define __NR_get_robust_list            (__NR_Linux + 269)
-#define __NR_kexec_load                 (__NR_Linux + 270)
-#define __NR_getcpu                     (__NR_Linux + 271)
-#define __NR_epoll_pwait                (__NR_Linux + 272)
-#define __NR_ioprio_set                 (__NR_Linux + 273)
-#define __NR_ioprio_get                 (__NR_Linux + 274)
-#define __NR_utimensat                  (__NR_Linux + 275)
-#define __NR_signalfd                   (__NR_Linux + 276)
-#define __NR_timerfd                    (__NR_Linux + 277)
-#define __NR_eventfd                    (__NR_Linux + 278)
-#define __NR_fallocate                  (__NR_Linux + 279)
-#define __NR_timerfd_create             (__NR_Linux + 280)
-#define __NR_timerfd_gettime            (__NR_Linux + 281)
-#define __NR_timerfd_settime            (__NR_Linux + 282)
-#define __NR_signalfd4                  (__NR_Linux + 283)
-#define __NR_eventfd2                   (__NR_Linux + 284)
-#define __NR_epoll_create1              (__NR_Linux + 285)
-#define __NR_dup3                       (__NR_Linux + 286)
-#define __NR_pipe2                      (__NR_Linux + 287)
-#define __NR_inotify_init1              (__NR_Linux + 288)
-#define __NR_preadv                     (__NR_Linux + 289)
-#define __NR_pwritev                    (__NR_Linux + 290)
-#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 291)
-#define __NR_perf_event_open            (__NR_Linux + 292)
-#define __NR_accept4                    (__NR_Linux + 293)
-#define __NR_recvmmsg                   (__NR_Linux + 294)
-#define __NR_fanotify_init              (__NR_Linux + 295)
-#define __NR_fanotify_mark              (__NR_Linux + 296)
-#define __NR_prlimit64                  (__NR_Linux + 297)
-#define __NR_name_to_handle_at          (__NR_Linux + 298)
-#define __NR_open_by_handle_at          (__NR_Linux + 299)
-#define __NR_clock_adjtime              (__NR_Linux + 300)
-#define __NR_syncfs                     (__NR_Linux + 301)
-#define __NR_sendmmsg                   (__NR_Linux + 302)
-#define __NR_setns                      (__NR_Linux + 303)
-#define __NR_process_vm_readv           (__NR_Linux + 304)
-#define __NR_process_vm_writev          (__NR_Linux + 305)
-#define __NR_kcmp                       (__NR_Linux + 306)
-
-/*
- * Offset of the last Linux 64-bit flavoured syscall
- */
-#define __NR_Linux_syscalls             306
-
-#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
-
-#define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          306
-
-#if _MIPS_SIM == _MIPS_SIM_NABI32
-
-/*
- * Linux N32 syscalls are in the range from 6000 to 6999.
- */
-#define __NR_Linux                      6000
-#define __NR_read                       (__NR_Linux +   0)
-#define __NR_write                      (__NR_Linux +   1)
-#define __NR_open                       (__NR_Linux +   2)
-#define __NR_close                      (__NR_Linux +   3)
-#define __NR_stat                       (__NR_Linux +   4)
-#define __NR_fstat                      (__NR_Linux +   5)
-#define __NR_lstat                      (__NR_Linux +   6)
-#define __NR_poll                       (__NR_Linux +   7)
-#define __NR_lseek                      (__NR_Linux +   8)
-#define __NR_mmap                       (__NR_Linux +   9)
-#define __NR_mprotect                   (__NR_Linux +  10)
-#define __NR_munmap                     (__NR_Linux +  11)
-#define __NR_brk                        (__NR_Linux +  12)
-#define __NR_rt_sigaction               (__NR_Linux +  13)
-#define __NR_rt_sigprocmask             (__NR_Linux +  14)
-#define __NR_ioctl                      (__NR_Linux +  15)
-#define __NR_pread64                    (__NR_Linux +  16)
-#define __NR_pwrite64                   (__NR_Linux +  17)
-#define __NR_readv                      (__NR_Linux +  18)
-#define __NR_writev                     (__NR_Linux +  19)
-#define __NR_access                     (__NR_Linux +  20)
-#define __NR_pipe                       (__NR_Linux +  21)
-#define __NR__newselect                 (__NR_Linux +  22)
-#define __NR_sched_yield                (__NR_Linux +  23)
-#define __NR_mremap                     (__NR_Linux +  24)
-#define __NR_msync                      (__NR_Linux +  25)
-#define __NR_mincore                    (__NR_Linux +  26)
-#define __NR_madvise                    (__NR_Linux +  27)
-#define __NR_shmget                     (__NR_Linux +  28)
-#define __NR_shmat                      (__NR_Linux +  29)
-#define __NR_shmctl                     (__NR_Linux +  30)
-#define __NR_dup                        (__NR_Linux +  31)
-#define __NR_dup2                       (__NR_Linux +  32)
-#define __NR_pause                      (__NR_Linux +  33)
-#define __NR_nanosleep                  (__NR_Linux +  34)
-#define __NR_getitimer                  (__NR_Linux +  35)
-#define __NR_setitimer                  (__NR_Linux +  36)
-#define __NR_alarm                      (__NR_Linux +  37)
-#define __NR_getpid                     (__NR_Linux +  38)
-#define __NR_sendfile                   (__NR_Linux +  39)
-#define __NR_socket                     (__NR_Linux +  40)
-#define __NR_connect                    (__NR_Linux +  41)
-#define __NR_accept                     (__NR_Linux +  42)
-#define __NR_sendto                     (__NR_Linux +  43)
-#define __NR_recvfrom                   (__NR_Linux +  44)
-#define __NR_sendmsg                    (__NR_Linux +  45)
-#define __NR_recvmsg                    (__NR_Linux +  46)
-#define __NR_shutdown                   (__NR_Linux +  47)
-#define __NR_bind                       (__NR_Linux +  48)
-#define __NR_listen                     (__NR_Linux +  49)
-#define __NR_getsockname                (__NR_Linux +  50)
-#define __NR_getpeername                (__NR_Linux +  51)
-#define __NR_socketpair                 (__NR_Linux +  52)
-#define __NR_setsockopt                 (__NR_Linux +  53)
-#define __NR_getsockopt                 (__NR_Linux +  54)
-#define __NR_clone                      (__NR_Linux +  55)
-#define __NR_fork                       (__NR_Linux +  56)
-#define __NR_execve                     (__NR_Linux +  57)
-#define __NR_exit                       (__NR_Linux +  58)
-#define __NR_wait4                      (__NR_Linux +  59)
-#define __NR_kill                       (__NR_Linux +  60)
-#define __NR_uname                      (__NR_Linux +  61)
-#define __NR_semget                     (__NR_Linux +  62)
-#define __NR_semop                      (__NR_Linux +  63)
-#define __NR_semctl                     (__NR_Linux +  64)
-#define __NR_shmdt                      (__NR_Linux +  65)
-#define __NR_msgget                     (__NR_Linux +  66)
-#define __NR_msgsnd                     (__NR_Linux +  67)
-#define __NR_msgrcv                     (__NR_Linux +  68)
-#define __NR_msgctl                     (__NR_Linux +  69)
-#define __NR_fcntl                      (__NR_Linux +  70)
-#define __NR_flock                      (__NR_Linux +  71)
-#define __NR_fsync                      (__NR_Linux +  72)
-#define __NR_fdatasync                  (__NR_Linux +  73)
-#define __NR_truncate                   (__NR_Linux +  74)
-#define __NR_ftruncate                  (__NR_Linux +  75)
-#define __NR_getdents                   (__NR_Linux +  76)
-#define __NR_getcwd                     (__NR_Linux +  77)
-#define __NR_chdir                      (__NR_Linux +  78)
-#define __NR_fchdir                     (__NR_Linux +  79)
-#define __NR_rename                     (__NR_Linux +  80)
-#define __NR_mkdir                      (__NR_Linux +  81)
-#define __NR_rmdir                      (__NR_Linux +  82)
-#define __NR_creat                      (__NR_Linux +  83)
-#define __NR_link                       (__NR_Linux +  84)
-#define __NR_unlink                     (__NR_Linux +  85)
-#define __NR_symlink                    (__NR_Linux +  86)
-#define __NR_readlink                   (__NR_Linux +  87)
-#define __NR_chmod                      (__NR_Linux +  88)
-#define __NR_fchmod                     (__NR_Linux +  89)
-#define __NR_chown                      (__NR_Linux +  90)
-#define __NR_fchown                     (__NR_Linux +  91)
-#define __NR_lchown                     (__NR_Linux +  92)
-#define __NR_umask                      (__NR_Linux +  93)
-#define __NR_gettimeofday               (__NR_Linux +  94)
-#define __NR_getrlimit                  (__NR_Linux +  95)
-#define __NR_getrusage                  (__NR_Linux +  96)
-#define __NR_sysinfo                    (__NR_Linux +  97)
-#define __NR_times                      (__NR_Linux +  98)
-#define __NR_ptrace                     (__NR_Linux +  99)
-#define __NR_getuid                     (__NR_Linux + 100)
-#define __NR_syslog                     (__NR_Linux + 101)
-#define __NR_getgid                     (__NR_Linux + 102)
-#define __NR_setuid                     (__NR_Linux + 103)
-#define __NR_setgid                     (__NR_Linux + 104)
-#define __NR_geteuid                    (__NR_Linux + 105)
-#define __NR_getegid                    (__NR_Linux + 106)
-#define __NR_setpgid                    (__NR_Linux + 107)
-#define __NR_getppid                    (__NR_Linux + 108)
-#define __NR_getpgrp                    (__NR_Linux + 109)
-#define __NR_setsid                     (__NR_Linux + 110)
-#define __NR_setreuid                   (__NR_Linux + 111)
-#define __NR_setregid                   (__NR_Linux + 112)
-#define __NR_getgroups                  (__NR_Linux + 113)
-#define __NR_setgroups                  (__NR_Linux + 114)
-#define __NR_setresuid                  (__NR_Linux + 115)
-#define __NR_getresuid                  (__NR_Linux + 116)
-#define __NR_setresgid                  (__NR_Linux + 117)
-#define __NR_getresgid                  (__NR_Linux + 118)
-#define __NR_getpgid                    (__NR_Linux + 119)
-#define __NR_setfsuid                   (__NR_Linux + 120)
-#define __NR_setfsgid                   (__NR_Linux + 121)
-#define __NR_getsid                     (__NR_Linux + 122)
-#define __NR_capget                     (__NR_Linux + 123)
-#define __NR_capset                     (__NR_Linux + 124)
-#define __NR_rt_sigpending              (__NR_Linux + 125)
-#define __NR_rt_sigtimedwait            (__NR_Linux + 126)
-#define __NR_rt_sigqueueinfo            (__NR_Linux + 127)
-#define __NR_rt_sigsuspend              (__NR_Linux + 128)
-#define __NR_sigaltstack                (__NR_Linux + 129)
-#define __NR_utime                      (__NR_Linux + 130)
-#define __NR_mknod                      (__NR_Linux + 131)
-#define __NR_personality                (__NR_Linux + 132)
-#define __NR_ustat                      (__NR_Linux + 133)
-#define __NR_statfs                     (__NR_Linux + 134)
-#define __NR_fstatfs                    (__NR_Linux + 135)
-#define __NR_sysfs                      (__NR_Linux + 136)
-#define __NR_getpriority                (__NR_Linux + 137)
-#define __NR_setpriority                (__NR_Linux + 138)
-#define __NR_sched_setparam             (__NR_Linux + 139)
-#define __NR_sched_getparam             (__NR_Linux + 140)
-#define __NR_sched_setscheduler         (__NR_Linux + 141)
-#define __NR_sched_getscheduler         (__NR_Linux + 142)
-#define __NR_sched_get_priority_max     (__NR_Linux + 143)
-#define __NR_sched_get_priority_min     (__NR_Linux + 144)
-#define __NR_sched_rr_get_interval      (__NR_Linux + 145)
-#define __NR_mlock                      (__NR_Linux + 146)
-#define __NR_munlock                    (__NR_Linux + 147)
-#define __NR_mlockall                   (__NR_Linux + 148)
-#define __NR_munlockall                 (__NR_Linux + 149)
-#define __NR_vhangup                    (__NR_Linux + 150)
-#define __NR_pivot_root                 (__NR_Linux + 151)
-#define __NR__sysctl                    (__NR_Linux + 152)
-#define __NR_prctl                      (__NR_Linux + 153)
-#define __NR_adjtimex                   (__NR_Linux + 154)
-#define __NR_setrlimit                  (__NR_Linux + 155)
-#define __NR_chroot                     (__NR_Linux + 156)
-#define __NR_sync                       (__NR_Linux + 157)
-#define __NR_acct                       (__NR_Linux + 158)
-#define __NR_settimeofday               (__NR_Linux + 159)
-#define __NR_mount                      (__NR_Linux + 160)
-#define __NR_umount2                    (__NR_Linux + 161)
-#define __NR_swapon                     (__NR_Linux + 162)
-#define __NR_swapoff                    (__NR_Linux + 163)
-#define __NR_reboot                     (__NR_Linux + 164)
-#define __NR_sethostname                (__NR_Linux + 165)
-#define __NR_setdomainname              (__NR_Linux + 166)
-#define __NR_create_module              (__NR_Linux + 167)
-#define __NR_init_module                (__NR_Linux + 168)
-#define __NR_delete_module              (__NR_Linux + 169)
-#define __NR_get_kernel_syms            (__NR_Linux + 170)
-#define __NR_query_module               (__NR_Linux + 171)
-#define __NR_quotactl                   (__NR_Linux + 172)
-#define __NR_nfsservctl                 (__NR_Linux + 173)
-#define __NR_getpmsg                    (__NR_Linux + 174)
-#define __NR_putpmsg                    (__NR_Linux + 175)
-#define __NR_afs_syscall                (__NR_Linux + 176)
-#define __NR_reserved177                (__NR_Linux + 177)
-#define __NR_gettid                     (__NR_Linux + 178)
-#define __NR_readahead                  (__NR_Linux + 179)
-#define __NR_setxattr                   (__NR_Linux + 180)
-#define __NR_lsetxattr                  (__NR_Linux + 181)
-#define __NR_fsetxattr                  (__NR_Linux + 182)
-#define __NR_getxattr                   (__NR_Linux + 183)
-#define __NR_lgetxattr                  (__NR_Linux + 184)
-#define __NR_fgetxattr                  (__NR_Linux + 185)
-#define __NR_listxattr                  (__NR_Linux + 186)
-#define __NR_llistxattr                 (__NR_Linux + 187)
-#define __NR_flistxattr                 (__NR_Linux + 188)
-#define __NR_removexattr                (__NR_Linux + 189)
-#define __NR_lremovexattr               (__NR_Linux + 190)
-#define __NR_fremovexattr               (__NR_Linux + 191)
-#define __NR_tkill                      (__NR_Linux + 192)
-#define __NR_reserved193                (__NR_Linux + 193)
-#define __NR_futex                      (__NR_Linux + 194)
-#define __NR_sched_setaffinity          (__NR_Linux + 195)
-#define __NR_sched_getaffinity          (__NR_Linux + 196)
-#define __NR_cacheflush                 (__NR_Linux + 197)
-#define __NR_cachectl                   (__NR_Linux + 198)
-#define __NR_sysmips                    (__NR_Linux + 199)
-#define __NR_io_setup                   (__NR_Linux + 200)
-#define __NR_io_destroy                 (__NR_Linux + 201)
-#define __NR_io_getevents               (__NR_Linux + 202)
-#define __NR_io_submit                  (__NR_Linux + 203)
-#define __NR_io_cancel                  (__NR_Linux + 204)
-#define __NR_exit_group                 (__NR_Linux + 205)
-#define __NR_lookup_dcookie             (__NR_Linux + 206)
-#define __NR_epoll_create               (__NR_Linux + 207)
-#define __NR_epoll_ctl                  (__NR_Linux + 208)
-#define __NR_epoll_wait                 (__NR_Linux + 209)
-#define __NR_remap_file_pages           (__NR_Linux + 210)
-#define __NR_rt_sigreturn               (__NR_Linux + 211)
-#define __NR_fcntl64                    (__NR_Linux + 212)
-#define __NR_set_tid_address            (__NR_Linux + 213)
-#define __NR_restart_syscall            (__NR_Linux + 214)
-#define __NR_semtimedop                 (__NR_Linux + 215)
-#define __NR_fadvise64                  (__NR_Linux + 216)
-#define __NR_statfs64                   (__NR_Linux + 217)
-#define __NR_fstatfs64                  (__NR_Linux + 218)
-#define __NR_sendfile64                 (__NR_Linux + 219)
-#define __NR_timer_create               (__NR_Linux + 220)
-#define __NR_timer_settime              (__NR_Linux + 221)
-#define __NR_timer_gettime              (__NR_Linux + 222)
-#define __NR_timer_getoverrun           (__NR_Linux + 223)
-#define __NR_timer_delete               (__NR_Linux + 224)
-#define __NR_clock_settime              (__NR_Linux + 225)
-#define __NR_clock_gettime              (__NR_Linux + 226)
-#define __NR_clock_getres               (__NR_Linux + 227)
-#define __NR_clock_nanosleep            (__NR_Linux + 228)
-#define __NR_tgkill                     (__NR_Linux + 229)
-#define __NR_utimes                     (__NR_Linux + 230)
-#define __NR_mbind                      (__NR_Linux + 231)
-#define __NR_get_mempolicy              (__NR_Linux + 232)
-#define __NR_set_mempolicy              (__NR_Linux + 233)
-#define __NR_mq_open                    (__NR_Linux + 234)
-#define __NR_mq_unlink                  (__NR_Linux + 235)
-#define __NR_mq_timedsend               (__NR_Linux + 236)
-#define __NR_mq_timedreceive            (__NR_Linux + 237)
-#define __NR_mq_notify                  (__NR_Linux + 238)
-#define __NR_mq_getsetattr              (__NR_Linux + 239)
-#define __NR_vserver                    (__NR_Linux + 240)
-#define __NR_waitid                     (__NR_Linux + 241)
-/* #define __NR_sys_setaltroot          (__NR_Linux + 242) */
-#define __NR_add_key                    (__NR_Linux + 243)
-#define __NR_request_key                (__NR_Linux + 244)
-#define __NR_keyctl                     (__NR_Linux + 245)
-#define __NR_set_thread_area            (__NR_Linux + 246)
-#define __NR_inotify_init               (__NR_Linux + 247)
-#define __NR_inotify_add_watch          (__NR_Linux + 248)
-#define __NR_inotify_rm_watch           (__NR_Linux + 249)
-#define __NR_migrate_pages              (__NR_Linux + 250)
-#define __NR_openat                     (__NR_Linux + 251)
-#define __NR_mkdirat                    (__NR_Linux + 252)
-#define __NR_mknodat                    (__NR_Linux + 253)
-#define __NR_fchownat                   (__NR_Linux + 254)
-#define __NR_futimesat                  (__NR_Linux + 255)
-#define __NR_newfstatat                 (__NR_Linux + 256)
-#define __NR_unlinkat                   (__NR_Linux + 257)
-#define __NR_renameat                   (__NR_Linux + 258)
-#define __NR_linkat                     (__NR_Linux + 259)
-#define __NR_symlinkat                  (__NR_Linux + 260)
-#define __NR_readlinkat                 (__NR_Linux + 261)
-#define __NR_fchmodat                   (__NR_Linux + 262)
-#define __NR_faccessat                  (__NR_Linux + 263)
-#define __NR_pselect6                   (__NR_Linux + 264)
-#define __NR_ppoll                      (__NR_Linux + 265)
-#define __NR_unshare                    (__NR_Linux + 266)
-#define __NR_splice                     (__NR_Linux + 267)
-#define __NR_sync_file_range            (__NR_Linux + 268)
-#define __NR_tee                        (__NR_Linux + 269)
-#define __NR_vmsplice                   (__NR_Linux + 270)
-#define __NR_move_pages                 (__NR_Linux + 271)
-#define __NR_set_robust_list            (__NR_Linux + 272)
-#define __NR_get_robust_list            (__NR_Linux + 273)
-#define __NR_kexec_load                 (__NR_Linux + 274)
-#define __NR_getcpu                     (__NR_Linux + 275)
-#define __NR_epoll_pwait                (__NR_Linux + 276)
-#define __NR_ioprio_set                 (__NR_Linux + 277)
-#define __NR_ioprio_get                 (__NR_Linux + 278)
-#define __NR_utimensat                  (__NR_Linux + 279)
-#define __NR_signalfd                   (__NR_Linux + 280)
-#define __NR_timerfd                    (__NR_Linux + 281)
-#define __NR_eventfd                    (__NR_Linux + 282)
-#define __NR_fallocate                  (__NR_Linux + 283)
-#define __NR_timerfd_create             (__NR_Linux + 284)
-#define __NR_timerfd_gettime            (__NR_Linux + 285)
-#define __NR_timerfd_settime            (__NR_Linux + 286)
-#define __NR_signalfd4                  (__NR_Linux + 287)
-#define __NR_eventfd2                   (__NR_Linux + 288)
-#define __NR_epoll_create1              (__NR_Linux + 289)
-#define __NR_dup3                       (__NR_Linux + 290)
-#define __NR_pipe2                      (__NR_Linux + 291)
-#define __NR_inotify_init1              (__NR_Linux + 292)
-#define __NR_preadv                     (__NR_Linux + 293)
-#define __NR_pwritev                    (__NR_Linux + 294)
-#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 295)
-#define __NR_perf_event_open            (__NR_Linux + 296)
-#define __NR_accept4                    (__NR_Linux + 297)
-#define __NR_recvmmsg                   (__NR_Linux + 298)
-#define __NR_getdents64                 (__NR_Linux + 299)
-#define __NR_fanotify_init              (__NR_Linux + 300)
-#define __NR_fanotify_mark              (__NR_Linux + 301)
-#define __NR_prlimit64                  (__NR_Linux + 302)
-#define __NR_name_to_handle_at          (__NR_Linux + 303)
-#define __NR_open_by_handle_at          (__NR_Linux + 304)
-#define __NR_clock_adjtime              (__NR_Linux + 305)
-#define __NR_syncfs                     (__NR_Linux + 306)
-#define __NR_sendmmsg                   (__NR_Linux + 307)
-#define __NR_setns                      (__NR_Linux + 308)
-#define __NR_process_vm_readv           (__NR_Linux + 309)
-#define __NR_process_vm_writev          (__NR_Linux + 310)
-#define __NR_kcmp                       (__NR_Linux + 311)
-
-/*
- * Offset of the last N32 flavoured syscall
- */
-#define __NR_Linux_syscalls             311
-
-#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
-
-#define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         311
-
-#ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
 
@@ -1089,5 +70,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall")
 
-#endif /* __KERNEL__ */
 #endif /* _ASM_UNISTD_H */
diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild
index baebb3da1d44..a1a0452ac185 100644
--- a/arch/mips/include/uapi/asm/Kbuild
+++ b/arch/mips/include/uapi/asm/Kbuild
@@ -1,3 +1,37 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += byteorder.h
+header-y += cachectl.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += ioctl.h
+header-y += ioctls.h
+header-y += ipcbuf.h
+header-y += kvm_para.h
+header-y += mman.h
+header-y += msgbuf.h
+header-y += param.h
+header-y += poll.h
+header-y += posix_types.h
+header-y += ptrace.h
+header-y += resource.h
+header-y += sembuf.h
+header-y += setup.h
+header-y += sgidefs.h
+header-y += shmbuf.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += socket.h
+header-y += sockios.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += sysmips.h
+header-y += termbits.h
+header-y += termios.h
+header-y += types.h
+header-y += unistd.h
diff --git a/arch/mips/include/asm/auxvec.h b/arch/mips/include/uapi/asm/auxvec.h
index 7cf7f2d21943..7cf7f2d21943 100644
--- a/arch/mips/include/asm/auxvec.h
+++ b/arch/mips/include/uapi/asm/auxvec.h
diff --git a/arch/mips/include/asm/bitsperlong.h b/arch/mips/include/uapi/asm/bitsperlong.h
index 3e4c10a8e787..3e4c10a8e787 100644
--- a/arch/mips/include/asm/bitsperlong.h
+++ b/arch/mips/include/uapi/asm/bitsperlong.h
diff --git a/arch/mips/include/asm/byteorder.h b/arch/mips/include/uapi/asm/byteorder.h
index 9579051ff1c7..9579051ff1c7 100644
--- a/arch/mips/include/asm/byteorder.h
+++ b/arch/mips/include/uapi/asm/byteorder.h
diff --git a/arch/mips/include/asm/cachectl.h b/arch/mips/include/uapi/asm/cachectl.h
index f3ce721861d3..f3ce721861d3 100644
--- a/arch/mips/include/asm/cachectl.h
+++ b/arch/mips/include/uapi/asm/cachectl.h
diff --git a/arch/mips/include/uapi/asm/errno.h b/arch/mips/include/uapi/asm/errno.h
new file mode 100644
index 000000000000..bd67b15042ec
--- /dev/null
+++ b/arch/mips/include/uapi/asm/errno.h
@@ -0,0 +1,129 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1995, 1999, 2001, 2002 by Ralf Baechle
+ */
+#ifndef _UAPI_ASM_ERRNO_H
+#define _UAPI_ASM_ERRNO_H
+
+/*
+ * These error numbers are intended to be MIPS ABI compatible
+ */
+
+#include <asm-generic/errno-base.h>
+
+#define ENOMSG          35      /* No message of desired type */
+#define EIDRM           36      /* Identifier removed */
+#define ECHRNG          37      /* Channel number out of range */
+#define EL2NSYNC        38      /* Level 2 not synchronized */
+#define EL3HLT          39      /* Level 3 halted */
+#define EL3RST          40      /* Level 3 reset */
+#define ELNRNG          41      /* Link number out of range */
+#define EUNATCH         42      /* Protocol driver not attached */
+#define ENOCSI          43      /* No CSI structure available */
+#define EL2HLT          44      /* Level 2 halted */
+#define EDEADLK         45      /* Resource deadlock would occur */
+#define ENOLCK          46      /* No record locks available */
+#define EBADE           50      /* Invalid exchange */
+#define EBADR           51      /* Invalid request descriptor */
+#define EXFULL          52      /* Exchange full */
+#define ENOANO          53      /* No anode */
+#define EBADRQC         54      /* Invalid request code */
+#define EBADSLT         55      /* Invalid slot */
+#define EDEADLOCK       56      /* File locking deadlock error */
+#define EBFONT          59      /* Bad font file format */
+#define ENOSTR          60      /* Device not a stream */
+#define ENODATA         61      /* No data available */
+#define ETIME           62      /* Timer expired */
+#define ENOSR           63      /* Out of streams resources */
+#define ENONET          64      /* Machine is not on the network */
+#define ENOPKG          65      /* Package not installed */
+#define EREMOTE         66      /* Object is remote */
+#define ENOLINK         67      /* Link has been severed */
+#define EADV            68      /* Advertise error */
+#define ESRMNT          69      /* Srmount error */
+#define ECOMM           70      /* Communication error on send */
+#define EPROTO          71      /* Protocol error */
+#define EDOTDOT         73      /* RFS specific error */
+#define EMULTIHOP       74      /* Multihop attempted */
+#define EBADMSG         77      /* Not a data message */
+#define ENAMETOOLONG    78      /* File name too long */
+#define EOVERFLOW       79      /* Value too large for defined data type */
+#define ENOTUNIQ        80      /* Name not unique on network */
+#define EBADFD          81      /* File descriptor in bad state */
+#define EREMCHG         82      /* Remote address changed */
+#define ELIBACC         83      /* Can not access a needed shared library */
+#define ELIBBAD         84      /* Accessing a corrupted shared library */
+#define ELIBSCN         85      /* .lib section in a.out corrupted */
+#define ELIBMAX         86      /* Attempting to link in too many shared libraries */
+#define ELIBEXEC        87      /* Cannot exec a shared library directly */
+#define EILSEQ          88      /* Illegal byte sequence */
+#define ENOSYS          89      /* Function not implemented */
+#define ELOOP           90      /* Too many symbolic links encountered */
+#define ERESTART        91      /* Interrupted system call should be restarted */
+#define ESTRPIPE        92      /* Streams pipe error */
+#define ENOTEMPTY       93      /* Directory not empty */
+#define EUSERS          94      /* Too many users */
+#define ENOTSOCK        95      /* Socket operation on non-socket */
+#define EDESTADDRREQ    96      /* Destination address required */
+#define EMSGSIZE        97      /* Message too long */
+#define EPROTOTYPE      98      /* Protocol wrong type for socket */
+#define ENOPROTOOPT     99      /* Protocol not available */
+#define EPROTONOSUPPORT 120     /* Protocol not supported */
+#define ESOCKTNOSUPPORT 121     /* Socket type not supported */
+#define EOPNOTSUPP      122     /* Operation not supported on transport endpoint */
+#define EPFNOSUPPORT    123     /* Protocol family not supported */
+#define EAFNOSUPPORT    124     /* Address family not supported by protocol */
+#define EADDRINUSE      125     /* Address already in use */
+#define EADDRNOTAVAIL   126     /* Cannot assign requested address */
+#define ENETDOWN        127     /* Network is down */
+#define ENETUNREACH     128     /* Network is unreachable */
+#define ENETRESET       129     /* Network dropped connection because of reset */
+#define ECONNABORTED    130     /* Software caused connection abort */
+#define ECONNRESET      131     /* Connection reset by peer */
+#define ENOBUFS         132     /* No buffer space available */
+#define EISCONN         133     /* Transport endpoint is already connected */
+#define ENOTCONN        134     /* Transport endpoint is not connected */
+#define EUCLEAN         135     /* Structure needs cleaning */
+#define ENOTNAM         137     /* Not a XENIX named type file */
+#define ENAVAIL         138     /* No XENIX semaphores available */
+#define EISNAM          139     /* Is a named type file */
+#define EREMOTEIO       140     /* Remote I/O error */
+#define EINIT           141     /* Reserved */
+#define EREMDEV         142     /* Error 142 */
+#define ESHUTDOWN       143     /* Cannot send after transport endpoint shutdown */
+#define ETOOMANYREFS    144     /* Too many references: cannot splice */
+#define ETIMEDOUT       145     /* Connection timed out */
+#define ECONNREFUSED    146     /* Connection refused */
+#define EHOSTDOWN       147     /* Host is down */
+#define EHOSTUNREACH    148     /* No route to host */
+#define EWOULDBLOCK     EAGAIN  /* Operation would block */
+#define EALREADY        149     /* Operation already in progress */
+#define EINPROGRESS     150     /* Operation now in progress */
+#define ESTALE          151     /* Stale NFS file handle */
+#define ECANCELED       158     /* AIO operation canceled */
+
+/*
+ * These error are Linux extensions.
+ */
+#define ENOMEDIUM       159     /* No medium found */
+#define EMEDIUMTYPE     160     /* Wrong medium type */
+#define ENOKEY          161     /* Required key not available */
+#define EKEYEXPIRED     162     /* Key has expired */
+#define EKEYREVOKED     163     /* Key has been revoked */
+#define EKEYREJECTED    164     /* Key was rejected by service */
+
+/* for robust mutexes */
+#define EOWNERDEAD      165     /* Owner died */
+#define ENOTRECOVERABLE 166     /* State not recoverable */
+
+#define ERFKILL         167     /* Operation not possible due to RF-kill */
+
+#define EHWPOISON       168     /* Memory page has hardware error */
+
+#define EDQUOT          1133    /* Quota exceeded */
+
+
+#endif /* _UAPI_ASM_ERRNO_H */
diff --git a/arch/mips/include/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h
index 75eddedcfc3e..75eddedcfc3e 100644
--- a/arch/mips/include/asm/fcntl.h
+++ b/arch/mips/include/uapi/asm/fcntl.h
diff --git a/arch/mips/include/asm/ioctl.h b/arch/mips/include/uapi/asm/ioctl.h
index c515a1a4c47c..c515a1a4c47c 100644
--- a/arch/mips/include/asm/ioctl.h
+++ b/arch/mips/include/uapi/asm/ioctl.h
diff --git a/arch/mips/include/asm/ioctls.h b/arch/mips/include/uapi/asm/ioctls.h
index 92403c3d6007..92403c3d6007 100644
--- a/arch/mips/include/asm/ioctls.h
+++ b/arch/mips/include/uapi/asm/ioctls.h
diff --git a/arch/mips/include/asm/ipcbuf.h b/arch/mips/include/uapi/asm/ipcbuf.h
index 84c7e51cb6d0..84c7e51cb6d0 100644
--- a/arch/mips/include/asm/ipcbuf.h
+++ b/arch/mips/include/uapi/asm/ipcbuf.h
diff --git a/arch/mips/include/asm/kvm_para.h b/arch/mips/include/uapi/asm/kvm_para.h
index 14fab8f0b957..14fab8f0b957 100644
--- a/arch/mips/include/asm/kvm_para.h
+++ b/arch/mips/include/uapi/asm/kvm_para.h
diff --git a/arch/mips/include/asm/mman.h b/arch/mips/include/uapi/asm/mman.h
index 46d3da0d4b92..46d3da0d4b92 100644
--- a/arch/mips/include/asm/mman.h
+++ b/arch/mips/include/uapi/asm/mman.h
diff --git a/arch/mips/include/asm/msgbuf.h b/arch/mips/include/uapi/asm/msgbuf.h
index 0d6c7f14de31..0d6c7f14de31 100644
--- a/arch/mips/include/asm/msgbuf.h
+++ b/arch/mips/include/uapi/asm/msgbuf.h
diff --git a/arch/mips/include/asm/param.h b/arch/mips/include/uapi/asm/param.h
index da3920fce9ad..da3920fce9ad 100644
--- a/arch/mips/include/asm/param.h
+++ b/arch/mips/include/uapi/asm/param.h
diff --git a/arch/mips/include/asm/poll.h b/arch/mips/include/uapi/asm/poll.h
index 47b952080431..47b952080431 100644
--- a/arch/mips/include/asm/poll.h
+++ b/arch/mips/include/uapi/asm/poll.h
diff --git a/arch/mips/include/asm/posix_types.h b/arch/mips/include/uapi/asm/posix_types.h
index fa03ec3fbf89..fa03ec3fbf89 100644
--- a/arch/mips/include/asm/posix_types.h
+++ b/arch/mips/include/uapi/asm/posix_types.h
diff --git a/arch/mips/include/uapi/asm/ptrace.h b/arch/mips/include/uapi/asm/ptrace.h
new file mode 100644
index 000000000000..1bc1f52f40d7
--- /dev/null
+++ b/arch/mips/include/uapi/asm/ptrace.h
@@ -0,0 +1,116 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle
+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_PTRACE_H
+#define _UAPI_ASM_PTRACE_H
+
+/* 0 - 31 are integer registers, 32 - 63 are fp registers.  */
+#define FPR_BASE        32
+#define PC              64
+#define CAUSE           65
+#define BADVADDR        66
+#define MMHI            67
+#define MMLO            68
+#define FPC_CSR         69
+#define FPC_EIR         70
+#define DSP_BASE        71              /* 3 more hi / lo register pairs */
+#define DSP_CONTROL     77
+#define ACX             78
+
+/*
+ * This struct defines the way the registers are stored on the stack during a
+ * system call/exception. As usual the registers k0/k1 aren't being saved.
+ */
+struct pt_regs {
+#ifdef CONFIG_32BIT
+        /* Pad bytes for argument save space on the stack. */
+        unsigned long pad0[6];
+#endif
+
+        /* Saved main processor registers. */
+        unsigned long regs[32];
+
+        /* Saved special registers. */
+        unsigned long cp0_status;
+        unsigned long hi;
+        unsigned long lo;
+#ifdef CONFIG_CPU_HAS_SMARTMIPS
+        unsigned long acx;
+#endif
+        unsigned long cp0_badvaddr;
+        unsigned long cp0_cause;
+        unsigned long cp0_epc;
+#ifdef CONFIG_MIPS_MT_SMTC
+        unsigned long cp0_tcstatus;
+#endif /* CONFIG_MIPS_MT_SMTC */
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+        unsigned long long mpl[3];        /* MTM{0,1,2} */
+        unsigned long long mtp[3];        /* MTP{0,1,2} */
+#endif
+} __attribute__ ((aligned (8)));
+
+/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
+#define PTRACE_GETREGS          12
+#define PTRACE_SETREGS          13
+#define PTRACE_GETFPREGS                14
+#define PTRACE_SETFPREGS                15
+/* #define PTRACE_GETFPXREGS            18 */
+/* #define PTRACE_SETFPXREGS            19 */
+
+#define PTRACE_OLDSETOPTIONS    21
+
+#define PTRACE_GET_THREAD_AREA  25
+#define PTRACE_SET_THREAD_AREA  26
+
+/* Calls to trace a 64bit program from a 32bit program.  */
+#define PTRACE_PEEKTEXT_3264    0xc0
+#define PTRACE_PEEKDATA_3264    0xc1
+#define PTRACE_POKETEXT_3264    0xc2
+#define PTRACE_POKEDATA_3264    0xc3
+#define PTRACE_GET_THREAD_AREA_3264     0xc4
+
+/* Read and write watchpoint registers.  */
+enum pt_watch_style {
+        pt_watch_style_mips32,
+        pt_watch_style_mips64
+};
+struct mips32_watch_regs {
+        unsigned int watchlo[8];
+        /* Lower 16 bits of watchhi. */
+        unsigned short watchhi[8];
+        /* Valid mask and I R W bits.
+         * bit 0 -- 1 if W bit is usable.
+         * bit 1 -- 1 if R bit is usable.
+         * bit 2 -- 1 if I bit is usable.
+         * bits 3 - 11 -- Valid watchhi mask bits.
+         */
+        unsigned short watch_masks[8];
+        /* The number of valid watch register pairs.  */
+        unsigned int num_valid;
+} __attribute__((aligned(8)));
+
+struct mips64_watch_regs {
+        unsigned long long watchlo[8];
+        unsigned short watchhi[8];
+        unsigned short watch_masks[8];
+        unsigned int num_valid;
+} __attribute__((aligned(8)));
+
+struct pt_watch_regs {
+        enum pt_watch_style style;
+        union {
+                struct mips32_watch_regs mips32;
+                struct mips64_watch_regs mips64;
+        };
+};
+
+#define PTRACE_GET_WATCH_REGS   0xd0
+#define PTRACE_SET_WATCH_REGS   0xd1
+
+
+#endif /* _UAPI_ASM_PTRACE_H */
diff --git a/arch/mips/include/asm/resource.h b/arch/mips/include/uapi/asm/resource.h
index 87cb3085269c..87cb3085269c 100644
--- a/arch/mips/include/asm/resource.h
+++ b/arch/mips/include/uapi/asm/resource.h
diff --git a/arch/mips/include/asm/sembuf.h b/arch/mips/include/uapi/asm/sembuf.h
index 7281a4decaa0..7281a4decaa0 100644
--- a/arch/mips/include/asm/sembuf.h
+++ b/arch/mips/include/uapi/asm/sembuf.h
diff --git a/arch/mips/include/uapi/asm/setup.h b/arch/mips/include/uapi/asm/setup.h
new file mode 100644
index 000000000000..93f237bb1353
--- /dev/null
+++ b/arch/mips/include/uapi/asm/setup.h
@@ -0,0 +1,7 @@
+#ifndef _UAPI_MIPS_SETUP_H
+#define _UAPI_MIPS_SETUP_H
+
+#define COMMAND_LINE_SIZE       4096
+
+
+#endif /* _UAPI_MIPS_SETUP_H */
diff --git a/arch/mips/include/asm/sgidefs.h b/arch/mips/include/uapi/asm/sgidefs.h
index 876442fcfb32..876442fcfb32 100644
--- a/arch/mips/include/asm/sgidefs.h
+++ b/arch/mips/include/uapi/asm/sgidefs.h
diff --git a/arch/mips/include/asm/shmbuf.h b/arch/mips/include/uapi/asm/shmbuf.h
index f994438277bf..f994438277bf 100644
--- a/arch/mips/include/asm/shmbuf.h
+++ b/arch/mips/include/uapi/asm/shmbuf.h
diff --git a/arch/mips/include/uapi/asm/sigcontext.h b/arch/mips/include/uapi/asm/sigcontext.h
new file mode 100644
index 000000000000..6c9906f59c6e
--- /dev/null
+++ b/arch/mips/include/uapi/asm/sigcontext.h
@@ -0,0 +1,78 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1996, 1997, 1999 by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_SIGCONTEXT_H
+#define _UAPI_ASM_SIGCONTEXT_H
+
+#include <linux/types.h>
+#include <asm/sgidefs.h>
+
+#if _MIPS_SIM == _MIPS_SIM_ABI32
+
+/*
+ * Keep this struct definition in sync with the sigcontext fragment
+ * in arch/mips/tools/offset.c
+ */
+struct sigcontext {
+        unsigned int            sc_regmask;     /* Unused */
+        unsigned int            sc_status;      /* Unused */
+        unsigned long long      sc_pc;
+        unsigned long long      sc_regs[32];
+        unsigned long long      sc_fpregs[32];
+        unsigned int            sc_acx;         /* Was sc_ownedfp */
+        unsigned int            sc_fpc_csr;
+        unsigned int            sc_fpc_eir;     /* Unused */
+        unsigned int            sc_used_math;
+        unsigned int            sc_dsp;         /* dsp status, was sc_ssflags */
+        unsigned long long      sc_mdhi;
+        unsigned long long      sc_mdlo;
+        unsigned long           sc_hi1;         /* Was sc_cause */
+        unsigned long           sc_lo1;         /* Was sc_badvaddr */
+        unsigned long           sc_hi2;         /* Was sc_sigset[4] */
+        unsigned long           sc_lo2;
+        unsigned long           sc_hi3;
+        unsigned long           sc_lo3;
+};
+
+#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
+
+#if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
+
+#include <linux/posix_types.h>
+/*
+ * Keep this struct definition in sync with the sigcontext fragment
+ * in arch/mips/tools/offset.c
+ *
+ * Warning: this structure illdefined with sc_badvaddr being just an unsigned
+ * int so it was changed to unsigned long in 2.6.0-test1.  This may break
+ * binary compatibility - no prisoners.
+ * DSP ASE in 2.6.12-rc4.  Turn sc_mdhi and sc_mdlo into an array of four
+ * entries, add sc_dsp and sc_reserved for padding.  No prisoners.
+ */
+struct sigcontext {
+        __u64   sc_regs[32];
+        __u64   sc_fpregs[32];
+        __u64   sc_mdhi;
+        __u64   sc_hi1;
+        __u64   sc_hi2;
+        __u64   sc_hi3;
+        __u64   sc_mdlo;
+        __u64   sc_lo1;
+        __u64   sc_lo2;
+        __u64   sc_lo3;
+        __u64   sc_pc;
+        __u32   sc_fpc_csr;
+        __u32   sc_used_math;
+        __u32   sc_dsp;
+        __u32   sc_reserved;
+};
+
+
+#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
+
+#endif /* _UAPI_ASM_SIGCONTEXT_H */
diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
new file mode 100644
index 000000000000..73446508d846
--- /dev/null
+++ b/arch/mips/include/uapi/asm/siginfo.h
@@ -0,0 +1,114 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1998, 1999, 2001, 2003 Ralf Baechle
+ * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_SIGINFO_H
+#define _UAPI_ASM_SIGINFO_H
+
+
+#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))
+#undef __ARCH_SI_TRAPNO /* exception code needs to fill this ...  */
+
+#define HAVE_ARCH_SIGINFO_T
+
+/*
+ * We duplicate the generic versions - <asm-generic/siginfo.h> is just borked
+ * by design ...
+ */
+#define HAVE_ARCH_COPY_SIGINFO
+struct siginfo;
+
+/*
+ * Careful to keep union _sifields from shifting ...
+ */
+#ifdef CONFIG_32BIT
+#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
+#endif
+#ifdef CONFIG_64BIT
+#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
+#endif
+
+#include <asm-generic/siginfo.h>
+
+typedef struct siginfo {
+        int si_signo;
+        int si_code;
+        int si_errno;
+        int __pad0[SI_MAX_SIZE / sizeof(int) - SI_PAD_SIZE - 3];
+
+        union {
+                int _pad[SI_PAD_SIZE];
+
+                /* kill() */
+                struct {
+                        pid_t _pid;             /* sender's pid */
+                        __ARCH_SI_UID_T _uid;   /* sender's uid */
+                } _kill;
+
+                /* POSIX.1b timers */
+                struct {
+                        timer_t _tid;           /* timer id */
+                        int _overrun;           /* overrun count */
+                        char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
+                        sigval_t _sigval;       /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        pid_t _pid;             /* sender's pid */
+                        __ARCH_SI_UID_T _uid;   /* sender's uid */
+                        sigval_t _sigval;
+                } _rt;
+
+                /* SIGCHLD */
+                struct {
+                        pid_t _pid;             /* which child */
+                        __ARCH_SI_UID_T _uid;   /* sender's uid */
+                        int _status;            /* exit code */
+                        clock_t _utime;
+                        clock_t _stime;
+                } _sigchld;
+
+                /* IRIX SIGCHLD */
+                struct {
+                        pid_t _pid;             /* which child */
+                        clock_t _utime;
+                        int _status;            /* exit code */
+                        clock_t _stime;
+                } _irix_sigchld;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        void __user *_addr; /* faulting insn/memory ref. */
+#ifdef __ARCH_SI_TRAPNO
+                        int _trapno;    /* TRAP # which caused the signal */
+#endif
+                        short _addr_lsb;
+                } _sigfault;
+
+                /* SIGPOLL, SIGXFSZ (To do ...)  */
+                struct {
+                        __ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+        } _sifields;
+} siginfo_t;
+
+/*
+ * si_code values
+ * Again these have been chosen to be IRIX compatible.
+ */
+#undef SI_ASYNCIO
+#undef SI_TIMER
+#undef SI_MESGQ
+#define SI_ASYNCIO      -2      /* sent by AIO completion */
+#define SI_TIMER __SI_CODE(__SI_TIMER, -3) /* sent by timer expiration */
+#define SI_MESGQ __SI_CODE(__SI_MESGQ, -4) /* sent by real time mesq state change */
+
+
+#endif /* _UAPI_ASM_SIGINFO_H */
diff --git a/arch/mips/include/uapi/asm/signal.h b/arch/mips/include/uapi/asm/signal.h
new file mode 100644
index 000000000000..3f1237c6c80e
--- /dev/null
+++ b/arch/mips/include/uapi/asm/signal.h
@@ -0,0 +1,123 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1995, 96, 97, 98, 99, 2003 by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_SIGNAL_H
+#define _UAPI_ASM_SIGNAL_H
+
+#include <linux/types.h>
+
+#define _NSIG           128
+#define _NSIG_BPW       (sizeof(unsigned long) * 8)
+#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
+
+typedef struct {
+        unsigned long sig[_NSIG_WORDS];
+} sigset_t;
+
+typedef unsigned long old_sigset_t;             /* at least 32 bits */
+
+#define SIGHUP           1      /* Hangup (POSIX).  */
+#define SIGINT           2      /* Interrupt (ANSI).  */
+#define SIGQUIT          3      /* Quit (POSIX).  */
+#define SIGILL           4      /* Illegal instruction (ANSI).  */
+#define SIGTRAP          5      /* Trace trap (POSIX).  */
+#define SIGIOT           6      /* IOT trap (4.2 BSD).  */
+#define SIGABRT          SIGIOT /* Abort (ANSI).  */
+#define SIGEMT           7
+#define SIGFPE           8      /* Floating-point exception (ANSI).  */
+#define SIGKILL          9      /* Kill, unblockable (POSIX).  */
+#define SIGBUS          10      /* BUS error (4.2 BSD).  */
+#define SIGSEGV         11      /* Segmentation violation (ANSI).  */
+#define SIGSYS          12
+#define SIGPIPE         13      /* Broken pipe (POSIX).  */
+#define SIGALRM         14      /* Alarm clock (POSIX).  */
+#define SIGTERM         15      /* Termination (ANSI).  */
+#define SIGUSR1         16      /* User-defined signal 1 (POSIX).  */
+#define SIGUSR2         17      /* User-defined signal 2 (POSIX).  */
+#define SIGCHLD         18      /* Child status has changed (POSIX).  */
+#define SIGCLD          SIGCHLD /* Same as SIGCHLD (System V).  */
+#define SIGPWR          19      /* Power failure restart (System V).  */
+#define SIGWINCH        20      /* Window size change (4.3 BSD, Sun).  */
+#define SIGURG          21      /* Urgent condition on socket (4.2 BSD).  */
+#define SIGIO           22      /* I/O now possible (4.2 BSD).  */
+#define SIGPOLL         SIGIO   /* Pollable event occurred (System V).  */
+#define SIGSTOP         23      /* Stop, unblockable (POSIX).  */
+#define SIGTSTP         24      /* Keyboard stop (POSIX).  */
+#define SIGCONT         25      /* Continue (POSIX).  */
+#define SIGTTIN         26      /* Background read from tty (POSIX).  */
+#define SIGTTOU         27      /* Background write to tty (POSIX).  */
+#define SIGVTALRM       28      /* Virtual alarm clock (4.2 BSD).  */
+#define SIGPROF         29      /* Profiling alarm clock (4.2 BSD).  */
+#define SIGXCPU         30      /* CPU limit exceeded (4.2 BSD).  */
+#define SIGXFSZ         31      /* File size limit exceeded (4.2 BSD).  */
+
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#define SIGRTMAX        _NSIG
+
+/*
+ * SA_FLAGS values:
+ *
+ * SA_ONSTACK indicates that a registered stack_t will be used.
+ * SA_RESTART flag to get restarting signals (which were the default long ago)
+ * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
+ * SA_RESETHAND clears the handler when the signal is delivered.
+ * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
+ * SA_NODEFER prevents the current signal from being masked in the handler.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_ONSTACK      0x08000000
+#define SA_RESETHAND    0x80000000
+#define SA_RESTART      0x10000000
+#define SA_SIGINFO      0x00000008
+#define SA_NODEFER      0x40000000
+#define SA_NOCLDWAIT    0x00010000
+#define SA_NOCLDSTOP    0x00000001
+
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+
+#define SA_RESTORER     0x04000000      /* Only for o32 */
+
+/*
+ * sigaltstack controls
+ */
+#define SS_ONSTACK     1
+#define SS_DISABLE     2
+
+#define MINSIGSTKSZ    2048
+#define SIGSTKSZ       8192
+
+
+#define SIG_BLOCK       1       /* for blocking signals */
+#define SIG_UNBLOCK     2       /* for unblocking signals */
+#define SIG_SETMASK     3       /* for setting the signal mask */
+
+#include <asm-generic/signal-defs.h>
+
+struct sigaction {
+        unsigned int    sa_flags;
+        __sighandler_t  sa_handler;
+        sigset_t        sa_mask;
+};
+
+struct k_sigaction {
+        struct sigaction sa;
+};
+
+/* IRIX compatible stack_t  */
+typedef struct sigaltstack {
+        void __user *ss_sp;
+        size_t ss_size;
+        int ss_flags;
+} stack_t;
+
+
+#endif /* _UAPI_ASM_SIGNAL_H */
diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h
new file mode 100644
index 000000000000..c5ed59549cb8
--- /dev/null
+++ b/arch/mips/include/uapi/asm/socket.h
@@ -0,0 +1,93 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1997, 1999, 2000, 2001 Ralf Baechle
+ * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_SOCKET_H
+#define _UAPI_ASM_SOCKET_H
+
+#include <asm/sockios.h>
+
+/*
+ * For setsockopt(2)
+ *
+ * This defines are ABI conformant as far as Linux supports these ...
+ */
+#define SOL_SOCKET      0xffff
+
+#define SO_DEBUG        0x0001  /* Record debugging information.  */
+#define SO_REUSEADDR    0x0004  /* Allow reuse of local addresses.  */
+#define SO_KEEPALIVE    0x0008  /* Keep connections alive and send
+                                   SIGPIPE when they die.  */
+#define SO_DONTROUTE    0x0010  /* Don't do local routing.  */
+#define SO_BROADCAST    0x0020  /* Allow transmission of
+                                   broadcast messages.  */
+#define SO_LINGER       0x0080  /* Block on close of a reliable
+                                   socket to transmit pending data.  */
+#define SO_OOBINLINE 0x0100     /* Receive out-of-band data in-band.  */
+#if 0
+To add: #define SO_REUSEPORT 0x0200     /* Allow local address and port reuse.  */
+#endif
+
+#define SO_TYPE         0x1008  /* Compatible name for SO_STYLE.  */
+#define SO_STYLE        SO_TYPE /* Synonym */
+#define SO_ERROR        0x1007  /* get error status and clear */
+#define SO_SNDBUF       0x1001  /* Send buffer size. */
+#define SO_RCVBUF       0x1002  /* Receive buffer. */
+#define SO_SNDLOWAT     0x1003  /* send low-water mark */
+#define SO_RCVLOWAT     0x1004  /* receive low-water mark */
+#define SO_SNDTIMEO     0x1005  /* send timeout */
+#define SO_RCVTIMEO     0x1006  /* receive timeout */
+#define SO_ACCEPTCONN   0x1009
+#define SO_PROTOCOL     0x1028  /* protocol type */
+#define SO_DOMAIN       0x1029  /* domain/socket family */
+
+/* linux-specific, might as well be the same as on i386 */
+#define SO_NO_CHECK     11
+#define SO_PRIORITY     12
+#define SO_BSDCOMPAT    14
+
+#define SO_PASSCRED     17
+#define SO_PEERCRED     18
+
+/* Security levels - as per NRL IPv6 - don't actually do anything */
+#define SO_SECURITY_AUTHENTICATION              22
+#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
+#define SO_SECURITY_ENCRYPTION_NETWORK          24
+
+#define SO_BINDTODEVICE         25
+
+/* Socket filtering */
+#define SO_ATTACH_FILTER        26
+#define SO_DETACH_FILTER        27
+
+#define SO_PEERNAME             28
+#define SO_TIMESTAMP            29
+#define SCM_TIMESTAMP           SO_TIMESTAMP
+
+#define SO_PEERSEC              30
+#define SO_SNDBUFFORCE          31
+#define SO_RCVBUFFORCE          33
+#define SO_PASSSEC              34
+#define SO_TIMESTAMPNS          35
+#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
+
+#define SO_MARK                 36
+
+#define SO_TIMESTAMPING         37
+#define SCM_TIMESTAMPING        SO_TIMESTAMPING
+
+#define SO_RXQ_OVFL             40
+
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+#define SO_PEEK_OFF             42
+
+/* Instruct lower device to use last 4-bytes of skb data as FCS */
+#define SO_NOFCS                43
+
+
+#endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/mips/include/asm/sockios.h b/arch/mips/include/uapi/asm/sockios.h
index ed1a5f78d22f..ed1a5f78d22f 100644
--- a/arch/mips/include/asm/sockios.h
+++ b/arch/mips/include/uapi/asm/sockios.h
diff --git a/arch/mips/include/asm/stat.h b/arch/mips/include/uapi/asm/stat.h
index fe9a4c3ec5a1..fe9a4c3ec5a1 100644
--- a/arch/mips/include/asm/stat.h
+++ b/arch/mips/include/uapi/asm/stat.h
diff --git a/arch/mips/include/asm/statfs.h b/arch/mips/include/uapi/asm/statfs.h
index 0f805c7a42a5..0f805c7a42a5 100644
--- a/arch/mips/include/asm/statfs.h
+++ b/arch/mips/include/uapi/asm/statfs.h
diff --git a/arch/mips/include/asm/swab.h b/arch/mips/include/uapi/asm/swab.h
index 97c2f81b4b43..97c2f81b4b43 100644
--- a/arch/mips/include/asm/swab.h
+++ b/arch/mips/include/uapi/asm/swab.h
diff --git a/arch/mips/include/asm/sysmips.h b/arch/mips/include/uapi/asm/sysmips.h
index 4f47b7d6a5f7..4f47b7d6a5f7 100644
--- a/arch/mips/include/asm/sysmips.h
+++ b/arch/mips/include/uapi/asm/sysmips.h
diff --git a/arch/mips/include/asm/termbits.h b/arch/mips/include/uapi/asm/termbits.h
index 76630b396fac..76630b396fac 100644
--- a/arch/mips/include/asm/termbits.h
+++ b/arch/mips/include/uapi/asm/termbits.h
diff --git a/arch/mips/include/uapi/asm/termios.h b/arch/mips/include/uapi/asm/termios.h
new file mode 100644
index 000000000000..574fbdfb7202
--- /dev/null
+++ b/arch/mips/include/uapi/asm/termios.h
@@ -0,0 +1,80 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1995, 1996, 2000, 2001 by Ralf Baechle
+ * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_TERMIOS_H
+#define _UAPI_ASM_TERMIOS_H
+
+#include <linux/errno.h>
+#include <asm/termbits.h>
+#include <asm/ioctls.h>
+
+struct sgttyb {
+        char    sg_ispeed;
+        char    sg_ospeed;
+        char    sg_erase;
+        char    sg_kill;
+        int     sg_flags;       /* SGI special - int, not short */
+};
+
+struct tchars {
+        char    t_intrc;
+        char    t_quitc;
+        char    t_startc;
+        char    t_stopc;
+        char    t_eofc;
+        char    t_brkc;
+};
+
+struct ltchars {
+        char    t_suspc;        /* stop process signal */
+        char    t_dsuspc;       /* delayed stop process signal */
+        char    t_rprntc;       /* reprint line */
+        char    t_flushc;       /* flush output (toggles) */
+        char    t_werasc;       /* word erase */
+        char    t_lnextc;       /* literal next character */
+};
+
+/* TIOCGSIZE, TIOCSSIZE not defined yet.  Only needed for SunOS source
+   compatibility anyway ... */
+
+struct winsize {
+        unsigned short ws_row;
+        unsigned short ws_col;
+        unsigned short ws_xpixel;
+        unsigned short ws_ypixel;
+};
+
+#define NCC     8
+struct termio {
+        unsigned short c_iflag;         /* input mode flags */
+        unsigned short c_oflag;         /* output mode flags */
+        unsigned short c_cflag;         /* control mode flags */
+        unsigned short c_lflag;         /* local mode flags */
+        char c_line;                    /* line discipline */
+        unsigned char c_cc[NCCS];       /* control characters */
+};
+
+
+/* modem lines */
+#define TIOCM_LE        0x001           /* line enable */
+#define TIOCM_DTR       0x002           /* data terminal ready */
+#define TIOCM_RTS       0x004           /* request to send */
+#define TIOCM_ST        0x010           /* secondary transmit */
+#define TIOCM_SR        0x020           /* secondary receive */
+#define TIOCM_CTS       0x040           /* clear to send */
+#define TIOCM_CAR       0x100           /* carrier detect */
+#define TIOCM_CD        TIOCM_CAR
+#define TIOCM_RNG       0x200           /* ring */
+#define TIOCM_RI        TIOCM_RNG
+#define TIOCM_DSR       0x400           /* data set ready */
+#define TIOCM_OUT1      0x2000
+#define TIOCM_OUT2      0x4000
+#define TIOCM_LOOP      0x8000
+
+
+#endif /* _UAPI_ASM_TERMIOS_H */
diff --git a/arch/mips/include/uapi/asm/types.h b/arch/mips/include/uapi/asm/types.h
new file mode 100644
index 000000000000..7ac9d0baad84
--- /dev/null
+++ b/arch/mips/include/uapi/asm/types.h
@@ -0,0 +1,27 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1994, 1995, 1996, 1999 by Ralf Baechle
+ * Copyright (C) 2008 Wind River Systems,
+ *   written by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_TYPES_H
+#define _UAPI_ASM_TYPES_H
+
+/*
+ * We don't use int-l64.h for the kernel anymore but still use it for
+ * userspace to avoid code changes.
+ */
+#ifndef __KERNEL__
+# if _MIPS_SZLONG == 64
+#  include <asm-generic/int-l64.h>
+# else
+#  include <asm-generic/int-ll64.h>
+# endif
+#endif
+
+
+#endif /* _UAPI_ASM_TYPES_H */
diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h
new file mode 100644
index 000000000000..cc98a9dcb01b
--- /dev/null
+++ b/arch/mips/include/uapi/asm/unistd.h
@@ -0,0 +1,1035 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1995, 96, 97, 98, 99, 2000 by Ralf Baechle
+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
+ *
+ * Changed system calls macros _syscall5 - _syscall7 to push args 5 to 7 onto
+ * the stack. Robin Farine for ACN S.A, Copyright (C) 1996 by ACN S.A
+ */
+#ifndef _UAPI_ASM_UNISTD_H
+#define _UAPI_ASM_UNISTD_H
+
+#include <asm/sgidefs.h>
+
+#if _MIPS_SIM == _MIPS_SIM_ABI32
+
+/*
+ * Linux o32 style syscalls are in the range from 4000 to 4999.
+ */
+#define __NR_Linux                      4000
+#define __NR_syscall                    (__NR_Linux +   0)
+#define __NR_exit                       (__NR_Linux +   1)
+#define __NR_fork                       (__NR_Linux +   2)
+#define __NR_read                       (__NR_Linux +   3)
+#define __NR_write                      (__NR_Linux +   4)
+#define __NR_open                       (__NR_Linux +   5)
+#define __NR_close                      (__NR_Linux +   6)
+#define __NR_waitpid                    (__NR_Linux +   7)
+#define __NR_creat                      (__NR_Linux +   8)
+#define __NR_link                       (__NR_Linux +   9)
+#define __NR_unlink                     (__NR_Linux +  10)
+#define __NR_execve                     (__NR_Linux +  11)
+#define __NR_chdir                      (__NR_Linux +  12)
+#define __NR_time                       (__NR_Linux +  13)
+#define __NR_mknod                      (__NR_Linux +  14)
+#define __NR_chmod                      (__NR_Linux +  15)
+#define __NR_lchown                     (__NR_Linux +  16)
+#define __NR_break                      (__NR_Linux +  17)
+#define __NR_unused18                   (__NR_Linux +  18)
+#define __NR_lseek                      (__NR_Linux +  19)
+#define __NR_getpid                     (__NR_Linux +  20)
+#define __NR_mount                      (__NR_Linux +  21)
+#define __NR_umount                     (__NR_Linux +  22)
+#define __NR_setuid                     (__NR_Linux +  23)
+#define __NR_getuid                     (__NR_Linux +  24)
+#define __NR_stime                      (__NR_Linux +  25)
+#define __NR_ptrace                     (__NR_Linux +  26)
+#define __NR_alarm                      (__NR_Linux +  27)
+#define __NR_unused28                   (__NR_Linux +  28)
+#define __NR_pause                      (__NR_Linux +  29)
+#define __NR_utime                      (__NR_Linux +  30)
+#define __NR_stty                       (__NR_Linux +  31)
+#define __NR_gtty                       (__NR_Linux +  32)
+#define __NR_access                     (__NR_Linux +  33)
+#define __NR_nice                       (__NR_Linux +  34)
+#define __NR_ftime                      (__NR_Linux +  35)
+#define __NR_sync                       (__NR_Linux +  36)
+#define __NR_kill                       (__NR_Linux +  37)
+#define __NR_rename                     (__NR_Linux +  38)
+#define __NR_mkdir                      (__NR_Linux +  39)
+#define __NR_rmdir                      (__NR_Linux +  40)
+#define __NR_dup                        (__NR_Linux +  41)
+#define __NR_pipe                       (__NR_Linux +  42)
+#define __NR_times                      (__NR_Linux +  43)
+#define __NR_prof                       (__NR_Linux +  44)
+#define __NR_brk                        (__NR_Linux +  45)
+#define __NR_setgid                     (__NR_Linux +  46)
+#define __NR_getgid                     (__NR_Linux +  47)
+#define __NR_signal                     (__NR_Linux +  48)
+#define __NR_geteuid                    (__NR_Linux +  49)
+#define __NR_getegid                    (__NR_Linux +  50)
+#define __NR_acct                       (__NR_Linux +  51)
+#define __NR_umount2                    (__NR_Linux +  52)
+#define __NR_lock                       (__NR_Linux +  53)
+#define __NR_ioctl                      (__NR_Linux +  54)
+#define __NR_fcntl                      (__NR_Linux +  55)
+#define __NR_mpx                        (__NR_Linux +  56)
+#define __NR_setpgid                    (__NR_Linux +  57)
+#define __NR_ulimit                     (__NR_Linux +  58)
+#define __NR_unused59                   (__NR_Linux +  59)
+#define __NR_umask                      (__NR_Linux +  60)
+#define __NR_chroot                     (__NR_Linux +  61)
+#define __NR_ustat                      (__NR_Linux +  62)
+#define __NR_dup2                       (__NR_Linux +  63)
+#define __NR_getppid                    (__NR_Linux +  64)
+#define __NR_getpgrp                    (__NR_Linux +  65)
+#define __NR_setsid                     (__NR_Linux +  66)
+#define __NR_sigaction                  (__NR_Linux +  67)
+#define __NR_sgetmask                   (__NR_Linux +  68)
+#define __NR_ssetmask                   (__NR_Linux +  69)
+#define __NR_setreuid                   (__NR_Linux +  70)
+#define __NR_setregid                   (__NR_Linux +  71)
+#define __NR_sigsuspend                 (__NR_Linux +  72)
+#define __NR_sigpending                 (__NR_Linux +  73)
+#define __NR_sethostname                (__NR_Linux +  74)
+#define __NR_setrlimit                  (__NR_Linux +  75)
+#define __NR_getrlimit                  (__NR_Linux +  76)
+#define __NR_getrusage                  (__NR_Linux +  77)
+#define __NR_gettimeofday               (__NR_Linux +  78)
+#define __NR_settimeofday               (__NR_Linux +  79)
+#define __NR_getgroups                  (__NR_Linux +  80)
+#define __NR_setgroups                  (__NR_Linux +  81)
+#define __NR_reserved82                 (__NR_Linux +  82)
+#define __NR_symlink                    (__NR_Linux +  83)
+#define __NR_unused84                   (__NR_Linux +  84)
+#define __NR_readlink                   (__NR_Linux +  85)
+#define __NR_uselib                     (__NR_Linux +  86)
+#define __NR_swapon                     (__NR_Linux +  87)
+#define __NR_reboot                     (__NR_Linux +  88)
+#define __NR_readdir                    (__NR_Linux +  89)
+#define __NR_mmap                       (__NR_Linux +  90)
+#define __NR_munmap                     (__NR_Linux +  91)
+#define __NR_truncate                   (__NR_Linux +  92)
+#define __NR_ftruncate                  (__NR_Linux +  93)
+#define __NR_fchmod                     (__NR_Linux +  94)
+#define __NR_fchown                     (__NR_Linux +  95)
+#define __NR_getpriority                (__NR_Linux +  96)
+#define __NR_setpriority                (__NR_Linux +  97)
+#define __NR_profil                     (__NR_Linux +  98)
+#define __NR_statfs                     (__NR_Linux +  99)
+#define __NR_fstatfs                    (__NR_Linux + 100)
+#define __NR_ioperm                     (__NR_Linux + 101)
+#define __NR_socketcall                 (__NR_Linux + 102)
+#define __NR_syslog                     (__NR_Linux + 103)
+#define __NR_setitimer                  (__NR_Linux + 104)
+#define __NR_getitimer                  (__NR_Linux + 105)
+#define __NR_stat                       (__NR_Linux + 106)
+#define __NR_lstat                      (__NR_Linux + 107)
+#define __NR_fstat                      (__NR_Linux + 108)
+#define __NR_unused109                  (__NR_Linux + 109)
+#define __NR_iopl                       (__NR_Linux + 110)
+#define __NR_vhangup                    (__NR_Linux + 111)
+#define __NR_idle                       (__NR_Linux + 112)
+#define __NR_vm86                       (__NR_Linux + 113)
+#define __NR_wait4                      (__NR_Linux + 114)
+#define __NR_swapoff                    (__NR_Linux + 115)
+#define __NR_sysinfo                    (__NR_Linux + 116)
+#define __NR_ipc                        (__NR_Linux + 117)
+#define __NR_fsync                      (__NR_Linux + 118)
+#define __NR_sigreturn                  (__NR_Linux + 119)
+#define __NR_clone                      (__NR_Linux + 120)
+#define __NR_setdomainname              (__NR_Linux + 121)
+#define __NR_uname                      (__NR_Linux + 122)
+#define __NR_modify_ldt                 (__NR_Linux + 123)
+#define __NR_adjtimex                   (__NR_Linux + 124)
+#define __NR_mprotect                   (__NR_Linux + 125)
+#define __NR_sigprocmask                (__NR_Linux + 126)
+#define __NR_create_module              (__NR_Linux + 127)
+#define __NR_init_module                (__NR_Linux + 128)
+#define __NR_delete_module              (__NR_Linux + 129)
+#define __NR_get_kernel_syms            (__NR_Linux + 130)
+#define __NR_quotactl                   (__NR_Linux + 131)
+#define __NR_getpgid                    (__NR_Linux + 132)
+#define __NR_fchdir                     (__NR_Linux + 133)
+#define __NR_bdflush                    (__NR_Linux + 134)
+#define __NR_sysfs                      (__NR_Linux + 135)
+#define __NR_personality                (__NR_Linux + 136)
+#define __NR_afs_syscall                (__NR_Linux + 137) /* Syscall for Andrew File System */
+#define __NR_setfsuid                   (__NR_Linux + 138)
+#define __NR_setfsgid                   (__NR_Linux + 139)
+#define __NR__llseek                    (__NR_Linux + 140)
+#define __NR_getdents                   (__NR_Linux + 141)
+#define __NR__newselect                 (__NR_Linux + 142)
+#define __NR_flock                      (__NR_Linux + 143)
+#define __NR_msync                      (__NR_Linux + 144)
+#define __NR_readv                      (__NR_Linux + 145)
+#define __NR_writev                     (__NR_Linux + 146)
+#define __NR_cacheflush                 (__NR_Linux + 147)
+#define __NR_cachectl                   (__NR_Linux + 148)
+#define __NR_sysmips                    (__NR_Linux + 149)
+#define __NR_unused150                  (__NR_Linux + 150)
+#define __NR_getsid                     (__NR_Linux + 151)
+#define __NR_fdatasync                  (__NR_Linux + 152)
+#define __NR__sysctl                    (__NR_Linux + 153)
+#define __NR_mlock                      (__NR_Linux + 154)
+#define __NR_munlock                    (__NR_Linux + 155)
+#define __NR_mlockall                   (__NR_Linux + 156)
+#define __NR_munlockall                 (__NR_Linux + 157)
+#define __NR_sched_setparam             (__NR_Linux + 158)
+#define __NR_sched_getparam             (__NR_Linux + 159)
+#define __NR_sched_setscheduler         (__NR_Linux + 160)
+#define __NR_sched_getscheduler         (__NR_Linux + 161)
+#define __NR_sched_yield                (__NR_Linux + 162)
+#define __NR_sched_get_priority_max     (__NR_Linux + 163)
+#define __NR_sched_get_priority_min     (__NR_Linux + 164)
+#define __NR_sched_rr_get_interval      (__NR_Linux + 165)
+#define __NR_nanosleep                  (__NR_Linux + 166)
+#define __NR_mremap                     (__NR_Linux + 167)
+#define __NR_accept                     (__NR_Linux + 168)
+#define __NR_bind                       (__NR_Linux + 169)
+#define __NR_connect                    (__NR_Linux + 170)
+#define __NR_getpeername                (__NR_Linux + 171)
+#define __NR_getsockname                (__NR_Linux + 172)
+#define __NR_getsockopt                 (__NR_Linux + 173)
+#define __NR_listen                     (__NR_Linux + 174)
+#define __NR_recv                       (__NR_Linux + 175)
+#define __NR_recvfrom                   (__NR_Linux + 176)
+#define __NR_recvmsg                    (__NR_Linux + 177)
+#define __NR_send                       (__NR_Linux + 178)
+#define __NR_sendmsg                    (__NR_Linux + 179)
+#define __NR_sendto                     (__NR_Linux + 180)
+#define __NR_setsockopt                 (__NR_Linux + 181)
+#define __NR_shutdown                   (__NR_Linux + 182)
+#define __NR_socket                     (__NR_Linux + 183)
+#define __NR_socketpair                 (__NR_Linux + 184)
+#define __NR_setresuid                  (__NR_Linux + 185)
+#define __NR_getresuid                  (__NR_Linux + 186)
+#define __NR_query_module               (__NR_Linux + 187)
+#define __NR_poll                       (__NR_Linux + 188)
+#define __NR_nfsservctl                 (__NR_Linux + 189)
+#define __NR_setresgid                  (__NR_Linux + 190)
+#define __NR_getresgid                  (__NR_Linux + 191)
+#define __NR_prctl                      (__NR_Linux + 192)
+#define __NR_rt_sigreturn               (__NR_Linux + 193)
+#define __NR_rt_sigaction               (__NR_Linux + 194)
+#define __NR_rt_sigprocmask             (__NR_Linux + 195)
+#define __NR_rt_sigpending              (__NR_Linux + 196)
+#define __NR_rt_sigtimedwait            (__NR_Linux + 197)
+#define __NR_rt_sigqueueinfo            (__NR_Linux + 198)
+#define __NR_rt_sigsuspend              (__NR_Linux + 199)
+#define __NR_pread64                    (__NR_Linux + 200)
+#define __NR_pwrite64                   (__NR_Linux + 201)
+#define __NR_chown                      (__NR_Linux + 202)
+#define __NR_getcwd                     (__NR_Linux + 203)
+#define __NR_capget                     (__NR_Linux + 204)
+#define __NR_capset                     (__NR_Linux + 205)
+#define __NR_sigaltstack                (__NR_Linux + 206)
+#define __NR_sendfile                   (__NR_Linux + 207)
+#define __NR_getpmsg                    (__NR_Linux + 208)
+#define __NR_putpmsg                    (__NR_Linux + 209)
+#define __NR_mmap2                      (__NR_Linux + 210)
+#define __NR_truncate64                 (__NR_Linux + 211)
+#define __NR_ftruncate64                (__NR_Linux + 212)
+#define __NR_stat64                     (__NR_Linux + 213)
+#define __NR_lstat64                    (__NR_Linux + 214)
+#define __NR_fstat64                    (__NR_Linux + 215)
+#define __NR_pivot_root                 (__NR_Linux + 216)
+#define __NR_mincore                    (__NR_Linux + 217)
+#define __NR_madvise                    (__NR_Linux + 218)
+#define __NR_getdents64                 (__NR_Linux + 219)
+#define __NR_fcntl64                    (__NR_Linux + 220)
+#define __NR_reserved221                (__NR_Linux + 221)
+#define __NR_gettid                     (__NR_Linux + 222)
+#define __NR_readahead                  (__NR_Linux + 223)
+#define __NR_setxattr                   (__NR_Linux + 224)
+#define __NR_lsetxattr                  (__NR_Linux + 225)
+#define __NR_fsetxattr                  (__NR_Linux + 226)
+#define __NR_getxattr                   (__NR_Linux + 227)
+#define __NR_lgetxattr                  (__NR_Linux + 228)
+#define __NR_fgetxattr                  (__NR_Linux + 229)
+#define __NR_listxattr                  (__NR_Linux + 230)
+#define __NR_llistxattr                 (__NR_Linux + 231)
+#define __NR_flistxattr                 (__NR_Linux + 232)
+#define __NR_removexattr                (__NR_Linux + 233)
+#define __NR_lremovexattr               (__NR_Linux + 234)
+#define __NR_fremovexattr               (__NR_Linux + 235)
+#define __NR_tkill                      (__NR_Linux + 236)
+#define __NR_sendfile64                 (__NR_Linux + 237)
+#define __NR_futex                      (__NR_Linux + 238)
+#define __NR_sched_setaffinity          (__NR_Linux + 239)
+#define __NR_sched_getaffinity          (__NR_Linux + 240)
+#define __NR_io_setup                   (__NR_Linux + 241)
+#define __NR_io_destroy                 (__NR_Linux + 242)
+#define __NR_io_getevents               (__NR_Linux + 243)
+#define __NR_io_submit                  (__NR_Linux + 244)
+#define __NR_io_cancel                  (__NR_Linux + 245)
+#define __NR_exit_group                 (__NR_Linux + 246)
+#define __NR_lookup_dcookie             (__NR_Linux + 247)
+#define __NR_epoll_create               (__NR_Linux + 248)
+#define __NR_epoll_ctl                  (__NR_Linux + 249)
+#define __NR_epoll_wait                 (__NR_Linux + 250)
+#define __NR_remap_file_pages           (__NR_Linux + 251)
+#define __NR_set_tid_address            (__NR_Linux + 252)
+#define __NR_restart_syscall            (__NR_Linux + 253)
+#define __NR_fadvise64                  (__NR_Linux + 254)
+#define __NR_statfs64                   (__NR_Linux + 255)
+#define __NR_fstatfs64                  (__NR_Linux + 256)
+#define __NR_timer_create               (__NR_Linux + 257)
+#define __NR_timer_settime              (__NR_Linux + 258)
+#define __NR_timer_gettime              (__NR_Linux + 259)
+#define __NR_timer_getoverrun           (__NR_Linux + 260)
+#define __NR_timer_delete               (__NR_Linux + 261)
+#define __NR_clock_settime              (__NR_Linux + 262)
+#define __NR_clock_gettime              (__NR_Linux + 263)
+#define __NR_clock_getres               (__NR_Linux + 264)
+#define __NR_clock_nanosleep            (__NR_Linux + 265)
+#define __NR_tgkill                     (__NR_Linux + 266)
+#define __NR_utimes                     (__NR_Linux + 267)
+#define __NR_mbind                      (__NR_Linux + 268)
+#define __NR_get_mempolicy              (__NR_Linux + 269)
+#define __NR_set_mempolicy              (__NR_Linux + 270)
+#define __NR_mq_open                    (__NR_Linux + 271)
+#define __NR_mq_unlink                  (__NR_Linux + 272)
+#define __NR_mq_timedsend               (__NR_Linux + 273)
+#define __NR_mq_timedreceive            (__NR_Linux + 274)
+#define __NR_mq_notify                  (__NR_Linux + 275)
+#define __NR_mq_getsetattr              (__NR_Linux + 276)
+#define __NR_vserver                    (__NR_Linux + 277)
+#define __NR_waitid                     (__NR_Linux + 278)
+/* #define __NR_sys_setaltroot          (__NR_Linux + 279) */
+#define __NR_add_key                    (__NR_Linux + 280)
+#define __NR_request_key                (__NR_Linux + 281)
+#define __NR_keyctl                     (__NR_Linux + 282)
+#define __NR_set_thread_area            (__NR_Linux + 283)
+#define __NR_inotify_init               (__NR_Linux + 284)
+#define __NR_inotify_add_watch          (__NR_Linux + 285)
+#define __NR_inotify_rm_watch           (__NR_Linux + 286)
+#define __NR_migrate_pages              (__NR_Linux + 287)
+#define __NR_openat                     (__NR_Linux + 288)
+#define __NR_mkdirat                    (__NR_Linux + 289)
+#define __NR_mknodat                    (__NR_Linux + 290)
+#define __NR_fchownat                   (__NR_Linux + 291)
+#define __NR_futimesat                  (__NR_Linux + 292)
+#define __NR_fstatat64                  (__NR_Linux + 293)
+#define __NR_unlinkat                   (__NR_Linux + 294)
+#define __NR_renameat                   (__NR_Linux + 295)
+#define __NR_linkat                     (__NR_Linux + 296)
+#define __NR_symlinkat                  (__NR_Linux + 297)
+#define __NR_readlinkat                 (__NR_Linux + 298)
+#define __NR_fchmodat                   (__NR_Linux + 299)
+#define __NR_faccessat                  (__NR_Linux + 300)
+#define __NR_pselect6                   (__NR_Linux + 301)
+#define __NR_ppoll                      (__NR_Linux + 302)
+#define __NR_unshare                    (__NR_Linux + 303)
+#define __NR_splice                     (__NR_Linux + 304)
+#define __NR_sync_file_range            (__NR_Linux + 305)
+#define __NR_tee                        (__NR_Linux + 306)
+#define __NR_vmsplice                   (__NR_Linux + 307)
+#define __NR_move_pages                 (__NR_Linux + 308)
+#define __NR_set_robust_list            (__NR_Linux + 309)
+#define __NR_get_robust_list            (__NR_Linux + 310)
+#define __NR_kexec_load                 (__NR_Linux + 311)
+#define __NR_getcpu                     (__NR_Linux + 312)
+#define __NR_epoll_pwait                (__NR_Linux + 313)
+#define __NR_ioprio_set                 (__NR_Linux + 314)
+#define __NR_ioprio_get                 (__NR_Linux + 315)
+#define __NR_utimensat                  (__NR_Linux + 316)
+#define __NR_signalfd                   (__NR_Linux + 317)
+#define __NR_timerfd                    (__NR_Linux + 318)
+#define __NR_eventfd                    (__NR_Linux + 319)
+#define __NR_fallocate                  (__NR_Linux + 320)
+#define __NR_timerfd_create             (__NR_Linux + 321)
+#define __NR_timerfd_gettime            (__NR_Linux + 322)
+#define __NR_timerfd_settime            (__NR_Linux + 323)
+#define __NR_signalfd4                  (__NR_Linux + 324)
+#define __NR_eventfd2                   (__NR_Linux + 325)
+#define __NR_epoll_create1              (__NR_Linux + 326)
+#define __NR_dup3                       (__NR_Linux + 327)
+#define __NR_pipe2                      (__NR_Linux + 328)
+#define __NR_inotify_init1              (__NR_Linux + 329)
+#define __NR_preadv                     (__NR_Linux + 330)
+#define __NR_pwritev                    (__NR_Linux + 331)
+#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 332)
+#define __NR_perf_event_open            (__NR_Linux + 333)
+#define __NR_accept4                    (__NR_Linux + 334)
+#define __NR_recvmmsg                   (__NR_Linux + 335)
+#define __NR_fanotify_init              (__NR_Linux + 336)
+#define __NR_fanotify_mark              (__NR_Linux + 337)
+#define __NR_prlimit64                  (__NR_Linux + 338)
+#define __NR_name_to_handle_at          (__NR_Linux + 339)
+#define __NR_open_by_handle_at          (__NR_Linux + 340)
+#define __NR_clock_adjtime              (__NR_Linux + 341)
+#define __NR_syncfs                     (__NR_Linux + 342)
+#define __NR_sendmmsg                   (__NR_Linux + 343)
+#define __NR_setns                      (__NR_Linux + 344)
+#define __NR_process_vm_readv           (__NR_Linux + 345)
+#define __NR_process_vm_writev          (__NR_Linux + 346)
+#define __NR_kcmp                       (__NR_Linux + 347)
+
+/*
+ * Offset of the last Linux o32 flavoured syscall
+ */
+#define __NR_Linux_syscalls             347
+
+#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
+
+#define __NR_O32_Linux                  4000
+#define __NR_O32_Linux_syscalls         347
+
+#if _MIPS_SIM == _MIPS_SIM_ABI64
+
+/*
+ * Linux 64-bit syscalls are in the range from 5000 to 5999.
+ */
+#define __NR_Linux                      5000
+#define __NR_read                       (__NR_Linux +   0)
+#define __NR_write                      (__NR_Linux +   1)
+#define __NR_open                       (__NR_Linux +   2)
+#define __NR_close                      (__NR_Linux +   3)
+#define __NR_stat                       (__NR_Linux +   4)
+#define __NR_fstat                      (__NR_Linux +   5)
+#define __NR_lstat                      (__NR_Linux +   6)
+#define __NR_poll                       (__NR_Linux +   7)
+#define __NR_lseek                      (__NR_Linux +   8)
+#define __NR_mmap                       (__NR_Linux +   9)
+#define __NR_mprotect                   (__NR_Linux +  10)
+#define __NR_munmap                     (__NR_Linux +  11)
+#define __NR_brk                        (__NR_Linux +  12)
+#define __NR_rt_sigaction               (__NR_Linux +  13)
+#define __NR_rt_sigprocmask             (__NR_Linux +  14)
+#define __NR_ioctl                      (__NR_Linux +  15)
+#define __NR_pread64                    (__NR_Linux +  16)
+#define __NR_pwrite64                   (__NR_Linux +  17)
+#define __NR_readv                      (__NR_Linux +  18)
+#define __NR_writev                     (__NR_Linux +  19)
+#define __NR_access                     (__NR_Linux +  20)
+#define __NR_pipe                       (__NR_Linux +  21)
+#define __NR__newselect                 (__NR_Linux +  22)
+#define __NR_sched_yield                (__NR_Linux +  23)
+#define __NR_mremap                     (__NR_Linux +  24)
+#define __NR_msync                      (__NR_Linux +  25)
+#define __NR_mincore                    (__NR_Linux +  26)
+#define __NR_madvise                    (__NR_Linux +  27)
+#define __NR_shmget                     (__NR_Linux +  28)
+#define __NR_shmat                      (__NR_Linux +  29)
+#define __NR_shmctl                     (__NR_Linux +  30)
+#define __NR_dup                        (__NR_Linux +  31)
+#define __NR_dup2                       (__NR_Linux +  32)
+#define __NR_pause                      (__NR_Linux +  33)
+#define __NR_nanosleep                  (__NR_Linux +  34)
+#define __NR_getitimer                  (__NR_Linux +  35)
+#define __NR_setitimer                  (__NR_Linux +  36)
+#define __NR_alarm                      (__NR_Linux +  37)
+#define __NR_getpid                     (__NR_Linux +  38)
+#define __NR_sendfile                   (__NR_Linux +  39)
+#define __NR_socket                     (__NR_Linux +  40)
+#define __NR_connect                    (__NR_Linux +  41)
+#define __NR_accept                     (__NR_Linux +  42)
+#define __NR_sendto                     (__NR_Linux +  43)
+#define __NR_recvfrom                   (__NR_Linux +  44)
+#define __NR_sendmsg                    (__NR_Linux +  45)
+#define __NR_recvmsg                    (__NR_Linux +  46)
+#define __NR_shutdown                   (__NR_Linux +  47)
+#define __NR_bind                       (__NR_Linux +  48)
+#define __NR_listen                     (__NR_Linux +  49)
+#define __NR_getsockname                (__NR_Linux +  50)
+#define __NR_getpeername                (__NR_Linux +  51)
+#define __NR_socketpair                 (__NR_Linux +  52)
+#define __NR_setsockopt                 (__NR_Linux +  53)
+#define __NR_getsockopt                 (__NR_Linux +  54)
+#define __NR_clone                      (__NR_Linux +  55)
+#define __NR_fork                       (__NR_Linux +  56)
+#define __NR_execve                     (__NR_Linux +  57)
+#define __NR_exit                       (__NR_Linux +  58)
+#define __NR_wait4                      (__NR_Linux +  59)
+#define __NR_kill                       (__NR_Linux +  60)
+#define __NR_uname                      (__NR_Linux +  61)
+#define __NR_semget                     (__NR_Linux +  62)
+#define __NR_semop                      (__NR_Linux +  63)
+#define __NR_semctl                     (__NR_Linux +  64)
+#define __NR_shmdt                      (__NR_Linux +  65)
+#define __NR_msgget                     (__NR_Linux +  66)
+#define __NR_msgsnd                     (__NR_Linux +  67)
+#define __NR_msgrcv                     (__NR_Linux +  68)
+#define __NR_msgctl                     (__NR_Linux +  69)
+#define __NR_fcntl                      (__NR_Linux +  70)
+#define __NR_flock                      (__NR_Linux +  71)
+#define __NR_fsync                      (__NR_Linux +  72)
+#define __NR_fdatasync                  (__NR_Linux +  73)
+#define __NR_truncate                   (__NR_Linux +  74)
+#define __NR_ftruncate                  (__NR_Linux +  75)
+#define __NR_getdents                   (__NR_Linux +  76)
+#define __NR_getcwd                     (__NR_Linux +  77)
+#define __NR_chdir                      (__NR_Linux +  78)
+#define __NR_fchdir                     (__NR_Linux +  79)
+#define __NR_rename                     (__NR_Linux +  80)
+#define __NR_mkdir                      (__NR_Linux +  81)
+#define __NR_rmdir                      (__NR_Linux +  82)
+#define __NR_creat                      (__NR_Linux +  83)
+#define __NR_link                       (__NR_Linux +  84)
+#define __NR_unlink                     (__NR_Linux +  85)
+#define __NR_symlink                    (__NR_Linux +  86)
+#define __NR_readlink                   (__NR_Linux +  87)
+#define __NR_chmod                      (__NR_Linux +  88)
+#define __NR_fchmod                     (__NR_Linux +  89)
+#define __NR_chown                      (__NR_Linux +  90)
+#define __NR_fchown                     (__NR_Linux +  91)
+#define __NR_lchown                     (__NR_Linux +  92)
+#define __NR_umask                      (__NR_Linux +  93)
+#define __NR_gettimeofday               (__NR_Linux +  94)
+#define __NR_getrlimit                  (__NR_Linux +  95)
+#define __NR_getrusage                  (__NR_Linux +  96)
+#define __NR_sysinfo                    (__NR_Linux +  97)
+#define __NR_times                      (__NR_Linux +  98)
+#define __NR_ptrace                     (__NR_Linux +  99)
+#define __NR_getuid                     (__NR_Linux + 100)
+#define __NR_syslog                     (__NR_Linux + 101)
+#define __NR_getgid                     (__NR_Linux + 102)
+#define __NR_setuid                     (__NR_Linux + 103)
+#define __NR_setgid                     (__NR_Linux + 104)
+#define __NR_geteuid                    (__NR_Linux + 105)
+#define __NR_getegid                    (__NR_Linux + 106)
+#define __NR_setpgid                    (__NR_Linux + 107)
+#define __NR_getppid                    (__NR_Linux + 108)
+#define __NR_getpgrp                    (__NR_Linux + 109)
+#define __NR_setsid                     (__NR_Linux + 110)
+#define __NR_setreuid                   (__NR_Linux + 111)
+#define __NR_setregid                   (__NR_Linux + 112)
+#define __NR_getgroups                  (__NR_Linux + 113)
+#define __NR_setgroups                  (__NR_Linux + 114)
+#define __NR_setresuid                  (__NR_Linux + 115)
+#define __NR_getresuid                  (__NR_Linux + 116)
+#define __NR_setresgid                  (__NR_Linux + 117)
+#define __NR_getresgid                  (__NR_Linux + 118)
+#define __NR_getpgid                    (__NR_Linux + 119)
+#define __NR_setfsuid                   (__NR_Linux + 120)
+#define __NR_setfsgid                   (__NR_Linux + 121)
+#define __NR_getsid                     (__NR_Linux + 122)
+#define __NR_capget                     (__NR_Linux + 123)
+#define __NR_capset                     (__NR_Linux + 124)
+#define __NR_rt_sigpending              (__NR_Linux + 125)
+#define __NR_rt_sigtimedwait            (__NR_Linux + 126)
+#define __NR_rt_sigqueueinfo            (__NR_Linux + 127)
+#define __NR_rt_sigsuspend              (__NR_Linux + 128)
+#define __NR_sigaltstack                (__NR_Linux + 129)
+#define __NR_utime                      (__NR_Linux + 130)
+#define __NR_mknod                      (__NR_Linux + 131)
+#define __NR_personality                (__NR_Linux + 132)
+#define __NR_ustat                      (__NR_Linux + 133)
+#define __NR_statfs                     (__NR_Linux + 134)
+#define __NR_fstatfs                    (__NR_Linux + 135)
+#define __NR_sysfs                      (__NR_Linux + 136)
+#define __NR_getpriority                (__NR_Linux + 137)
+#define __NR_setpriority                (__NR_Linux + 138)
+#define __NR_sched_setparam             (__NR_Linux + 139)
+#define __NR_sched_getparam             (__NR_Linux + 140)
+#define __NR_sched_setscheduler         (__NR_Linux + 141)
+#define __NR_sched_getscheduler         (__NR_Linux + 142)
+#define __NR_sched_get_priority_max     (__NR_Linux + 143)
+#define __NR_sched_get_priority_min     (__NR_Linux + 144)
+#define __NR_sched_rr_get_interval      (__NR_Linux + 145)
+#define __NR_mlock                      (__NR_Linux + 146)
+#define __NR_munlock                    (__NR_Linux + 147)
+#define __NR_mlockall                   (__NR_Linux + 148)
+#define __NR_munlockall                 (__NR_Linux + 149)
+#define __NR_vhangup                    (__NR_Linux + 150)
+#define __NR_pivot_root                 (__NR_Linux + 151)
+#define __NR__sysctl                    (__NR_Linux + 152)
+#define __NR_prctl                      (__NR_Linux + 153)
+#define __NR_adjtimex                   (__NR_Linux + 154)
+#define __NR_setrlimit                  (__NR_Linux + 155)
+#define __NR_chroot                     (__NR_Linux + 156)
+#define __NR_sync                       (__NR_Linux + 157)
+#define __NR_acct                       (__NR_Linux + 158)
+#define __NR_settimeofday               (__NR_Linux + 159)
+#define __NR_mount                      (__NR_Linux + 160)
+#define __NR_umount2                    (__NR_Linux + 161)
+#define __NR_swapon                     (__NR_Linux + 162)
+#define __NR_swapoff                    (__NR_Linux + 163)
+#define __NR_reboot                     (__NR_Linux + 164)
+#define __NR_sethostname                (__NR_Linux + 165)
+#define __NR_setdomainname              (__NR_Linux + 166)
+#define __NR_create_module              (__NR_Linux + 167)
+#define __NR_init_module                (__NR_Linux + 168)
+#define __NR_delete_module              (__NR_Linux + 169)
+#define __NR_get_kernel_syms            (__NR_Linux + 170)
+#define __NR_query_module               (__NR_Linux + 171)
+#define __NR_quotactl                   (__NR_Linux + 172)
+#define __NR_nfsservctl                 (__NR_Linux + 173)
+#define __NR_getpmsg                    (__NR_Linux + 174)
+#define __NR_putpmsg                    (__NR_Linux + 175)
+#define __NR_afs_syscall                (__NR_Linux + 176)
+#define __NR_reserved177                (__NR_Linux + 177)
+#define __NR_gettid                     (__NR_Linux + 178)
+#define __NR_readahead                  (__NR_Linux + 179)
+#define __NR_setxattr                   (__NR_Linux + 180)
+#define __NR_lsetxattr                  (__NR_Linux + 181)
+#define __NR_fsetxattr                  (__NR_Linux + 182)
+#define __NR_getxattr                   (__NR_Linux + 183)
+#define __NR_lgetxattr                  (__NR_Linux + 184)
+#define __NR_fgetxattr                  (__NR_Linux + 185)
+#define __NR_listxattr                  (__NR_Linux + 186)
+#define __NR_llistxattr                 (__NR_Linux + 187)
+#define __NR_flistxattr                 (__NR_Linux + 188)
+#define __NR_removexattr                (__NR_Linux + 189)
+#define __NR_lremovexattr               (__NR_Linux + 190)
+#define __NR_fremovexattr               (__NR_Linux + 191)
+#define __NR_tkill                      (__NR_Linux + 192)
+#define __NR_reserved193                (__NR_Linux + 193)
+#define __NR_futex                      (__NR_Linux + 194)
+#define __NR_sched_setaffinity          (__NR_Linux + 195)
+#define __NR_sched_getaffinity          (__NR_Linux + 196)
+#define __NR_cacheflush                 (__NR_Linux + 197)
+#define __NR_cachectl                   (__NR_Linux + 198)
+#define __NR_sysmips                    (__NR_Linux + 199)
+#define __NR_io_setup                   (__NR_Linux + 200)
+#define __NR_io_destroy                 (__NR_Linux + 201)
+#define __NR_io_getevents               (__NR_Linux + 202)
+#define __NR_io_submit                  (__NR_Linux + 203)
+#define __NR_io_cancel                  (__NR_Linux + 204)
+#define __NR_exit_group                 (__NR_Linux + 205)
+#define __NR_lookup_dcookie             (__NR_Linux + 206)
+#define __NR_epoll_create               (__NR_Linux + 207)
+#define __NR_epoll_ctl                  (__NR_Linux + 208)
+#define __NR_epoll_wait                 (__NR_Linux + 209)
+#define __NR_remap_file_pages           (__NR_Linux + 210)
+#define __NR_rt_sigreturn               (__NR_Linux + 211)
+#define __NR_set_tid_address            (__NR_Linux + 212)
+#define __NR_restart_syscall            (__NR_Linux + 213)
+#define __NR_semtimedop                 (__NR_Linux + 214)
+#define __NR_fadvise64                  (__NR_Linux + 215)
+#define __NR_timer_create               (__NR_Linux + 216)
+#define __NR_timer_settime              (__NR_Linux + 217)
+#define __NR_timer_gettime              (__NR_Linux + 218)
+#define __NR_timer_getoverrun           (__NR_Linux + 219)
+#define __NR_timer_delete               (__NR_Linux + 220)
+#define __NR_clock_settime              (__NR_Linux + 221)
+#define __NR_clock_gettime              (__NR_Linux + 222)
+#define __NR_clock_getres               (__NR_Linux + 223)
+#define __NR_clock_nanosleep            (__NR_Linux + 224)
+#define __NR_tgkill                     (__NR_Linux + 225)
+#define __NR_utimes                     (__NR_Linux + 226)
+#define __NR_mbind                      (__NR_Linux + 227)
+#define __NR_get_mempolicy              (__NR_Linux + 228)
+#define __NR_set_mempolicy              (__NR_Linux + 229)
+#define __NR_mq_open                    (__NR_Linux + 230)
+#define __NR_mq_unlink                  (__NR_Linux + 231)
+#define __NR_mq_timedsend               (__NR_Linux + 232)
+#define __NR_mq_timedreceive            (__NR_Linux + 233)
+#define __NR_mq_notify                  (__NR_Linux + 234)
+#define __NR_mq_getsetattr              (__NR_Linux + 235)
+#define __NR_vserver                    (__NR_Linux + 236)
+#define __NR_waitid                     (__NR_Linux + 237)
+/* #define __NR_sys_setaltroot          (__NR_Linux + 238) */
+#define __NR_add_key                    (__NR_Linux + 239)
+#define __NR_request_key                (__NR_Linux + 240)
+#define __NR_keyctl                     (__NR_Linux + 241)
+#define __NR_set_thread_area            (__NR_Linux + 242)
+#define __NR_inotify_init               (__NR_Linux + 243)
+#define __NR_inotify_add_watch          (__NR_Linux + 244)
+#define __NR_inotify_rm_watch           (__NR_Linux + 245)
+#define __NR_migrate_pages              (__NR_Linux + 246)
+#define __NR_openat                     (__NR_Linux + 247)
+#define __NR_mkdirat                    (__NR_Linux + 248)
+#define __NR_mknodat                    (__NR_Linux + 249)
+#define __NR_fchownat                   (__NR_Linux + 250)
+#define __NR_futimesat                  (__NR_Linux + 251)
+#define __NR_newfstatat                 (__NR_Linux + 252)
+#define __NR_unlinkat                   (__NR_Linux + 253)
+#define __NR_renameat                   (__NR_Linux + 254)
+#define __NR_linkat                     (__NR_Linux + 255)
+#define __NR_symlinkat                  (__NR_Linux + 256)
+#define __NR_readlinkat                 (__NR_Linux + 257)
+#define __NR_fchmodat                   (__NR_Linux + 258)
+#define __NR_faccessat                  (__NR_Linux + 259)
+#define __NR_pselect6                   (__NR_Linux + 260)
+#define __NR_ppoll                      (__NR_Linux + 261)
+#define __NR_unshare                    (__NR_Linux + 262)
+#define __NR_splice                     (__NR_Linux + 263)
+#define __NR_sync_file_range            (__NR_Linux + 264)
+#define __NR_tee                        (__NR_Linux + 265)
+#define __NR_vmsplice                   (__NR_Linux + 266)
+#define __NR_move_pages                 (__NR_Linux + 267)
+#define __NR_set_robust_list            (__NR_Linux + 268)
+#define __NR_get_robust_list            (__NR_Linux + 269)
+#define __NR_kexec_load                 (__NR_Linux + 270)
+#define __NR_getcpu                     (__NR_Linux + 271)
+#define __NR_epoll_pwait                (__NR_Linux + 272)
+#define __NR_ioprio_set                 (__NR_Linux + 273)
+#define __NR_ioprio_get                 (__NR_Linux + 274)
+#define __NR_utimensat                  (__NR_Linux + 275)
+#define __NR_signalfd                   (__NR_Linux + 276)
+#define __NR_timerfd                    (__NR_Linux + 277)
+#define __NR_eventfd                    (__NR_Linux + 278)
+#define __NR_fallocate                  (__NR_Linux + 279)
+#define __NR_timerfd_create             (__NR_Linux + 280)
+#define __NR_timerfd_gettime            (__NR_Linux + 281)
+#define __NR_timerfd_settime            (__NR_Linux + 282)
+#define __NR_signalfd4                  (__NR_Linux + 283)
+#define __NR_eventfd2                   (__NR_Linux + 284)
+#define __NR_epoll_create1              (__NR_Linux + 285)
+#define __NR_dup3                       (__NR_Linux + 286)
+#define __NR_pipe2                      (__NR_Linux + 287)
+#define __NR_inotify_init1              (__NR_Linux + 288)
+#define __NR_preadv                     (__NR_Linux + 289)
+#define __NR_pwritev                    (__NR_Linux + 290)
+#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 291)
+#define __NR_perf_event_open            (__NR_Linux + 292)
+#define __NR_accept4                    (__NR_Linux + 293)
+#define __NR_recvmmsg                   (__NR_Linux + 294)
+#define __NR_fanotify_init              (__NR_Linux + 295)
+#define __NR_fanotify_mark              (__NR_Linux + 296)
+#define __NR_prlimit64                  (__NR_Linux + 297)
+#define __NR_name_to_handle_at          (__NR_Linux + 298)
+#define __NR_open_by_handle_at          (__NR_Linux + 299)
+#define __NR_clock_adjtime              (__NR_Linux + 300)
+#define __NR_syncfs                     (__NR_Linux + 301)
+#define __NR_sendmmsg                   (__NR_Linux + 302)
+#define __NR_setns                      (__NR_Linux + 303)
+#define __NR_process_vm_readv           (__NR_Linux + 304)
+#define __NR_process_vm_writev          (__NR_Linux + 305)
+#define __NR_kcmp                       (__NR_Linux + 306)
+
+/*
+ * Offset of the last Linux 64-bit flavoured syscall
+ */
+#define __NR_Linux_syscalls             306
+
+#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
+
+#define __NR_64_Linux                   5000
+#define __NR_64_Linux_syscalls          306
+
+#if _MIPS_SIM == _MIPS_SIM_NABI32
+
+/*
+ * Linux N32 syscalls are in the range from 6000 to 6999.
+ */
+#define __NR_Linux                      6000
+#define __NR_read                       (__NR_Linux +   0)
+#define __NR_write                      (__NR_Linux +   1)
+#define __NR_open                       (__NR_Linux +   2)
+#define __NR_close                      (__NR_Linux +   3)
+#define __NR_stat                       (__NR_Linux +   4)
+#define __NR_fstat                      (__NR_Linux +   5)
+#define __NR_lstat                      (__NR_Linux +   6)
+#define __NR_poll                       (__NR_Linux +   7)
+#define __NR_lseek                      (__NR_Linux +   8)
+#define __NR_mmap                       (__NR_Linux +   9)
+#define __NR_mprotect                   (__NR_Linux +  10)
+#define __NR_munmap                     (__NR_Linux +  11)
+#define __NR_brk                        (__NR_Linux +  12)
+#define __NR_rt_sigaction               (__NR_Linux +  13)
+#define __NR_rt_sigprocmask             (__NR_Linux +  14)
+#define __NR_ioctl                      (__NR_Linux +  15)
+#define __NR_pread64                    (__NR_Linux +  16)
+#define __NR_pwrite64                   (__NR_Linux +  17)
+#define __NR_readv                      (__NR_Linux +  18)
+#define __NR_writev                     (__NR_Linux +  19)
+#define __NR_access                     (__NR_Linux +  20)
+#define __NR_pipe                       (__NR_Linux +  21)
+#define __NR__newselect                 (__NR_Linux +  22)
+#define __NR_sched_yield                (__NR_Linux +  23)
+#define __NR_mremap                     (__NR_Linux +  24)
+#define __NR_msync                      (__NR_Linux +  25)
+#define __NR_mincore                    (__NR_Linux +  26)
+#define __NR_madvise                    (__NR_Linux +  27)
+#define __NR_shmget                     (__NR_Linux +  28)
+#define __NR_shmat                      (__NR_Linux +  29)
+#define __NR_shmctl                     (__NR_Linux +  30)
+#define __NR_dup                        (__NR_Linux +  31)
+#define __NR_dup2                       (__NR_Linux +  32)
+#define __NR_pause                      (__NR_Linux +  33)
+#define __NR_nanosleep                  (__NR_Linux +  34)
+#define __NR_getitimer                  (__NR_Linux +  35)
+#define __NR_setitimer                  (__NR_Linux +  36)
+#define __NR_alarm                      (__NR_Linux +  37)
+#define __NR_getpid                     (__NR_Linux +  38)
+#define __NR_sendfile                   (__NR_Linux +  39)
+#define __NR_socket                     (__NR_Linux +  40)
+#define __NR_connect                    (__NR_Linux +  41)
+#define __NR_accept                     (__NR_Linux +  42)
+#define __NR_sendto                     (__NR_Linux +  43)
+#define __NR_recvfrom                   (__NR_Linux +  44)
+#define __NR_sendmsg                    (__NR_Linux +  45)
+#define __NR_recvmsg                    (__NR_Linux +  46)
+#define __NR_shutdown                   (__NR_Linux +  47)
+#define __NR_bind                       (__NR_Linux +  48)
+#define __NR_listen                     (__NR_Linux +  49)
+#define __NR_getsockname                (__NR_Linux +  50)
+#define __NR_getpeername                (__NR_Linux +  51)
+#define __NR_socketpair                 (__NR_Linux +  52)
+#define __NR_setsockopt                 (__NR_Linux +  53)
+#define __NR_getsockopt                 (__NR_Linux +  54)
+#define __NR_clone                      (__NR_Linux +  55)
+#define __NR_fork                       (__NR_Linux +  56)
+#define __NR_execve                     (__NR_Linux +  57)
+#define __NR_exit                       (__NR_Linux +  58)
+#define __NR_wait4                      (__NR_Linux +  59)
+#define __NR_kill                       (__NR_Linux +  60)
+#define __NR_uname                      (__NR_Linux +  61)
+#define __NR_semget                     (__NR_Linux +  62)
+#define __NR_semop                      (__NR_Linux +  63)
+#define __NR_semctl                     (__NR_Linux +  64)
+#define __NR_shmdt                      (__NR_Linux +  65)
+#define __NR_msgget                     (__NR_Linux +  66)
+#define __NR_msgsnd                     (__NR_Linux +  67)
+#define __NR_msgrcv                     (__NR_Linux +  68)
+#define __NR_msgctl                     (__NR_Linux +  69)
+#define __NR_fcntl                      (__NR_Linux +  70)
+#define __NR_flock                      (__NR_Linux +  71)
+#define __NR_fsync                      (__NR_Linux +  72)
+#define __NR_fdatasync                  (__NR_Linux +  73)
+#define __NR_truncate                   (__NR_Linux +  74)
+#define __NR_ftruncate                  (__NR_Linux +  75)
+#define __NR_getdents                   (__NR_Linux +  76)
+#define __NR_getcwd                     (__NR_Linux +  77)
+#define __NR_chdir                      (__NR_Linux +  78)
+#define __NR_fchdir                     (__NR_Linux +  79)
+#define __NR_rename                     (__NR_Linux +  80)
+#define __NR_mkdir                      (__NR_Linux +  81)
+#define __NR_rmdir                      (__NR_Linux +  82)
+#define __NR_creat                      (__NR_Linux +  83)
+#define __NR_link                       (__NR_Linux +  84)
+#define __NR_unlink                     (__NR_Linux +  85)
+#define __NR_symlink                    (__NR_Linux +  86)
+#define __NR_readlink                   (__NR_Linux +  87)
+#define __NR_chmod                      (__NR_Linux +  88)
+#define __NR_fchmod                     (__NR_Linux +  89)
+#define __NR_chown                      (__NR_Linux +  90)
+#define __NR_fchown                     (__NR_Linux +  91)
+#define __NR_lchown                     (__NR_Linux +  92)
+#define __NR_umask                      (__NR_Linux +  93)
+#define __NR_gettimeofday               (__NR_Linux +  94)
+#define __NR_getrlimit                  (__NR_Linux +  95)
+#define __NR_getrusage                  (__NR_Linux +  96)
+#define __NR_sysinfo                    (__NR_Linux +  97)
+#define __NR_times                      (__NR_Linux +  98)
+#define __NR_ptrace                     (__NR_Linux +  99)
+#define __NR_getuid                     (__NR_Linux + 100)
+#define __NR_syslog                     (__NR_Linux + 101)
+#define __NR_getgid                     (__NR_Linux + 102)
+#define __NR_setuid                     (__NR_Linux + 103)
+#define __NR_setgid                     (__NR_Linux + 104)
+#define __NR_geteuid                    (__NR_Linux + 105)
+#define __NR_getegid                    (__NR_Linux + 106)
+#define __NR_setpgid                    (__NR_Linux + 107)
+#define __NR_getppid                    (__NR_Linux + 108)
+#define __NR_getpgrp                    (__NR_Linux + 109)
+#define __NR_setsid                     (__NR_Linux + 110)
+#define __NR_setreuid                   (__NR_Linux + 111)
+#define __NR_setregid                   (__NR_Linux + 112)
+#define __NR_getgroups                  (__NR_Linux + 113)
+#define __NR_setgroups                  (__NR_Linux + 114)
+#define __NR_setresuid                  (__NR_Linux + 115)
+#define __NR_getresuid                  (__NR_Linux + 116)
+#define __NR_setresgid                  (__NR_Linux + 117)
+#define __NR_getresgid                  (__NR_Linux + 118)
+#define __NR_getpgid                    (__NR_Linux + 119)
+#define __NR_setfsuid                   (__NR_Linux + 120)
+#define __NR_setfsgid                   (__NR_Linux + 121)
+#define __NR_getsid                     (__NR_Linux + 122)
+#define __NR_capget                     (__NR_Linux + 123)
+#define __NR_capset                     (__NR_Linux + 124)
+#define __NR_rt_sigpending              (__NR_Linux + 125)
+#define __NR_rt_sigtimedwait            (__NR_Linux + 126)
+#define __NR_rt_sigqueueinfo            (__NR_Linux + 127)
+#define __NR_rt_sigsuspend              (__NR_Linux + 128)
+#define __NR_sigaltstack                (__NR_Linux + 129)
+#define __NR_utime                      (__NR_Linux + 130)
+#define __NR_mknod                      (__NR_Linux + 131)
+#define __NR_personality                (__NR_Linux + 132)
+#define __NR_ustat                      (__NR_Linux + 133)
+#define __NR_statfs                     (__NR_Linux + 134)
+#define __NR_fstatfs                    (__NR_Linux + 135)
+#define __NR_sysfs                      (__NR_Linux + 136)
+#define __NR_getpriority                (__NR_Linux + 137)
+#define __NR_setpriority                (__NR_Linux + 138)
+#define __NR_sched_setparam             (__NR_Linux + 139)
+#define __NR_sched_getparam             (__NR_Linux + 140)
+#define __NR_sched_setscheduler         (__NR_Linux + 141)
+#define __NR_sched_getscheduler         (__NR_Linux + 142)
+#define __NR_sched_get_priority_max     (__NR_Linux + 143)
+#define __NR_sched_get_priority_min     (__NR_Linux + 144)
+#define __NR_sched_rr_get_interval      (__NR_Linux + 145)
+#define __NR_mlock                      (__NR_Linux + 146)
+#define __NR_munlock                    (__NR_Linux + 147)
+#define __NR_mlockall                   (__NR_Linux + 148)
+#define __NR_munlockall                 (__NR_Linux + 149)
+#define __NR_vhangup                    (__NR_Linux + 150)
+#define __NR_pivot_root                 (__NR_Linux + 151)
+#define __NR__sysctl                    (__NR_Linux + 152)
+#define __NR_prctl                      (__NR_Linux + 153)
+#define __NR_adjtimex                   (__NR_Linux + 154)
+#define __NR_setrlimit                  (__NR_Linux + 155)
+#define __NR_chroot                     (__NR_Linux + 156)
+#define __NR_sync                       (__NR_Linux + 157)
+#define __NR_acct                       (__NR_Linux + 158)
+#define __NR_settimeofday               (__NR_Linux + 159)
+#define __NR_mount                      (__NR_Linux + 160)
+#define __NR_umount2                    (__NR_Linux + 161)
+#define __NR_swapon                     (__NR_Linux + 162)
+#define __NR_swapoff                    (__NR_Linux + 163)
+#define __NR_reboot                     (__NR_Linux + 164)
+#define __NR_sethostname                (__NR_Linux + 165)
+#define __NR_setdomainname              (__NR_Linux + 166)
+#define __NR_create_module              (__NR_Linux + 167)
+#define __NR_init_module                (__NR_Linux + 168)
+#define __NR_delete_module              (__NR_Linux + 169)
+#define __NR_get_kernel_syms            (__NR_Linux + 170)
+#define __NR_query_module               (__NR_Linux + 171)
+#define __NR_quotactl                   (__NR_Linux + 172)
+#define __NR_nfsservctl                 (__NR_Linux + 173)
+#define __NR_getpmsg                    (__NR_Linux + 174)
+#define __NR_putpmsg                    (__NR_Linux + 175)
+#define __NR_afs_syscall                (__NR_Linux + 176)
+#define __NR_reserved177                (__NR_Linux + 177)
+#define __NR_gettid                     (__NR_Linux + 178)
+#define __NR_readahead                  (__NR_Linux + 179)
+#define __NR_setxattr                   (__NR_Linux + 180)
+#define __NR_lsetxattr                  (__NR_Linux + 181)
+#define __NR_fsetxattr                  (__NR_Linux + 182)
+#define __NR_getxattr                   (__NR_Linux + 183)
+#define __NR_lgetxattr                  (__NR_Linux + 184)
+#define __NR_fgetxattr                  (__NR_Linux + 185)
+#define __NR_listxattr                  (__NR_Linux + 186)
+#define __NR_llistxattr                 (__NR_Linux + 187)
+#define __NR_flistxattr                 (__NR_Linux + 188)
+#define __NR_removexattr                (__NR_Linux + 189)
+#define __NR_lremovexattr               (__NR_Linux + 190)
+#define __NR_fremovexattr               (__NR_Linux + 191)
+#define __NR_tkill                      (__NR_Linux + 192)
+#define __NR_reserved193                (__NR_Linux + 193)
+#define __NR_futex                      (__NR_Linux + 194)
+#define __NR_sched_setaffinity          (__NR_Linux + 195)
+#define __NR_sched_getaffinity          (__NR_Linux + 196)
+#define __NR_cacheflush                 (__NR_Linux + 197)
+#define __NR_cachectl                   (__NR_Linux + 198)
+#define __NR_sysmips                    (__NR_Linux + 199)
+#define __NR_io_setup                   (__NR_Linux + 200)
+#define __NR_io_destroy                 (__NR_Linux + 201)
+#define __NR_io_getevents               (__NR_Linux + 202)
+#define __NR_io_submit                  (__NR_Linux + 203)
+#define __NR_io_cancel                  (__NR_Linux + 204)
+#define __NR_exit_group                 (__NR_Linux + 205)
+#define __NR_lookup_dcookie             (__NR_Linux + 206)
+#define __NR_epoll_create               (__NR_Linux + 207)
+#define __NR_epoll_ctl                  (__NR_Linux + 208)
+#define __NR_epoll_wait                 (__NR_Linux + 209)
+#define __NR_remap_file_pages           (__NR_Linux + 210)
+#define __NR_rt_sigreturn               (__NR_Linux + 211)
+#define __NR_fcntl64                    (__NR_Linux + 212)
+#define __NR_set_tid_address            (__NR_Linux + 213)
+#define __NR_restart_syscall            (__NR_Linux + 214)
+#define __NR_semtimedop                 (__NR_Linux + 215)
+#define __NR_fadvise64                  (__NR_Linux + 216)
+#define __NR_statfs64                   (__NR_Linux + 217)
+#define __NR_fstatfs64                  (__NR_Linux + 218)
+#define __NR_sendfile64                 (__NR_Linux + 219)
+#define __NR_timer_create               (__NR_Linux + 220)
+#define __NR_timer_settime              (__NR_Linux + 221)
+#define __NR_timer_gettime              (__NR_Linux + 222)
+#define __NR_timer_getoverrun           (__NR_Linux + 223)
+#define __NR_timer_delete               (__NR_Linux + 224)
+#define __NR_clock_settime              (__NR_Linux + 225)
+#define __NR_clock_gettime              (__NR_Linux + 226)
+#define __NR_clock_getres               (__NR_Linux + 227)
+#define __NR_clock_nanosleep            (__NR_Linux + 228)
+#define __NR_tgkill                     (__NR_Linux + 229)
+#define __NR_utimes                     (__NR_Linux + 230)
+#define __NR_mbind                      (__NR_Linux + 231)
+#define __NR_get_mempolicy              (__NR_Linux + 232)
+#define __NR_set_mempolicy              (__NR_Linux + 233)
+#define __NR_mq_open                    (__NR_Linux + 234)
+#define __NR_mq_unlink                  (__NR_Linux + 235)
+#define __NR_mq_timedsend               (__NR_Linux + 236)
+#define __NR_mq_timedreceive            (__NR_Linux + 237)
+#define __NR_mq_notify                  (__NR_Linux + 238)
+#define __NR_mq_getsetattr              (__NR_Linux + 239)
+#define __NR_vserver                    (__NR_Linux + 240)
+#define __NR_waitid                     (__NR_Linux + 241)
+/* #define __NR_sys_setaltroot          (__NR_Linux + 242) */
+#define __NR_add_key                    (__NR_Linux + 243)
+#define __NR_request_key                (__NR_Linux + 244)
+#define __NR_keyctl                     (__NR_Linux + 245)
+#define __NR_set_thread_area            (__NR_Linux + 246)
+#define __NR_inotify_init               (__NR_Linux + 247)
+#define __NR_inotify_add_watch          (__NR_Linux + 248)
+#define __NR_inotify_rm_watch           (__NR_Linux + 249)
+#define __NR_migrate_pages              (__NR_Linux + 250)
+#define __NR_openat                     (__NR_Linux + 251)
+#define __NR_mkdirat                    (__NR_Linux + 252)
+#define __NR_mknodat                    (__NR_Linux + 253)
+#define __NR_fchownat                   (__NR_Linux + 254)
+#define __NR_futimesat                  (__NR_Linux + 255)
+#define __NR_newfstatat                 (__NR_Linux + 256)
+#define __NR_unlinkat                   (__NR_Linux + 257)
+#define __NR_renameat                   (__NR_Linux + 258)
+#define __NR_linkat                     (__NR_Linux + 259)
+#define __NR_symlinkat                  (__NR_Linux + 260)
+#define __NR_readlinkat                 (__NR_Linux + 261)
+#define __NR_fchmodat                   (__NR_Linux + 262)
+#define __NR_faccessat                  (__NR_Linux + 263)
+#define __NR_pselect6                   (__NR_Linux + 264)
+#define __NR_ppoll                      (__NR_Linux + 265)
+#define __NR_unshare                    (__NR_Linux + 266)
+#define __NR_splice                     (__NR_Linux + 267)
+#define __NR_sync_file_range            (__NR_Linux + 268)
+#define __NR_tee                        (__NR_Linux + 269)
+#define __NR_vmsplice                   (__NR_Linux + 270)
+#define __NR_move_pages                 (__NR_Linux + 271)
+#define __NR_set_robust_list            (__NR_Linux + 272)
+#define __NR_get_robust_list            (__NR_Linux + 273)
+#define __NR_kexec_load                 (__NR_Linux + 274)
+#define __NR_getcpu                     (__NR_Linux + 275)
+#define __NR_epoll_pwait                (__NR_Linux + 276)
+#define __NR_ioprio_set                 (__NR_Linux + 277)
+#define __NR_ioprio_get                 (__NR_Linux + 278)
+#define __NR_utimensat                  (__NR_Linux + 279)
+#define __NR_signalfd                   (__NR_Linux + 280)
+#define __NR_timerfd                    (__NR_Linux + 281)
+#define __NR_eventfd                    (__NR_Linux + 282)
+#define __NR_fallocate                  (__NR_Linux + 283)
+#define __NR_timerfd_create             (__NR_Linux + 284)
+#define __NR_timerfd_gettime            (__NR_Linux + 285)
+#define __NR_timerfd_settime            (__NR_Linux + 286)
+#define __NR_signalfd4                  (__NR_Linux + 287)
+#define __NR_eventfd2                   (__NR_Linux + 288)
+#define __NR_epoll_create1              (__NR_Linux + 289)
+#define __NR_dup3                       (__NR_Linux + 290)
+#define __NR_pipe2                      (__NR_Linux + 291)
+#define __NR_inotify_init1              (__NR_Linux + 292)
+#define __NR_preadv                     (__NR_Linux + 293)
+#define __NR_pwritev                    (__NR_Linux + 294)
+#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 295)
+#define __NR_perf_event_open            (__NR_Linux + 296)
+#define __NR_accept4                    (__NR_Linux + 297)
+#define __NR_recvmmsg                   (__NR_Linux + 298)
+#define __NR_getdents64                 (__NR_Linux + 299)
+#define __NR_fanotify_init              (__NR_Linux + 300)
+#define __NR_fanotify_mark              (__NR_Linux + 301)
+#define __NR_prlimit64                  (__NR_Linux + 302)
+#define __NR_name_to_handle_at          (__NR_Linux + 303)
+#define __NR_open_by_handle_at          (__NR_Linux + 304)
+#define __NR_clock_adjtime              (__NR_Linux + 305)
+#define __NR_syncfs                     (__NR_Linux + 306)
+#define __NR_sendmmsg                   (__NR_Linux + 307)
+#define __NR_setns                      (__NR_Linux + 308)
+#define __NR_process_vm_readv           (__NR_Linux + 309)
+#define __NR_process_vm_writev          (__NR_Linux + 310)
+#define __NR_kcmp                       (__NR_Linux + 311)
+
+/*
+ * Offset of the last N32 flavoured syscall
+ */
+#define __NR_Linux_syscalls             311
+
+#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
+
+#define __NR_N32_Linux                  6000
+#define __NR_N32_Linux_syscalls         311
+
+#endif /* _UAPI_ASM_UNISTD_H */
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index d6c2a7476bac..8b28bc4e14ea 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_SYNC_R4K)		+= sync-r4k.o
 
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
 obj-$(CONFIG_MODULES)           += mips_ksyms.o module.o
+obj-$(CONFIG_MODULES_USE_ELF_RELA) += module-rela.o
 
 obj-$(CONFIG_FUNCTION_TRACER)   += mcount.o ftrace.o
 
@@ -53,7 +54,6 @@ obj-$(CONFIG_CPU_MIPSR2)	+= spram.o
 
 obj-$(CONFIG_MIPS_VPE_LOADER)   += vpe.o
 obj-$(CONFIG_MIPS_VPE_APSP_API) += rtlx.o
-obj-$(CONFIG_MIPS_APSP_KSPD)    += kspd.o
 
 obj-$(CONFIG_I8259)             += i8259.o
 obj-$(CONFIG_IRQ_CPU)           += irq_cpu.o
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 6b30fb2caa67..0c4bce4882a6 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -12,7 +12,6 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/interrupt.h>
 #include <linux/kbuild.h>
 #include <linux/suspend.h>
 #include <asm/ptrace.h>
@@ -292,15 +291,6 @@ void output_signal_defined(void)
         BLANK();
 }
 
-void output_irq_cpustat_t_defines(void)
-{
-        COMMENT("Linux irq_cpustat_t offsets.");
-        DEFINE(IC_SOFTIRQ_PENDING,
-                        offsetof(irq_cpustat_t, __softirq_pending));
-        DEFINE(IC_IRQ_CPUSTAT_T, sizeof(irq_cpustat_t));
-        BLANK();
-}
-
 #ifdef CONFIG_CPU_CAVIUM_OCTEON
 void output_octeon_cop2_state_defines(void)
 {
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index bc58bd10a607..b1fb7af3c350 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -142,7 +142,7 @@ int __cpuinitdata mips_dsp_disabled;
 
 static int __init dsp_disable(char *s)
 {
-        cpu_data[0].ases &= ~MIPS_ASE_DSP;
+        cpu_data[0].ases &= ~(MIPS_ASE_DSP | MIPS_ASE_DSP2P);
         mips_dsp_disabled = 1;
 
         return 1;
@@ -429,6 +429,8 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
                 c->options |= MIPS_CPU_RIXI;
         if (config3 & MIPS_CONF3_DSP)
                 c->ases |= MIPS_ASE_DSP;
+        if (config3 & MIPS_CONF3_DSP2P)
+                c->ases |= MIPS_ASE_DSP2P;
         if (config3 & MIPS_CONF3_VINT)
                 c->options |= MIPS_CPU_VINT;
         if (config3 & MIPS_CONF3_VEIC)
@@ -1180,7 +1182,7 @@ __cpuinit void cpu_probe(void)
                 c->options &= ~MIPS_CPU_FPU;
 
         if (mips_dsp_disabled)
-                c->ases &= ~MIPS_ASE_DSP;
+                c->ases &= ~(MIPS_ASE_DSP | MIPS_ASE_DSP2P);
 
         if (c->options & MIPS_CPU_FPU) {
                 c->fpu_id = cpu_get_fpu_id();
@@ -1194,8 +1196,11 @@ __cpuinit void cpu_probe(void)
                 }
         }
 
-        if (cpu_has_mips_r2)
+        if (cpu_has_mips_r2) {
                 c->srsets = ((read_c0_srsctl() >> 26) & 0x0f) + 1;
+                /* R2 has Performance Counter Interrupt indicator */
+                c->options |= MIPS_CPU_PCI;
+        }
         else
                 c->srsets = 1;
 
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
deleted file mode 100644
index b77f56bbb477..000000000000
--- a/arch/mips/kernel/kspd.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (C) 2005 MIPS Technologies, Inc.  All rights reserved.
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/unistd.h>
-#include <linux/file.h>
-#include <linux/fdtable.h>
-#include <linux/fs.h>
-#include <linux/syscalls.h>
-#include <linux/workqueue.h>
-#include <linux/errno.h>
-#include <linux/list.h>
-
-#include <asm/vpe.h>
-#include <asm/rtlx.h>
-#include <asm/kspd.h>
-
-static struct workqueue_struct *workqueue;
-static struct work_struct work;
-
-extern unsigned long cpu_khz;
-
-struct mtsp_syscall {
-        int cmd;
-        unsigned char abi;
-        unsigned char size;
-};
-
-struct mtsp_syscall_ret {
-        int retval;
-        int errno;
-};
-
-struct mtsp_syscall_generic {
-        int arg0;
-        int arg1;
-        int arg2;
-        int arg3;
-        int arg4;
-        int arg5;
-        int arg6;
-};
-
-static struct list_head kspd_notifylist;
-static int sp_stopping;
-
-/* these should match with those in the SDE kit */
-#define MTSP_SYSCALL_BASE       0
-#define MTSP_SYSCALL_EXIT       (MTSP_SYSCALL_BASE + 0)
-#define MTSP_SYSCALL_OPEN       (MTSP_SYSCALL_BASE + 1)
-#define MTSP_SYSCALL_READ       (MTSP_SYSCALL_BASE + 2)
-#define MTSP_SYSCALL_WRITE      (MTSP_SYSCALL_BASE + 3)
-#define MTSP_SYSCALL_CLOSE      (MTSP_SYSCALL_BASE + 4)
-#define MTSP_SYSCALL_LSEEK32    (MTSP_SYSCALL_BASE + 5)
-#define MTSP_SYSCALL_ISATTY     (MTSP_SYSCALL_BASE + 6)
-#define MTSP_SYSCALL_GETTIME    (MTSP_SYSCALL_BASE + 7)
-#define MTSP_SYSCALL_PIPEFREQ   (MTSP_SYSCALL_BASE + 8)
-#define MTSP_SYSCALL_GETTOD     (MTSP_SYSCALL_BASE + 9)
-#define MTSP_SYSCALL_IOCTL     (MTSP_SYSCALL_BASE + 10)
-
-#define MTSP_O_RDONLY           0x0000
-#define MTSP_O_WRONLY           0x0001
-#define MTSP_O_RDWR             0x0002
-#define MTSP_O_NONBLOCK         0x0004
-#define MTSP_O_APPEND           0x0008
-#define MTSP_O_SHLOCK           0x0010
-#define MTSP_O_EXLOCK           0x0020
-#define MTSP_O_ASYNC            0x0040
-/* XXX: check which of these is actually O_SYNC vs O_DSYNC */
-#define MTSP_O_FSYNC            O_SYNC
-#define MTSP_O_NOFOLLOW         0x0100
-#define MTSP_O_SYNC             0x0080
-#define MTSP_O_CREAT            0x0200
-#define MTSP_O_TRUNC            0x0400
-#define MTSP_O_EXCL             0x0800
-#define MTSP_O_BINARY           0x8000
-
-extern int tclimit;
-
-struct apsp_table  {
-        int sp;
-        int ap;
-};
-
-/* we might want to do the mode flags too */
-struct apsp_table open_flags_table[] = {
-        { MTSP_O_RDWR, O_RDWR },
-        { MTSP_O_WRONLY, O_WRONLY },
-        { MTSP_O_CREAT, O_CREAT },
-        { MTSP_O_TRUNC, O_TRUNC },
-        { MTSP_O_NONBLOCK, O_NONBLOCK },
-        { MTSP_O_APPEND, O_APPEND },
-        { MTSP_O_NOFOLLOW, O_NOFOLLOW }
-};
-
-struct apsp_table syscall_command_table[] = {
-        { MTSP_SYSCALL_OPEN, __NR_open },
-        { MTSP_SYSCALL_CLOSE, __NR_close },
-        { MTSP_SYSCALL_READ, __NR_read },
-        { MTSP_SYSCALL_WRITE, __NR_write },
-        { MTSP_SYSCALL_LSEEK32, __NR_lseek },
-        { MTSP_SYSCALL_IOCTL, __NR_ioctl }
-};
-
-static int sp_syscall(int num, int arg0, int arg1, int arg2, int arg3)
-{
-        register long int _num  __asm__("$2") = num;
-        register long int _arg0  __asm__("$4") = arg0;
-        register long int _arg1  __asm__("$5") = arg1;
-        register long int _arg2  __asm__("$6") = arg2;
-        register long int _arg3  __asm__("$7") = arg3;
-
-        mm_segment_t old_fs;
-
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-
-        __asm__ __volatile__ (
-        "       syscall                                 \n"
-        : "=r" (_num), "=r" (_arg3)
-        : "r" (_num), "r" (_arg0), "r" (_arg1), "r" (_arg2), "r" (_arg3));
-
-        set_fs(old_fs);
-
-        /* $a3 is error flag */
-        if (_arg3)
-                return -_num;
-
-        return _num;
-}
-
-static int translate_syscall_command(int cmd)
-{
-        int i;
-        int ret = -1;
-
-        for (i = 0; i < ARRAY_SIZE(syscall_command_table); i++) {
-                if ((cmd == syscall_command_table[i].sp))
-                        return syscall_command_table[i].ap;
-        }
-
-        return ret;
-}
-
-static unsigned int translate_open_flags(int flags)
-{
-        int i;
-        unsigned int ret = 0;
-
-        for (i = 0; i < ARRAY_SIZE(open_flags_table); i++) {
-                if( (flags & open_flags_table[i].sp) ) {
-                        ret |= open_flags_table[i].ap;
-                }
-        }
-
-        return ret;
-}
-
-
-static int sp_setfsuidgid(uid_t uid, gid_t gid)
-{
-        struct cred *new;
-
-        new = prepare_creds();
-        if (!new)
-                return -ENOMEM;
-
-        new->fsuid = uid;
-        new->fsgid = gid;
-
-        commit_creds(new);
-
-        return 0;
-}
-
-/*
- * Expects a request to be on the sysio channel. Reads it.  Decides whether
- * its a linux syscall and runs it, or whatever.  Puts the return code back
- * into the request and sends the whole thing back.
- */
-void sp_work_handle_request(void)
-{
-        struct mtsp_syscall sc;
-        struct mtsp_syscall_generic generic;
-        struct mtsp_syscall_ret ret;
-        struct kspd_notifications *n;
-        unsigned long written;
-        mm_segment_t old_fs;
-        struct timeval tv;
-        struct timezone tz;
-        int err, cmd;
-
-        char *vcwd;
-        int size;
-
-        ret.retval = -1;
-
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-
-        if (!rtlx_read(RTLX_CHANNEL_SYSIO, &sc, sizeof(struct mtsp_syscall))) {
-                set_fs(old_fs);
-                printk(KERN_ERR "Expected request but nothing to read\n");
-                return;
-        }
-
-        size = sc.size;
-
-        if (size) {
-                if (!rtlx_read(RTLX_CHANNEL_SYSIO, &generic, size)) {
-                        set_fs(old_fs);
-                        printk(KERN_ERR "Expected request but nothing to read\n");
-                        return;
-                }
-        }
-
-        /* Run the syscall at the privilege of the user who loaded the
-           SP program */
-
-        if (vpe_getuid(tclimit)) {
-                err = sp_setfsuidgid(vpe_getuid(tclimit), vpe_getgid(tclimit));
-                if (!err)
-                        pr_err("Change of creds failed\n");
-        }
-
-        switch (sc.cmd) {
-        /* needs the flags argument translating from SDE kit to
-           linux */
-        case MTSP_SYSCALL_PIPEFREQ:
-                ret.retval = cpu_khz * 1000;
-                ret.errno = 0;
-                break;
-
-        case MTSP_SYSCALL_GETTOD:
-                memset(&tz, 0, sizeof(tz));
-                if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv,
-                                             (int)&tz, 0, 0)) == 0)
-                        ret.retval = tv.tv_sec;
-                break;
-
-        case MTSP_SYSCALL_EXIT:
-                list_for_each_entry(n, &kspd_notifylist, list)
-                        n->kspd_sp_exit(tclimit);
-                sp_stopping = 1;
-
-                printk(KERN_DEBUG "KSPD got exit syscall from SP exitcode %d\n",
-                       generic.arg0);
-                break;
-
-        case MTSP_SYSCALL_OPEN:
-                generic.arg1 = translate_open_flags(generic.arg1);
-
-                vcwd = vpe_getcwd(tclimit);
-
-                /* change to cwd of the process that loaded the SP program */
-                old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                sys_chdir(vcwd);
-                set_fs(old_fs);
-
-                sc.cmd = __NR_open;
-
-                /* fall through */
-
-        default:
-                if ((sc.cmd >= __NR_Linux) &&
-                    (sc.cmd <= (__NR_Linux +  __NR_Linux_syscalls)) )
-                        cmd = sc.cmd;
-                else
-                        cmd = translate_syscall_command(sc.cmd);
-
-                if (cmd >= 0) {
-                        ret.retval = sp_syscall(cmd, generic.arg0, generic.arg1,
-                                                generic.arg2, generic.arg3);
-                } else
-                        printk(KERN_WARNING
-                               "KSPD: Unknown SP syscall number %d\n", sc.cmd);
-                break;
-        } /* switch */
-
-        if (vpe_getuid(tclimit)) {
-                err = sp_setfsuidgid(0, 0);
-                if (!err)
-                        pr_err("restoring old creds failed\n");
-        }
-
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        written = rtlx_write(RTLX_CHANNEL_SYSIO, &ret, sizeof(ret));
-        set_fs(old_fs);
-        if (written < sizeof(ret))
-                printk("KSPD: sp_work_handle_request failed to send to SP\n");
-}
-
-static void sp_cleanup(void)
-{
-        struct files_struct *files = current->files;
-        int i, j;
-        struct fdtable *fdt;
-
-        j = 0;
-
-        /*
-         * It is safe to dereference the fd table without RCU or
-         * ->file_lock
-         */
-        fdt = files_fdtable(files);
-        for (;;) {
-                unsigned long set;
-                i = j * BITS_PER_LONG;
-                if (i >= fdt->max_fds)
-                        break;
-                set = fdt->open_fds[j++];
-                while (set) {
-                        if (set & 1) {
-                                struct file * file = xchg(&fdt->fd[i], NULL);
-                                if (file)
-                                        filp_close(file, files);
-                        }
-                        i++;
-                        set >>= 1;
-                }
-        }
-
-        /* Put daemon cwd back to root to avoid umount problems */
-        sys_chdir("/");
-}
-
-static int channel_open;
-
-/* the work handler */
-static void sp_work(struct work_struct *unused)
-{
-        if (!channel_open) {
-                if( rtlx_open(RTLX_CHANNEL_SYSIO, 1) != 0) {
-                        printk("KSPD: unable to open sp channel\n");
-                        sp_stopping = 1;
-                } else {
-                        channel_open++;
-                        printk(KERN_DEBUG "KSPD: SP channel opened\n");
-                }
-        } else {
-                /* wait for some data, allow it to sleep */
-                rtlx_read_poll(RTLX_CHANNEL_SYSIO, 1);
-
-                /* Check we haven't been woken because we are stopping */
-                if (!sp_stopping)
-                        sp_work_handle_request();
-        }
-
-        if (!sp_stopping)
-                queue_work(workqueue, &work);
-        else
-                sp_cleanup();
-}
-
-static void startwork(int vpe)
-{
-        sp_stopping = channel_open = 0;
-
-        if (workqueue == NULL) {
-                if ((workqueue = create_singlethread_workqueue("kspd")) == NULL) {
-                        printk(KERN_ERR "unable to start kspd\n");
-                        return;
-                }
-
-                INIT_WORK(&work, sp_work);
-        }
-
-        queue_work(workqueue, &work);
-}
-
-static void stopwork(int vpe)
-{
-        sp_stopping = 1;
-
-        printk(KERN_DEBUG "KSPD: SP stopping\n");
-}
-
-void kspd_notify(struct kspd_notifications *notify)
-{
-        list_add(&notify->list, &kspd_notifylist);
-}
-
-static struct vpe_notifications notify;
-static int kspd_module_init(void)
-{
-        INIT_LIST_HEAD(&kspd_notifylist);
-
-        notify.start = startwork;
-        notify.stop = stopwork;
-        vpe_notify(tclimit, &notify);
-
-        return 0;
-}
-
-static void kspd_module_exit(void)
-{
-
-}
-
-module_init(kspd_module_init);
-module_exit(kspd_module_exit);
-
-MODULE_DESCRIPTION("MIPS KSPD");
-MODULE_AUTHOR("Elizabeth Oldham, MIPS Technologies, Inc.");
-MODULE_LICENSE("GPL");
diff --git a/arch/mips/kernel/module-rela.c b/arch/mips/kernel/module-rela.c
new file mode 100644
index 000000000000..61d60028b888
--- /dev/null
+++ b/arch/mips/kernel/module-rela.c
@@ -0,0 +1,145 @@
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  Copyright (C) 2001 Rusty Russell.
+ *  Copyright (C) 2003, 2004 Ralf Baechle (ralf@linux-mips.org)
+ *  Copyright (C) 2005 Thiemo Seufer
+ */
+
+#include <linux/elf.h>
+#include <linux/err.h>
+#include <linux/errno.h>
+#include <linux/moduleloader.h>
+
+extern int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v);
+
+static int apply_r_mips_32_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        *location = v;
+
+        return 0;
+}
+
+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        if (v % 4) {
+                pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
+                       me->name);
+                return -ENOEXEC;
+        }
+
+        if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+                printk(KERN_ERR
+                       "module %s: relocation overflow\n",
+                       me->name);
+                return -ENOEXEC;
+        }
+
+        *location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
+
+        return 0;
+}
+
+static int apply_r_mips_hi16_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        *location = (*location & 0xffff0000) |
+                    ((((long long) v + 0x8000LL) >> 16) & 0xffff);
+
+        return 0;
+}
+
+static int apply_r_mips_lo16_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        *location = (*location & 0xffff0000) | (v & 0xffff);
+
+        return 0;
+}
+
+static int apply_r_mips_64_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        *(Elf_Addr *)location = v;
+
+        return 0;
+}
+
+static int apply_r_mips_higher_rela(struct module *me, u32 *location,
+                                    Elf_Addr v)
+{
+        *location = (*location & 0xffff0000) |
+                    ((((long long) v + 0x80008000LL) >> 32) & 0xffff);
+
+        return 0;
+}
+
+static int apply_r_mips_highest_rela(struct module *me, u32 *location,
+                                     Elf_Addr v)
+{
+        *location = (*location & 0xffff0000) |
+                    ((((long long) v + 0x800080008000LL) >> 48) & 0xffff);
+
+        return 0;
+}
+
+static int (*reloc_handlers_rela[]) (struct module *me, u32 *location,
+                                Elf_Addr v) = {
+        [R_MIPS_NONE]           = apply_r_mips_none,
+        [R_MIPS_32]             = apply_r_mips_32_rela,
+        [R_MIPS_26]             = apply_r_mips_26_rela,
+        [R_MIPS_HI16]           = apply_r_mips_hi16_rela,
+        [R_MIPS_LO16]           = apply_r_mips_lo16_rela,
+        [R_MIPS_64]             = apply_r_mips_64_rela,
+        [R_MIPS_HIGHER]         = apply_r_mips_higher_rela,
+        [R_MIPS_HIGHEST]        = apply_r_mips_highest_rela
+};
+
+int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
+                       unsigned int symindex, unsigned int relsec,
+                       struct module *me)
+{
+        Elf_Mips_Rela *rel = (void *) sechdrs[relsec].sh_addr;
+        Elf_Sym *sym;
+        u32 *location;
+        unsigned int i;
+        Elf_Addr v;
+        int res;
+
+        pr_debug("Applying relocate section %u to %u\n", relsec,
+               sechdrs[relsec].sh_info);
+
+        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
+                /* This is where to make the change */
+                location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
+                        + rel[i].r_offset;
+                /* This is the symbol it is referring to */
+                sym = (Elf_Sym *)sechdrs[symindex].sh_addr
+                        + ELF_MIPS_R_SYM(rel[i]);
+                if (IS_ERR_VALUE(sym->st_value)) {
+                        /* Ignore unresolved weak symbol */
+                        if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
+                                continue;
+                        printk(KERN_WARNING "%s: Unknown symbol %s\n",
+                               me->name, strtab + sym->st_name);
+                        return -ENOENT;
+                }
+
+                v = sym->st_value + rel[i].r_addend;
+
+                res = reloc_handlers_rela[ELF_MIPS_R_TYPE(rel[i])](me, location, v);
+                if (res)
+                        return res;
+        }
+
+        return 0;
+}
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index 4f8c3cba8c0c..07ff5812ffaf 100644
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -51,7 +51,7 @@ void *module_alloc(unsigned long size)
 }
 #endif
 
-static int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
+int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
 {
         return 0;
 }
@@ -63,13 +63,6 @@ static int apply_r_mips_32_rel(struct module *me, u32 *location, Elf_Addr v)
         return 0;
 }
 
-static int apply_r_mips_32_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        *location = v;
-
-        return 0;
-}
-
 static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
 {
         if (v % 4) {
@@ -91,26 +84,6 @@ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
         return 0;
 }
 
-static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        if (v % 4) {
-                pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-                       me->name);
-                return -ENOEXEC;
-        }
-
-        if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
-                printk(KERN_ERR
-                       "module %s: relocation overflow\n",
-                       me->name);
-                return -ENOEXEC;
-        }
-
-        *location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-
-        return 0;
-}
-
 static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
 {
         struct mips_hi16 *n;
@@ -132,14 +105,6 @@ static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
         return 0;
 }
 
-static int apply_r_mips_hi16_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        *location = (*location & 0xffff0000) |
-                    ((((long long) v + 0x8000LL) >> 16) & 0xffff);
-
-        return 0;
-}
-
 static void free_relocation_chain(struct mips_hi16 *l)
 {
         struct mips_hi16 *next;
@@ -217,38 +182,6 @@ out_danger:
         return -ENOEXEC;
 }
 
-static int apply_r_mips_lo16_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        *location = (*location & 0xffff0000) | (v & 0xffff);
-
-        return 0;
-}
-
-static int apply_r_mips_64_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        *(Elf_Addr *)location = v;
-
-        return 0;
-}
-
-static int apply_r_mips_higher_rela(struct module *me, u32 *location,
-                                    Elf_Addr v)
-{
-        *location = (*location & 0xffff0000) |
-                    ((((long long) v + 0x80008000LL) >> 32) & 0xffff);
-
-        return 0;
-}
-
-static int apply_r_mips_highest_rela(struct module *me, u32 *location,
-                                     Elf_Addr v)
-{
-        *location = (*location & 0xffff0000) |
-                    ((((long long) v + 0x800080008000LL) >> 48) & 0xffff);
-
-        return 0;
-}
-
 static int (*reloc_handlers_rel[]) (struct module *me, u32 *location,
                                 Elf_Addr v) = {
         [R_MIPS_NONE]           = apply_r_mips_none,
@@ -258,18 +191,6 @@ static int (*reloc_handlers_rel[]) (struct module *me, u32 *location,
         [R_MIPS_LO16]           = apply_r_mips_lo16_rel
 };
 
-static int (*reloc_handlers_rela[]) (struct module *me, u32 *location,
-                                Elf_Addr v) = {
-        [R_MIPS_NONE]           = apply_r_mips_none,
-        [R_MIPS_32]             = apply_r_mips_32_rela,
-        [R_MIPS_26]             = apply_r_mips_26_rela,
-        [R_MIPS_HI16]           = apply_r_mips_hi16_rela,
-        [R_MIPS_LO16]           = apply_r_mips_lo16_rela,
-        [R_MIPS_64]             = apply_r_mips_64_rela,
-        [R_MIPS_HIGHER]         = apply_r_mips_higher_rela,
-        [R_MIPS_HIGHEST]        = apply_r_mips_highest_rela
-};
-
 int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,
                    unsigned int symindex, unsigned int relsec,
                    struct module *me)
@@ -324,46 +245,6 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,
         return 0;
 }
 
-int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
-                       unsigned int symindex, unsigned int relsec,
-                       struct module *me)
-{
-        Elf_Mips_Rela *rel = (void *) sechdrs[relsec].sh_addr;
-        Elf_Sym *sym;
-        u32 *location;
-        unsigned int i;
-        Elf_Addr v;
-        int res;
-
-        pr_debug("Applying relocate section %u to %u\n", relsec,
-               sechdrs[relsec].sh_info);
-
-        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
-                /* This is where to make the change */
-                location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
-                        + rel[i].r_offset;
-                /* This is the symbol it is referring to */
-                sym = (Elf_Sym *)sechdrs[symindex].sh_addr
-                        + ELF_MIPS_R_SYM(rel[i]);
-                if (IS_ERR_VALUE(sym->st_value)) {
-                        /* Ignore unresolved weak symbol */
-                        if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
-                                continue;
-                        printk(KERN_WARNING "%s: Unknown symbol %s\n",
-                               me->name, strtab + sym->st_name);
-                        return -ENOENT;
-                }
-
-                v = sym->st_value + rel[i].r_addend;
-
-                res = reloc_handlers_rela[ELF_MIPS_R_TYPE(rel[i])](me, location, v);
-                if (res)
-                        return res;
-        }
-
-        return 0;
-}
-
 /* Given an address, look for it in the module exception tables. */
 const struct exception_table_entry *search_module_dbetables(unsigned long addr)
 {
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index 2f28d3b55687..a9b995dcf691 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -28,6 +28,8 @@
 #include <asm/time.h> /* For perf_irq */
 
 #define MIPS_MAX_HWEVENTS 4
+#define MIPS_TCS_PER_COUNTER 2
+#define MIPS_CPUID_TO_COUNTER_MASK (MIPS_TCS_PER_COUNTER - 1)
 
 struct cpu_hw_events {
         /* Array of events on this cpu. */
@@ -78,7 +80,6 @@ struct mips_perf_event {
 static struct mips_perf_event raw_event;
 static DEFINE_MUTEX(raw_event_mutex);
 
-#define UNSUPPORTED_PERF_EVENT_ID 0xffffffff
 #define C(x) PERF_COUNT_HW_CACHE_##x
 
 struct mips_pmu {
@@ -109,13 +110,20 @@ static struct mips_pmu mipspmu;
 #define M_PERFCTL_INTERRUPT_ENABLE      (1      <<  4)
 #define M_PERFCTL_EVENT(event)          (((event) & 0x3ff)  << 5)
 #define M_PERFCTL_VPEID(vpe)            ((vpe)    << 16)
+
+#ifdef CONFIG_CPU_BMIPS5000
+#define M_PERFCTL_MT_EN(filter)         0
+#else /* !CONFIG_CPU_BMIPS5000 */
 #define M_PERFCTL_MT_EN(filter)         ((filter) << 20)
+#endif /* CONFIG_CPU_BMIPS5000 */
+
 #define    M_TC_EN_ALL                  M_PERFCTL_MT_EN(0)
 #define    M_TC_EN_VPE                  M_PERFCTL_MT_EN(1)
 #define    M_TC_EN_TC                   M_PERFCTL_MT_EN(2)
 #define M_PERFCTL_TCID(tcid)            ((tcid)   << 22)
 #define M_PERFCTL_WIDE                  (1      << 30)
 #define M_PERFCTL_MORE                  (1      << 31)
+#define M_PERFCTL_TC                    (1      << 30)
 
 #define M_PERFCTL_COUNT_EVENT_WHENEVER  (M_PERFCTL_EXL |                \
                                         M_PERFCTL_KERNEL |              \
@@ -131,21 +139,21 @@ static struct mips_pmu mipspmu;
 #define M_PERFCTL_EVENT_MASK            0xfe0
 
 
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
 static int cpu_has_mipsmt_pertccounters;
 
 static DEFINE_RWLOCK(pmuint_rwlock);
 
+#if defined(CONFIG_CPU_BMIPS5000)
+#define vpe_id()        (cpu_has_mipsmt_pertccounters ? \
+                         0 : (smp_processor_id() & MIPS_CPUID_TO_COUNTER_MASK))
+#else
 /*
  * FIXME: For VSMP, vpe_id() is redefined for Perf-events, because
  * cpu_data[cpuid].vpe_id reports 0 for _both_ CPUs.
  */
-#if defined(CONFIG_HW_PERF_EVENTS)
-#define vpe_id()        (cpu_has_mipsmt_pertccounters ? \
-                        0 : smp_processor_id())
-#else
 #define vpe_id()        (cpu_has_mipsmt_pertccounters ? \
-                        0 : cpu_data[smp_processor_id()].vpe_id)
+                         0 : smp_processor_id())
 #endif
 
 /* Copied from op_model_mipsxx.c */
@@ -162,10 +170,10 @@ static unsigned int counters_total_to_per_cpu(unsigned int counters)
         return counters >> vpe_shift();
 }
 
-#else /* !CONFIG_MIPS_MT_SMP */
+#else /* !CONFIG_MIPS_PERF_SHARED_TC_COUNTERS */
 #define vpe_id()        0
 
-#endif /* CONFIG_MIPS_MT_SMP */
+#endif /* CONFIG_MIPS_PERF_SHARED_TC_COUNTERS */
 
 static void resume_local_counters(void);
 static void pause_local_counters(void);
@@ -340,6 +348,11 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx)
                 (evt->config_base & M_PERFCTL_CONFIG_MASK) |
                 /* Make sure interrupt enabled. */
                 M_PERFCTL_INTERRUPT_ENABLE;
+        if (IS_ENABLED(CONFIG_CPU_BMIPS5000))
+                /* enable the counter for the calling thread */
+                cpuc->saved_ctrl[idx] |=
+                        (1 << (12 + vpe_id())) | M_PERFCTL_TC;
+
         /*
          * We do not actually let the counter run. Leave it until start().
          */
@@ -509,7 +522,7 @@ static void mipspmu_read(struct perf_event *event)
 
 static void mipspmu_enable(struct pmu *pmu)
 {
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
         write_unlock(&pmuint_rwlock);
 #endif
         resume_local_counters();
@@ -529,7 +542,7 @@ static void mipspmu_enable(struct pmu *pmu)
 static void mipspmu_disable(struct pmu *pmu)
 {
         pause_local_counters();
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
         write_lock(&pmuint_rwlock);
 #endif
 }
@@ -664,13 +677,10 @@ static unsigned int mipspmu_perf_event_encode(const struct mips_perf_event *pev)
 
 static const struct mips_perf_event *mipspmu_map_general_event(int idx)
 {
-        const struct mips_perf_event *pev;
-
-        pev = ((*mipspmu.general_event_map)[idx].event_id ==
-                UNSUPPORTED_PERF_EVENT_ID ? ERR_PTR(-EOPNOTSUPP) :
-                &(*mipspmu.general_event_map)[idx]);
 
-        return pev;
+        if ((*mipspmu.general_event_map)[idx].cntr_mask == 0)
+                return ERR_PTR(-EOPNOTSUPP);
+        return &(*mipspmu.general_event_map)[idx];
 }
 
 static const struct mips_perf_event *mipspmu_map_cache_event(u64 config)
@@ -695,7 +705,7 @@ static const struct mips_perf_event *mipspmu_map_cache_event(u64 config)
                                         [cache_op]
                                         [cache_result]);
 
-        if (pev->event_id == UNSUPPORTED_PERF_EVENT_ID)
+        if (pev->cntr_mask == 0)
                 return ERR_PTR(-EOPNOTSUPP);
 
         return pev;
@@ -800,11 +810,8 @@ static const struct mips_perf_event mipsxxcore_event_map
                                 [PERF_COUNT_HW_MAX] = {
         [PERF_COUNT_HW_CPU_CYCLES] = { 0x00, CNTR_EVEN | CNTR_ODD, P },
         [PERF_COUNT_HW_INSTRUCTIONS] = { 0x01, CNTR_EVEN | CNTR_ODD, T },
-        [PERF_COUNT_HW_CACHE_REFERENCES] = { UNSUPPORTED_PERF_EVENT_ID },
-        [PERF_COUNT_HW_CACHE_MISSES] = { UNSUPPORTED_PERF_EVENT_ID },
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = { 0x02, CNTR_EVEN, T },
         [PERF_COUNT_HW_BRANCH_MISSES] = { 0x02, CNTR_ODD, T },
-        [PERF_COUNT_HW_BUS_CYCLES] = { UNSUPPORTED_PERF_EVENT_ID },
 };
 
 /* 74K core has different branch event code. */
@@ -812,11 +819,8 @@ static const struct mips_perf_event mipsxx74Kcore_event_map
                                 [PERF_COUNT_HW_MAX] = {
         [PERF_COUNT_HW_CPU_CYCLES] = { 0x00, CNTR_EVEN | CNTR_ODD, P },
         [PERF_COUNT_HW_INSTRUCTIONS] = { 0x01, CNTR_EVEN | CNTR_ODD, T },
-        [PERF_COUNT_HW_CACHE_REFERENCES] = { UNSUPPORTED_PERF_EVENT_ID },
-        [PERF_COUNT_HW_CACHE_MISSES] = { UNSUPPORTED_PERF_EVENT_ID },
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = { 0x27, CNTR_EVEN, T },
         [PERF_COUNT_HW_BRANCH_MISSES] = { 0x27, CNTR_ODD, T },
-        [PERF_COUNT_HW_BUS_CYCLES] = { UNSUPPORTED_PERF_EVENT_ID },
 };
 
 static const struct mips_perf_event octeon_event_map[PERF_COUNT_HW_MAX] = {
@@ -829,6 +833,13 @@ static const struct mips_perf_event octeon_event_map[PERF_COUNT_HW_MAX] = {
         [PERF_COUNT_HW_BUS_CYCLES] = { 0x25, CNTR_ALL },
 };
 
+static const struct mips_perf_event bmips5000_event_map
+                                [PERF_COUNT_HW_MAX] = {
+        [PERF_COUNT_HW_CPU_CYCLES] = { 0x00, CNTR_EVEN | CNTR_ODD, T },
+        [PERF_COUNT_HW_INSTRUCTIONS] = { 0x01, CNTR_EVEN | CNTR_ODD, T },
+        [PERF_COUNT_HW_BRANCH_MISSES] = { 0x02, CNTR_ODD, T },
+};
+
 /* 24K/34K/1004K cores can share the same cache event map. */
 static const struct mips_perf_event mipsxxcore_cache_map
                                 [PERF_COUNT_HW_CACHE_MAX]
@@ -849,10 +860,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                 [C(RESULT_ACCESS)]      = { 0x0a, CNTR_EVEN, T },
                 [C(RESULT_MISS)]        = { 0x0b, CNTR_EVEN | CNTR_ODD, T },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(L1I)] = {
         [C(OP_READ)] = {
@@ -869,7 +876,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                  * Note that MIPS has only "hit" events countable for
                  * the prefetch operation.
                  */
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
         },
 },
 [C(LL)] = {
@@ -881,10 +887,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                 [C(RESULT_ACCESS)]      = { 0x15, CNTR_ODD, P },
                 [C(RESULT_MISS)]        = { 0x16, CNTR_EVEN, P },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(DTLB)] = {
         [C(OP_READ)] = {
@@ -895,10 +897,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                 [C(RESULT_ACCESS)]      = { 0x06, CNTR_EVEN, T },
                 [C(RESULT_MISS)]        = { 0x06, CNTR_ODD, T },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(ITLB)] = {
         [C(OP_READ)] = {
@@ -909,10 +907,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                 [C(RESULT_ACCESS)]      = { 0x05, CNTR_EVEN, T },
                 [C(RESULT_MISS)]        = { 0x05, CNTR_ODD, T },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(BPU)] = {
         /* Using the same code for *HW_BRANCH* */
@@ -924,24 +918,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                 [C(RESULT_ACCESS)]      = { 0x02, CNTR_EVEN, T },
                 [C(RESULT_MISS)]        = { 0x02, CNTR_ODD, T },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-},
-[C(NODE)] = {
-        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 };
 
@@ -965,10 +941,6 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                 [C(RESULT_ACCESS)]      = { 0x17, CNTR_ODD, T },
                 [C(RESULT_MISS)]        = { 0x18, CNTR_ODD, T },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(L1I)] = {
         [C(OP_READ)] = {
@@ -985,7 +957,6 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                  * Note that MIPS has only "hit" events countable for
                  * the prefetch operation.
                  */
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
         },
 },
 [C(LL)] = {
@@ -997,25 +968,6 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                 [C(RESULT_ACCESS)]      = { 0x1c, CNTR_ODD, P },
                 [C(RESULT_MISS)]        = { 0x1d, CNTR_EVEN | CNTR_ODD, P },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-},
-[C(DTLB)] = {
-        /* 74K core does not have specific DTLB events. */
-        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(ITLB)] = {
         [C(OP_READ)] = {
@@ -1026,10 +978,6 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                 [C(RESULT_ACCESS)]      = { 0x04, CNTR_EVEN, T },
                 [C(RESULT_MISS)]        = { 0x04, CNTR_ODD, T },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(BPU)] = {
         /* Using the same code for *HW_BRANCH* */
@@ -1041,23 +989,64 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                 [C(RESULT_ACCESS)]      = { 0x27, CNTR_EVEN, T },
                 [C(RESULT_MISS)]        = { 0x27, CNTR_ODD, T },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
+},
+};
+
+/* BMIPS5000 */
+static const struct mips_perf_event bmips5000_cache_map
+                                [PERF_COUNT_HW_CACHE_MAX]
+                                [PERF_COUNT_HW_CACHE_OP_MAX]
+                                [PERF_COUNT_HW_CACHE_RESULT_MAX] = {
+[C(L1D)] = {
+        /*
+         * Like some other architectures (e.g. ARM), the performance
+         * counters don't differentiate between read and write
+         * accesses/misses, so this isn't strictly correct, but it's the
+         * best we can do. Writes and reads get combined.
+         */
+        [C(OP_READ)] = {
+                [C(RESULT_ACCESS)]      = { 12, CNTR_EVEN, T },
+                [C(RESULT_MISS)]        = { 12, CNTR_ODD, T },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_ACCESS)]      = { 12, CNTR_EVEN, T },
+                [C(RESULT_MISS)]        = { 12, CNTR_ODD, T },
         },
 },
-[C(NODE)] = {
+[C(L1I)] = {
         [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
+                [C(RESULT_ACCESS)]      = { 10, CNTR_EVEN, T },
+                [C(RESULT_MISS)]        = { 10, CNTR_ODD, T },
         },
         [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
+                [C(RESULT_ACCESS)]      = { 10, CNTR_EVEN, T },
+                [C(RESULT_MISS)]        = { 10, CNTR_ODD, T },
         },
         [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
+                [C(RESULT_ACCESS)]      = { 23, CNTR_EVEN, T },
+                /*
+                 * Note that MIPS has only "hit" events countable for
+                 * the prefetch operation.
+                 */
+        },
+},
+[C(LL)] = {
+        [C(OP_READ)] = {
+                [C(RESULT_ACCESS)]      = { 28, CNTR_EVEN, P },
+                [C(RESULT_MISS)]        = { 28, CNTR_ODD, P },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_ACCESS)]      = { 28, CNTR_EVEN, P },
+                [C(RESULT_MISS)]        = { 28, CNTR_ODD, P },
+        },
+},
+[C(BPU)] = {
+        /* Using the same code for *HW_BRANCH* */
+        [C(OP_READ)] = {
+                [C(RESULT_MISS)]        = { 0x02, CNTR_ODD, T },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_MISS)]        = { 0x02, CNTR_ODD, T },
         },
 },
 };
@@ -1074,39 +1063,14 @@ static const struct mips_perf_event octeon_cache_map
         },
         [C(OP_WRITE)] = {
                 [C(RESULT_ACCESS)]      = { 0x30, CNTR_ALL },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
         },
 },
 [C(L1I)] = {
         [C(OP_READ)] = {
                 [C(RESULT_ACCESS)]      = { 0x18, CNTR_ALL },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
         },
         [C(OP_PREFETCH)] = {
                 [C(RESULT_ACCESS)]      = { 0x19, CNTR_ALL },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-},
-[C(LL)] = {
-        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
         },
 },
 [C(DTLB)] = {
@@ -1115,46 +1079,16 @@ static const struct mips_perf_event octeon_cache_map
          * read and write.
          */
         [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
                 [C(RESULT_MISS)]        = { 0x35, CNTR_ALL },
         },
         [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
                 [C(RESULT_MISS)]        = { 0x35, CNTR_ALL },
         },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(ITLB)] = {
         [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
                 [C(RESULT_MISS)]        = { 0x37, CNTR_ALL },
         },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-},
-[C(BPU)] = {
-        /* Using the same code for *HW_BRANCH* */
-        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 };
 
@@ -1304,7 +1238,7 @@ static int mipsxx_pmu_handle_shared_irq(void)
         int handled = IRQ_NONE;
         struct pt_regs *regs;
 
-        if (cpu_has_mips_r2 && !(read_c0_cause() & (1 << 26)))
+        if (cpu_has_perf_cntr_intr_bit && !(read_c0_cause() & CAUSEF_PCI))
                 return handled;
         /*
          * First we pause the local counters, so that when we are locked
@@ -1314,7 +1248,7 @@ static int mipsxx_pmu_handle_shared_irq(void)
          * See also mipsxx_pmu_start().
          */
         pause_local_counters();
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
         read_lock(&pmuint_rwlock);
 #endif
 
@@ -1346,7 +1280,7 @@ static int mipsxx_pmu_handle_shared_irq(void)
         if (handled == IRQ_HANDLED)
                 irq_work_run();
 
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
         read_unlock(&pmuint_rwlock);
 #endif
         resume_local_counters();
@@ -1391,6 +1325,11 @@ static irqreturn_t mipsxx_pmu_handle_irq(int irq, void *dev)
 #define IS_RANGE_V_1004K_EVENT(r)       ((r) == 47)
 #endif
 
+/* BMIPS5000 */
+#define IS_BOTH_COUNTERS_BMIPS5000_EVENT(b)                             \
+        ((b) == 0 || (b) == 1)
+
+
 /*
  * User can use 0-255 raw events, where 0-127 for the events of even
  * counters, and 128-255 for odd counters. Note that bit 7 is used to
@@ -1461,6 +1400,12 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
                         raw_event.range = T;
 #endif
                 break;
+        case CPU_BMIPS5000:
+                if (IS_BOTH_COUNTERS_BMIPS5000_EVENT(base_id))
+                        raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;
+                else
+                        raw_event.cntr_mask =
+                                raw_id > 127 ? CNTR_ODD : CNTR_EVEN;
         }
 
         return &raw_event;
@@ -1513,7 +1458,7 @@ init_hw_perf_events(void)
                 return -ENODEV;
         }
 
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
         cpu_has_mipsmt_pertccounters = read_c0_config7() & (1<<19);
         if (!cpu_has_mipsmt_pertccounters)
                 counters = counters_total_to_per_cpu(counters);
@@ -1572,6 +1517,11 @@ init_hw_perf_events(void)
                 mipspmu.cache_event_map = &octeon_cache_map;
                 mipspmu.map_raw_event = octeon_pmu_map_raw_event;
                 break;
+        case CPU_BMIPS5000:
+                mipspmu.name = "BMIPS5000";
+                mipspmu.general_event_map = &bmips5000_event_map;
+                mipspmu.cache_event_map = &bmips5000_cache_map;
+                break;
         default:
                 pr_cont("Either hardware does not support performance "
                         "counters, or not yet implemented.\n");
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 5542817c1b49..07dff54f2ce8 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -64,14 +64,17 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                                 cpu_data[n].watch_reg_masks[i]);
                 seq_printf(m, "]\n");
         }
-        seq_printf(m, "ASEs implemented\t:%s%s%s%s%s%s\n",
-                      cpu_has_mips16 ? " mips16" : "",
-                      cpu_has_mdmx ? " mdmx" : "",
-                      cpu_has_mips3d ? " mips3d" : "",
-                      cpu_has_smartmips ? " smartmips" : "",
-                      cpu_has_dsp ? " dsp" : "",
-                      cpu_has_mipsmt ? " mt" : ""
-                );
+
+        seq_printf(m, "ASEs implemented\t:");
+        if (cpu_has_mips16)     seq_printf(m, "%s", " mips16");
+        if (cpu_has_mdmx)       seq_printf(m, "%s", " mdmx");
+        if (cpu_has_mips3d)     seq_printf(m, "%s", " mips3d");
+        if (cpu_has_smartmips)  seq_printf(m, "%s", " smartmips");
+        if (cpu_has_dsp)        seq_printf(m, "%s", " dsp");
+        if (cpu_has_dsp2)       seq_printf(m, "%s", " dsp2");
+        if (cpu_has_mipsmt)     seq_printf(m, "%s", " mt");
+        seq_printf(m, "\n");
+
         seq_printf(m, "shadow register sets\t: %d\n",
                       cpu_data[n].srsets);
         seq_printf(m, "kscratch registers\t: %d\n",
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index df243a64f430..007ccbe1e264 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -1,6 +1,13 @@
 #include <asm/asm-offsets.h>
 #include <asm/page.h>
 #include <asm/thread_info.h>
+
+/*
+ * Put .bss..swapper_pg_dir as the first thing in .bss. This will
+ * ensure that it has .bss alignment (64K).
+ */
+#define BSS_FIRST_SECTIONS *(.bss..swapper_pg_dir)
+
 #include <asm-generic/vmlinux.lds.h>
 
 #undef mips
@@ -119,11 +126,21 @@ SECTIONS
         }
 
         PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
-        . = ALIGN(PAGE_SIZE);
+        /*
+         * Align to 64K in attempt to eliminate holes before the
+         * .bss..swapper_pg_dir section at the start of .bss.  This
+         * also satisfies PAGE_SIZE alignment as the largest page size
+         * allowed is 64K.
+         */
+        . = ALIGN(0x10000);
         __init_end = .;
         /* freed after init ends here */
 
-        BSS_SECTION(0, 0, 0)
+        /*
+         * Force .bss to 64K alignment so that .bss..swapper_pg_dir
+         * gets that alignment.  .sbss should be empty, so there will be
+         * no holes after __init_end. */
+        BSS_SECTION(0, 0x10000, 0)
 
         _end = . ;
 
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index f6f91523cb1c..eec690af6581 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -50,7 +50,6 @@
 #include <asm/mips_mt.h>
 #include <asm/processor.h>
 #include <asm/vpe.h>
-#include <asm/kspd.h>
 
 typedef void *vpe_handle;
 
@@ -69,11 +68,6 @@ static char module_name[] = "vpe";
 static int major;
 static const int minor = 1;     /* fixed for now  */
 
-#ifdef CONFIG_MIPS_APSP_KSPD
-static struct kspd_notifications kspd_events;
-static int kspd_events_reqd;
-#endif
-
 /* grab the likely amount of memory we will need. */
 #ifdef CONFIG_MIPS_VPE_LOADER_TOM
 #define P_SIZE (2 * 1024 * 1024)
@@ -1101,14 +1095,6 @@ static int vpe_open(struct inode *inode, struct file *filp)
         v->uid = filp->f_cred->fsuid;
         v->gid = filp->f_cred->fsgid;
 
-#ifdef CONFIG_MIPS_APSP_KSPD
-        /* get kspd to tell us when a syscall_exit happens */
-        if (!kspd_events_reqd) {
-                kspd_notify(&kspd_events);
-                kspd_events_reqd++;
-        }
-#endif
-
         v->cwd[0] = 0;
         ret = getcwd(v->cwd, VPE_PATH_MAX);
         if (ret < 0)
@@ -1341,13 +1327,6 @@ char *vpe_getcwd(int index)
 
 EXPORT_SYMBOL(vpe_getcwd);
 
-#ifdef CONFIG_MIPS_APSP_KSPD
-static void kspd_sp_exit( int sp_id)
-{
-        cleanup_tc(get_tc(sp_id));
-}
-#endif
-
 static ssize_t store_kill(struct device *dev, struct device_attribute *attr,
                           const char *buf, size_t len)
 {
@@ -1585,9 +1564,6 @@ out_reenable:
         emt(mtflags);
         local_irq_restore(flags);
 
-#ifdef CONFIG_MIPS_APSP_KSPD
-        kspd_events.kspd_sp_exit = kspd_sp_exit;
-#endif
         return 0;
 
 out_class:
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 1a85ba92eb5c..be9acb2b959d 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -469,19 +469,20 @@ void __init_refok free_initmem(void)
 #ifndef CONFIG_MIPS_PGD_C0_CONTEXT
 unsigned long pgd_current[NR_CPUS];
 #endif
-/*
- * On 64-bit we've got three-level pagetables with a slightly
- * different layout ...
- */
-#define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE<<order)))
 
 /*
  * gcc 3.3 and older have trouble determining that PTRS_PER_PGD and PGD_ORDER
  * are constants.  So we use the variants from asm-offset.h until that gcc
  * will officially be retired.
+ *
+ * Align swapper_pg_dir in to 64K, allows its address to be loaded
+ * with a single LUI instruction in the TLB handlers.  If we used
+ * __aligned(64K), its size would get rounded up to the alignment
+ * size, and waste space.  So we place it in its own section and align
+ * it in the linker script.
  */
-pgd_t swapper_pg_dir[_PTRS_PER_PGD] __page_aligned(_PGD_ORDER);
+pgd_t swapper_pg_dir[_PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
 #ifndef __PAGETABLE_PMD_FOLDED
-pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned(PMD_ORDER);
+pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned_bss;
 #endif
-pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER);
+pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss;
diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c
index cda4e300eb0a..25407794edb4 100644
--- a/arch/mips/mm/pgtable-64.c
+++ b/arch/mips/mm/pgtable-64.c
@@ -26,17 +26,17 @@ void pgd_init(unsigned long page)
         p = (unsigned long *) page;
         end = p + PTRS_PER_PGD;
 
-        while (p < end) {
+        do {
                 p[0] = entry;
                 p[1] = entry;
                 p[2] = entry;
                 p[3] = entry;
                 p[4] = entry;
-                p[5] = entry;
-                p[6] = entry;
-                p[7] = entry;
                 p += 8;
-        }
+                p[-3] = entry;
+                p[-2] = entry;
+                p[-1] = entry;
+        } while (p != end);
 }
 
 #ifndef __PAGETABLE_PMD_FOLDED
@@ -47,17 +47,17 @@ void pmd_init(unsigned long addr, unsigned long pagetable)
         p = (unsigned long *) addr;
         end = p + PTRS_PER_PMD;
 
-        while (p < end) {
+        do {
                 p[0] = pagetable;
                 p[1] = pagetable;
                 p[2] = pagetable;
                 p[3] = pagetable;
                 p[4] = pagetable;
-                p[5] = pagetable;
-                p[6] = pagetable;
-                p[7] = pagetable;
                 p += 8;
-        }
+                p[-3] = pagetable;
+                p[-2] = pagetable;
+                p[-1] = pagetable;
+        } while (p != end);
 }
 #endif
 
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index e09d49256908..658a520364ce 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -599,8 +599,7 @@ static __cpuinit __maybe_unused void build_convert_pte_to_entrylo(u32 **p,
                                                                   unsigned int reg)
 {
         if (cpu_has_rixi) {
-                UASM_i_SRL(p, reg, reg, ilog2(_PAGE_NO_EXEC));
-                UASM_i_ROTR(p, reg, reg, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
+                UASM_i_ROTR(p, reg, reg, ilog2(_PAGE_GLOBAL));
         } else {
 #ifdef CONFIG_64BIT_PHYS_ADDR
                 uasm_i_dsrl_safe(p, reg, reg, ilog2(_PAGE_GLOBAL));
@@ -1019,11 +1018,9 @@ static void __cpuinit build_update_entries(u32 **p, unsigned int tmp,
                 uasm_i_ld(p, tmp, 0, ptep); /* get even pte */
                 uasm_i_ld(p, ptep, sizeof(pte_t), ptep); /* get odd pte */
                 if (cpu_has_rixi) {
-                        UASM_i_SRL(p, tmp, tmp, ilog2(_PAGE_NO_EXEC));
-                        UASM_i_SRL(p, ptep, ptep, ilog2(_PAGE_NO_EXEC));
-                        UASM_i_ROTR(p, tmp, tmp, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
+                        UASM_i_ROTR(p, tmp, tmp, ilog2(_PAGE_GLOBAL));
                         UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */
-                        UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
+                        UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL));
                 } else {
                         uasm_i_dsrl_safe(p, tmp, tmp, ilog2(_PAGE_GLOBAL)); /* convert to entrylo0 */
                         UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */
@@ -1046,13 +1043,11 @@ static void __cpuinit build_update_entries(u32 **p, unsigned int tmp,
         if (r45k_bvahwbug())
                 build_tlb_probe_entry(p);
         if (cpu_has_rixi) {
-                UASM_i_SRL(p, tmp, tmp, ilog2(_PAGE_NO_EXEC));
-                UASM_i_SRL(p, ptep, ptep, ilog2(_PAGE_NO_EXEC));
-                UASM_i_ROTR(p, tmp, tmp, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
+                UASM_i_ROTR(p, tmp, tmp, ilog2(_PAGE_GLOBAL));
                 if (r4k_250MHZhwbug())
                         UASM_i_MTC0(p, 0, C0_ENTRYLO0);
                 UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */
-                UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
+                UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL));
         } else {
                 UASM_i_SRL(p, tmp, tmp, ilog2(_PAGE_GLOBAL)); /* convert to entrylo0 */
                 if (r4k_250MHZhwbug())
@@ -1212,13 +1207,9 @@ build_fast_tlb_refill_handler (u32 **p, struct uasm_label **l,
                 UASM_i_LW(p, odd, sizeof(pte_t), ptr); /* get odd pte */
         }
         if (cpu_has_rixi) {
-                uasm_i_dsrl_safe(p, even, even, ilog2(_PAGE_NO_EXEC));
-                uasm_i_dsrl_safe(p, odd, odd, ilog2(_PAGE_NO_EXEC));
-                uasm_i_drotr(p, even, even,
-                             ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
+                uasm_i_drotr(p, even, even, ilog2(_PAGE_GLOBAL));
                 UASM_i_MTC0(p, even, C0_ENTRYLO0); /* load it */
-                uasm_i_drotr(p, odd, odd,
-                             ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
+                uasm_i_drotr(p, odd, odd, ilog2(_PAGE_GLOBAL));
         } else {
                 uasm_i_dsrl_safe(p, even, even, ilog2(_PAGE_GLOBAL));
                 UASM_i_MTC0(p, even, C0_ENTRYLO0); /* load it */
diff --git a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c
index 819622f93e9c..9a1a2244522a 100644
--- a/arch/mips/pci/fixup-malta.c
+++ b/arch/mips/pci/fixup-malta.c
@@ -8,7 +8,8 @@
 #define PCID            4
 
 /* This table is filled in by interrogating the PIIX4 chip */
-static char pci_irq[5] __initdata;
+static char pci_irq[5] __devinitdata = {
+};
 
 static char irq_tab[][5] __initdata = {
         /*      INTA    INTB    INTC    INTD */
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
index b2d4f492d782..9cb9d43a3a0e 100644
--- a/arch/mips/sni/a20r.c
+++ b/arch/mips/sni/a20r.c
@@ -118,26 +118,6 @@ static struct resource sc26xx_rsrc[] = {
         }
 };
 
-static unsigned int sc26xx_data[2] = {
-        /* DTR   |   RTS    |   DSR    |   CTS     |   DCD     |   RI    */
-        (8 << 0) | (4 << 4) | (6 << 8) | (0 << 12) | (6 << 16) | (0 << 20),
-        (3 << 0) | (2 << 4) | (1 << 8) | (2 << 12) | (3 << 16) | (4 << 20)
-};
-
-static struct platform_device sc26xx_pdev = {
-        .name           = "SC26xx",
-        .num_resources  = ARRAY_SIZE(sc26xx_rsrc),
-        .resource       = sc26xx_rsrc,
-        .dev                    = {
-                .platform_data  = sc26xx_data,
-        }
-};
-
-#warning "Please try migrate to use new driver SCCNXP and report the status" \
-         "in the linux-serial mailing list."
-
-/* The code bellow is a replacement of SC26XX to SCCNXP */
-#if 0
 #include <linux/platform_data/sccnxp.h>
 
 static struct sccnxp_pdata sccnxp_data = {
@@ -155,15 +135,14 @@ static struct sccnxp_pdata sccnxp_data = {
                           MCTRL_SIG(RNG_IP, LINE_IP3),
 };
 
-static struct platform_device sc2681_pdev = {
+static struct platform_device sc26xx_pdev = {
         .name           = "sc2681",
-        .resource       = sc2xxx_rsrc,
-        .num_resources  = ARRAY_SIZE(sc2xxx_rsrc),
+        .resource       = sc26xx_rsrc,
+        .num_resources  = ARRAY_SIZE(sc26xx_rsrc),
         .dev    = {
                 .platform_data  = &sccnxp_data,
         },
 };
-#endif
 
 static u32 a20r_ack_hwint(void)
 {
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index ddbdc33471a8..04669fac117b 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -9,6 +9,7 @@ config MN10300
         select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
         select GENERIC_CLOCKEVENTS
         select GENERIC_KERNEL_THREAD
+        select MODULES_USE_ELF_RELA
 
 config AM33_2
         def_bool n
diff --git a/arch/mn10300/include/asm/module.h b/arch/mn10300/include/asm/module.h
index 5d7057d01494..6571103b0518 100644
--- a/arch/mn10300/include/asm/module.h
+++ b/arch/mn10300/include/asm/module.h
@@ -12,12 +12,7 @@
 #ifndef _ASM_MODULE_H
 #define _ASM_MODULE_H
 
-struct mod_arch_specific {
-};
-
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
+#include <asm-generic/module.h>
 
 /*
  * Include the MN10300 architecture version.
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 49765b53f637..05f2ba41ff1a 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -21,6 +21,7 @@ config OPENRISC
         select GENERIC_CLOCKEVENTS
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
+        select MODULES_USE_ELF_RELA
 
 config MMU
         def_bool y
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index b87438bb3384..11def45b98c5 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -20,6 +20,8 @@ config PARISC
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select GENERIC_SMP_IDLE_THREAD
         select GENERIC_STRNCPY_FROM_USER
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
 
         help
           The PA-RISC microprocessor is designed by Hewlett-Packard and used
diff --git a/arch/parisc/include/asm/module.h b/arch/parisc/include/asm/module.h
index 1f4123427ea0..bab37e99168a 100644
--- a/arch/parisc/include/asm/module.h
+++ b/arch/parisc/include/asm/module.h
@@ -1,21 +1,11 @@
 #ifndef _ASM_PARISC_MODULE_H
 #define _ASM_PARISC_MODULE_H
+
+#include <asm-generic/module.h>
+
 /*
  * This file contains the parisc architecture specific module code.
  */
-#ifdef CONFIG_64BIT
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Sym Elf64_Sym
-#define Elf_Ehdr Elf64_Ehdr
-#define Elf_Addr Elf64_Addr
-#define Elf_Rela Elf64_Rela
-#else
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-#define Elf_Addr Elf32_Addr
-#define Elf_Rela Elf32_Rela
-#endif
 
 struct unwind_table;
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 969f3d9ded91..a902a5c1c76a 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -142,6 +142,8 @@ config PPC
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
         select GENERIC_KERNEL_THREAD
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
 
 config EARLY_PRINTK
         bool
diff --git a/arch/powerpc/include/asm/module.h b/arch/powerpc/include/asm/module.h
index 0192a4ee2bc2..c1df590ec444 100644
--- a/arch/powerpc/include/asm/module.h
+++ b/arch/powerpc/include/asm/module.h
@@ -11,6 +11,7 @@
 
 #include <linux/list.h>
 #include <asm/bug.h>
+#include <asm-generic/module.h>
 
 
 #ifndef __powerpc64__
@@ -60,16 +61,10 @@ struct mod_arch_specific {
  */
 
 #ifdef __powerpc64__
-#    define Elf_Shdr    Elf64_Shdr
-#    define Elf_Sym     Elf64_Sym
-#    define Elf_Ehdr    Elf64_Ehdr
 #    ifdef MODULE
         asm(".section .stubs,\"ax\",@nobits; .align 3; .previous");
 #    endif
 #else
-#    define Elf_Shdr    Elf32_Shdr
-#    define Elf_Sym     Elf32_Sym
-#    define Elf_Ehdr    Elf32_Ehdr
 #    ifdef MODULE
         asm(".section .plt,\"ax\",@nobits; .align 3; .previous");
         asm(".section .init.plt,\"ax\",@nobits; .align 3; .previous");
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index e5dac1236185..3f3d9ca7a5b6 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -136,6 +136,8 @@ config S390
         select KTIME_SCALAR if 32BIT
         select HAVE_ARCH_SECCOMP_FILTER
         select GENERIC_KERNEL_THREAD
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
 
 config SCHED_OMIT_FRAME_POINTER
         def_bool y
diff --git a/arch/s390/include/asm/module.h b/arch/s390/include/asm/module.h
index f0b6b26b6e59..df1f861a848a 100644
--- a/arch/s390/include/asm/module.h
+++ b/arch/s390/include/asm/module.h
@@ -1,5 +1,8 @@
 #ifndef _ASM_S390_MODULE_H
 #define _ASM_S390_MODULE_H
+
+#include <asm-generic/module.h>
+
 /*
  * This file contains the s390 architecture specific module code.
  */
@@ -28,19 +31,4 @@ struct mod_arch_specific
         struct mod_arch_syminfo *syminfo;
 };
 
-#ifdef CONFIG_64BIT
-#define ElfW(x) Elf64_ ## x
-#define ELFW(x) ELF64_ ## x
-#else
-#define ElfW(x) Elf32_ ## x
-#define ELFW(x) ELF32_ ## x
-#endif
-
-#define Elf_Addr ElfW(Addr)
-#define Elf_Rela ElfW(Rela)
-#define Elf_Shdr ElfW(Shdr)
-#define Elf_Sym ElfW(Sym)
-#define Elf_Ehdr ElfW(Ehdr)
-#define ELF_R_SYM ELFW(R_SYM)
-#define ELF_R_TYPE ELFW(R_TYPE)
 #endif /* _ASM_S390_MODULE_H */
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 461c23747491..4f93a431a45a 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -11,6 +11,8 @@ config SCORE
        select ARCH_DISCARD_MEMBLOCK
        select GENERIC_CPU_DEVICES
        select GENERIC_CLOCKEVENTS
+       select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_REL
 
 choice
         prompt "System type"
diff --git a/arch/score/include/asm/module.h b/arch/score/include/asm/module.h
index f0b5dc0bd023..abf395bbfaba 100644
--- a/arch/score/include/asm/module.h
+++ b/arch/score/include/asm/module.h
@@ -3,6 +3,7 @@
 
 #include <linux/list.h>
 #include <asm/uaccess.h>
+#include <asm-generic/module.h>
 
 struct mod_arch_specific {
         /* Data Bus Error exception tables */
@@ -13,11 +14,6 @@ struct mod_arch_specific {
 
 typedef uint8_t Elf64_Byte;             /* Type for a 8-bit quantity. */
 
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-#define Elf_Addr        Elf32_Addr
-
 /* Given an address, look for it in the exception tables. */
 #ifdef CONFIG_MODULES
 const struct exception_table_entry *search_module_dbetables(unsigned long addr);
diff --git a/arch/score/kernel/module.c b/arch/score/kernel/module.c
index 469e3b64e2f2..1378d99baa3d 100644
--- a/arch/score/kernel/module.c
+++ b/arch/score/kernel/module.c
@@ -125,16 +125,6 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,
         return 0;
 }
 
-int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
-                unsigned int symindex, unsigned int relsec,
-                struct module *me)
-{
-        /* Non-standard return value... most other arch's return -ENOEXEC
-         * for an unsupported relocation variant
-         */
-        return 0;
-}
-
 /* Given an address, look for it in the module exception tables. */
 const struct exception_table_entry *search_module_dbetables(unsigned long addr)
 {
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3b3e27a3ff2c..babc2b826c5c 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -38,6 +38,8 @@ config SUPERH
         select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
+        select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
+        select MODULES_USE_ELF_RELA
         help
           The SuperH is a RISC processor targeted for use in embedded systems
           and consumer electronics; it was also used in the Sega Dreamcast
diff --git a/arch/sh/include/asm/module.h b/arch/sh/include/asm/module.h
index b7927de86f9f..81300d8b5448 100644
--- a/arch/sh/include/asm/module.h
+++ b/arch/sh/include/asm/module.h
@@ -1,21 +1,13 @@
 #ifndef _ASM_SH_MODULE_H
 #define _ASM_SH_MODULE_H
 
-struct mod_arch_specific {
+#include <asm-generic/module.h>
+
 #ifdef CONFIG_DWARF_UNWINDER
+struct mod_arch_specific {
         struct list_head fde_list;
         struct list_head cie_list;
-#endif
 };
-
-#ifdef CONFIG_64BIT
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Sym Elf64_Sym
-#define Elf_Ehdr Elf64_Ehdr
-#else
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
 #endif
 
 #ifdef CONFIG_CPU_LITTLE_ENDIAN
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 91c780c973ba..b6b442b0d793 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -39,6 +39,7 @@ config SPARC
         select GENERIC_CLOCKEVENTS
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
+        select MODULES_USE_ELF_RELA
 
 config SPARC32
         def_bool !64BIT
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
index 10d54e5e37f5..645a58da0e86 100644
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
@@ -7,4 +7,5 @@ generic-y += exec.h
 generic-y += local64.h
 generic-y += irq_regs.h
 generic-y += local.h
+generic-y += module.h
 generic-y += word-at-a-time.h
diff --git a/arch/sparc/include/asm/module.h b/arch/sparc/include/asm/module.h
deleted file mode 100644
index ff8e02d80334..000000000000
--- a/arch/sparc/include/asm/module.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __SPARC_MODULE_H
-#define __SPARC_MODULE_H
-struct mod_arch_specific { };
-
-/*
- * Use some preprocessor magic to define the correct symbol
- * for sparc32 and sparc64.
- * Elf_Addr becomes Elf32_Addr for sparc32 and Elf64_Addr for sparc64
- */
-#define ___ELF(a, b, c) a##b##c
-#define __ELF(a, b, c)  ___ELF(a, b, c)
-#define  _Elf(t)        __ELF(Elf, CONFIG_BITS, t)
-#define  _ELF(t)        __ELF(ELF, CONFIG_BITS, t)
-
-#define Elf_Shdr     _Elf(_Shdr)
-#define Elf_Sym      _Elf(_Sym)
-#define Elf_Ehdr     _Elf(_Ehdr)
-#define Elf_Rela     _Elf(_Rela)
-#define Elf_Addr     _Elf(_Addr)
-
-#define ELF_R_SYM    _ELF(_R_SYM)
-#define ELF_R_TYPE   _ELF(_R_TYPE)
-
-#endif /* __SPARC_MODULE_H */
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index dc46490adca0..875d008828b8 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -20,6 +20,7 @@ config TILE
         select SYS_HYPERVISOR
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select GENERIC_CLOCKEVENTS
+        select MODULES_USE_ELF_RELA
 
 # FIXME: investigate whether we need/want these options.
 #       select HAVE_IOREMAP_PROT
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 35ee2bf66354..e5c5473e69ce 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -15,6 +15,7 @@ config UNICORE32
         select GENERIC_IRQ_SHOW
         select ARCH_WANT_FRAME_POINTERS
         select GENERIC_IOMAP
+        select MODULES_USE_ELF_REL
         help
           UniCore-32 is 32-bit Instruction Set Architecture,
           including a series of low-power-consumption RISC chip
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 70071b19eb98..46c3bff3ced2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -110,6 +110,8 @@ config X86
         select HAVE_IRQ_TIME_ACCOUNTING
         select GENERIC_KERNEL_THREAD
         select GENERIC_KERNEL_EXECVE
+        select MODULES_USE_ELF_REL if X86_32
+        select MODULES_USE_ELF_RELA if X86_64
 
 config INSTRUCTION_DECODER
         def_bool y
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index ce03476d8c8f..ccce0ed67dde 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -37,7 +37,8 @@ setup-y		+= video-bios.o
 targets         += $(setup-y)
 hostprogs-y     := mkcpustr tools/build
 
-HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include \
+                    -include include/generated/autoconf.h \
                     -D__EXPORTED_HEADERS__
 
 $(obj)/cpu.o: $(obj)/cpustr.h
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 9fa950df80e5..07611759ce35 100644
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -24,9 +24,11 @@ config X86_32
         def_bool !64BIT
         select HAVE_AOUT
         select ARCH_WANT_IPC_PARSE_VERSION
+        select MODULES_USE_ELF_REL
 
 config X86_64
         def_bool 64BIT
+        select MODULES_USE_ELF_RELA
 
 config RWSEM_XCHGADD_ALGORITHM
         def_bool X86_XADD && 64BIT
diff --git a/arch/xtensa/include/asm/module.h b/arch/xtensa/include/asm/module.h
index d9b34bee4d42..488b40c6f9b9 100644
--- a/arch/xtensa/include/asm/module.h
+++ b/arch/xtensa/include/asm/module.h
@@ -13,15 +13,8 @@
 #ifndef _XTENSA_MODULE_H
 #define _XTENSA_MODULE_H
 
-struct mod_arch_specific
-{
-        /* No special elements, yet. */
-};
-
 #define MODULE_ARCH_VERMAGIC "xtensa-" __stringify(XCHAL_CORE_ID) " "
 
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
+#include <asm-generic/module.h>
 
 #endif  /* _XTENSA_MODULE_H */
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 50402dc0ea35..6563366bae80 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1216,5 +1216,6 @@ config CRYPTO_USER_API_SKCIPHER
           key cipher algorithms.
 
 source "drivers/crypto/Kconfig"
+source crypto/asymmetric_keys/Kconfig
 
 endif   # if CRYPTO
diff --git a/crypto/Makefile b/crypto/Makefile
index a301ad2b258c..8cf61ffe3513 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -97,3 +97,4 @@ obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o
 #
 obj-$(CONFIG_XOR_BLOCKS) += xor.o
 obj-$(CONFIG_ASYNC_CORE) += async_tx/
+obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
diff --git a/crypto/asymmetric_keys/.gitignore b/crypto/asymmetric_keys/.gitignore
new file mode 100644
index 000000000000..ee328374dba8
--- /dev/null
+++ b/crypto/asymmetric_keys/.gitignore
@@ -0,0 +1 @@
+*-asn1.[ch]
diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig
new file mode 100644
index 000000000000..6d2c2ea12559
--- /dev/null
+++ b/crypto/asymmetric_keys/Kconfig
@@ -0,0 +1,38 @@
+menuconfig ASYMMETRIC_KEY_TYPE
+        tristate "Asymmetric (public-key cryptographic) key type"
+        depends on KEYS
+        help
+          This option provides support for a key type that holds the data for
+          the asymmetric keys used for public key cryptographic operations such
+          as encryption, decryption, signature generation and signature
+          verification.
+
+if ASYMMETRIC_KEY_TYPE
+
+config ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+        tristate "Asymmetric public-key crypto algorithm subtype"
+        select MPILIB
+        help
+          This option provides support for asymmetric public key type handling.
+          If signature generation and/or verification are to be used,
+          appropriate hash algorithms (such as SHA-1) must be available.
+          ENOPKG will be reported if the requisite algorithm is unavailable.
+
+config PUBLIC_KEY_ALGO_RSA
+        tristate "RSA public-key algorithm"
+        depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+        select MPILIB_EXTRA
+        help
+          This option enables support for the RSA algorithm (PKCS#1, RFC3447).
+
+config X509_CERTIFICATE_PARSER
+        tristate "X.509 certificate parser"
+        depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+        select ASN1
+        select OID_REGISTRY
+        help
+          This option procides support for parsing X.509 format blobs for key
+          data and provides the ability to instantiate a crypto key from a
+          public key packet found inside the certificate.
+
+endif # ASYMMETRIC_KEY_TYPE
diff --git a/crypto/asymmetric_keys/Makefile b/crypto/asymmetric_keys/Makefile
new file mode 100644
index 000000000000..0727204aab68
--- /dev/null
+++ b/crypto/asymmetric_keys/Makefile
@@ -0,0 +1,27 @@
+#
+# Makefile for asymmetric cryptographic keys
+#
+
+obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys.o
+
+asymmetric_keys-y := asymmetric_type.o signature.o
+
+obj-$(CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key.o
+obj-$(CONFIG_PUBLIC_KEY_ALGO_RSA) += rsa.o
+
+#
+# X.509 Certificate handling
+#
+obj-$(CONFIG_X509_CERTIFICATE_PARSER) += x509_key_parser.o
+x509_key_parser-y := \
+        x509-asn1.o \
+        x509_rsakey-asn1.o \
+        x509_cert_parser.o \
+        x509_public_key.o
+
+$(obj)/x509_cert_parser.o: $(obj)/x509-asn1.h $(obj)/x509_rsakey-asn1.h
+$(obj)/x509-asn1.o: $(obj)/x509-asn1.c $(obj)/x509-asn1.h
+$(obj)/x509_rsakey-asn1.o: $(obj)/x509_rsakey-asn1.c $(obj)/x509_rsakey-asn1.h
+
+clean-files     += x509-asn1.c x509-asn1.h
+clean-files     += x509_rsakey-asn1.c x509_rsakey-asn1.h
diff --git a/crypto/asymmetric_keys/asymmetric_keys.h b/crypto/asymmetric_keys/asymmetric_keys.h
new file mode 100644
index 000000000000..515b63430812
--- /dev/null
+++ b/crypto/asymmetric_keys/asymmetric_keys.h
@@ -0,0 +1,15 @@
+/* Internal definitions for asymmetric key type
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+static inline const char *asymmetric_key_id(const struct key *key)
+{
+        return key->type_data.p[1];
+}
diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c
new file mode 100644
index 000000000000..cf807654d221
--- /dev/null
+++ b/crypto/asymmetric_keys/asymmetric_type.c
@@ -0,0 +1,274 @@
+/* Asymmetric public-key cryptography key type
+ *
+ * See Documentation/security/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#include <keys/asymmetric-subtype.h>
+#include <keys/asymmetric-parser.h>
+#include <linux/seq_file.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include "asymmetric_keys.h"
+
+MODULE_LICENSE("GPL");
+
+static LIST_HEAD(asymmetric_key_parsers);
+static DECLARE_RWSEM(asymmetric_key_parsers_sem);
+
+/*
+ * Match asymmetric keys on (part of) their name
+ * We have some shorthand methods for matching keys.  We allow:
+ *
+ *      "<desc>"        - request a key by description
+ *      "id:<id>"       - request a key matching the ID
+ *      "<subtype>:<id>" - request a key of a subtype
+ */
+static int asymmetric_key_match(const struct key *key, const void *description)
+{
+        const struct asymmetric_key_subtype *subtype = asymmetric_key_subtype(key);
+        const char *spec = description;
+        const char *id, *kid;
+        ptrdiff_t speclen;
+        size_t idlen, kidlen;
+
+        if (!subtype || !spec || !*spec)
+                return 0;
+
+        /* See if the full key description matches as is */
+        if (key->description && strcmp(key->description, description) == 0)
+                return 1;
+
+        /* All tests from here on break the criterion description into a
+         * specifier, a colon and then an identifier.
+         */
+        id = strchr(spec, ':');
+        if (!id)
+                return 0;
+
+        speclen = id - spec;
+        id++;
+
+        /* Anything after here requires a partial match on the ID string */
+        kid = asymmetric_key_id(key);
+        if (!kid)
+                return 0;
+
+        idlen = strlen(id);
+        kidlen = strlen(kid);
+        if (idlen > kidlen)
+                return 0;
+
+        kid += kidlen - idlen;
+        if (strcasecmp(id, kid) != 0)
+                return 0;
+
+        if (speclen == 2 &&
+            memcmp(spec, "id", 2) == 0)
+                return 1;
+
+        if (speclen == subtype->name_len &&
+            memcmp(spec, subtype->name, speclen) == 0)
+                return 1;
+
+        return 0;
+}
+
+/*
+ * Describe the asymmetric key
+ */
+static void asymmetric_key_describe(const struct key *key, struct seq_file *m)
+{
+        const struct asymmetric_key_subtype *subtype = asymmetric_key_subtype(key);
+        const char *kid = asymmetric_key_id(key);
+        size_t n;
+
+        seq_puts(m, key->description);
+
+        if (subtype) {
+                seq_puts(m, ": ");
+                subtype->describe(key, m);
+
+                if (kid) {
+                        seq_putc(m, ' ');
+                        n = strlen(kid);
+                        if (n <= 8)
+                                seq_puts(m, kid);
+                        else
+                                seq_puts(m, kid + n - 8);
+                }
+
+                seq_puts(m, " [");
+                /* put something here to indicate the key's capabilities */
+                seq_putc(m, ']');
+        }
+}
+
+/*
+ * Preparse a asymmetric payload to get format the contents appropriately for the
+ * internal payload to cut down on the number of scans of the data performed.
+ *
+ * We also generate a proposed description from the contents of the key that
+ * can be used to name the key if the user doesn't want to provide one.
+ */
+static int asymmetric_key_preparse(struct key_preparsed_payload *prep)
+{
+        struct asymmetric_key_parser *parser;
+        int ret;
+
+        pr_devel("==>%s()\n", __func__);
+
+        if (prep->datalen == 0)
+                return -EINVAL;
+
+        down_read(&asymmetric_key_parsers_sem);
+
+        ret = -EBADMSG;
+        list_for_each_entry(parser, &asymmetric_key_parsers, link) {
+                pr_debug("Trying parser '%s'\n", parser->name);
+
+                ret = parser->parse(prep);
+                if (ret != -EBADMSG) {
+                        pr_debug("Parser recognised the format (ret %d)\n",
+                                 ret);
+                        break;
+                }
+        }
+
+        up_read(&asymmetric_key_parsers_sem);
+        pr_devel("<==%s() = %d\n", __func__, ret);
+        return ret;
+}
+
+/*
+ * Clean up the preparse data
+ */
+static void asymmetric_key_free_preparse(struct key_preparsed_payload *prep)
+{
+        struct asymmetric_key_subtype *subtype = prep->type_data[0];
+
+        pr_devel("==>%s()\n", __func__);
+
+        if (subtype) {
+                subtype->destroy(prep->payload);
+                module_put(subtype->owner);
+        }
+        kfree(prep->type_data[1]);
+        kfree(prep->description);
+}
+
+/*
+ * Instantiate a asymmetric_key defined key.  The key was preparsed, so we just
+ * have to transfer the data here.
+ */
+static int asymmetric_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
+{
+        int ret;
+
+        pr_devel("==>%s()\n", __func__);
+
+        ret = key_payload_reserve(key, prep->quotalen);
+        if (ret == 0) {
+                key->type_data.p[0] = prep->type_data[0];
+                key->type_data.p[1] = prep->type_data[1];
+                key->payload.data = prep->payload;
+                prep->type_data[0] = NULL;
+                prep->type_data[1] = NULL;
+                prep->payload = NULL;
+        }
+        pr_devel("<==%s() = %d\n", __func__, ret);
+        return ret;
+}
+
+/*
+ * dispose of the data dangling from the corpse of a asymmetric key
+ */
+static void asymmetric_key_destroy(struct key *key)
+{
+        struct asymmetric_key_subtype *subtype = asymmetric_key_subtype(key);
+        if (subtype) {
+                subtype->destroy(key->payload.data);
+                module_put(subtype->owner);
+                key->type_data.p[0] = NULL;
+        }
+        kfree(key->type_data.p[1]);
+        key->type_data.p[1] = NULL;
+}
+
+struct key_type key_type_asymmetric = {
+        .name           = "asymmetric",
+        .preparse       = asymmetric_key_preparse,
+        .free_preparse  = asymmetric_key_free_preparse,
+        .instantiate    = asymmetric_key_instantiate,
+        .match          = asymmetric_key_match,
+        .destroy        = asymmetric_key_destroy,
+        .describe       = asymmetric_key_describe,
+};
+EXPORT_SYMBOL_GPL(key_type_asymmetric);
+
+/**
+ * register_asymmetric_key_parser - Register a asymmetric key blob parser
+ * @parser: The parser to register
+ */
+int register_asymmetric_key_parser(struct asymmetric_key_parser *parser)
+{
+        struct asymmetric_key_parser *cursor;
+        int ret;
+
+        down_write(&asymmetric_key_parsers_sem);
+
+        list_for_each_entry(cursor, &asymmetric_key_parsers, link) {
+                if (strcmp(cursor->name, parser->name) == 0) {
+                        pr_err("Asymmetric key parser '%s' already registered\n",
+                               parser->name);
+                        ret = -EEXIST;
+                        goto out;
+                }
+        }
+
+        list_add_tail(&parser->link, &asymmetric_key_parsers);
+
+        pr_notice("Asymmetric key parser '%s' registered\n", parser->name);
+        ret = 0;
+
+out:
+        up_write(&asymmetric_key_parsers_sem);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(register_asymmetric_key_parser);
+
+/**
+ * unregister_asymmetric_key_parser - Unregister a asymmetric key blob parser
+ * @parser: The parser to unregister
+ */
+void unregister_asymmetric_key_parser(struct asymmetric_key_parser *parser)
+{
+        down_write(&asymmetric_key_parsers_sem);
+        list_del(&parser->link);
+        up_write(&asymmetric_key_parsers_sem);
+
+        pr_notice("Asymmetric key parser '%s' unregistered\n", parser->name);
+}
+EXPORT_SYMBOL_GPL(unregister_asymmetric_key_parser);
+
+/*
+ * Module stuff
+ */
+static int __init asymmetric_key_init(void)
+{
+        return register_key_type(&key_type_asymmetric);
+}
+
+static void __exit asymmetric_key_cleanup(void)
+{
+        unregister_key_type(&key_type_asymmetric);
+}
+
+module_init(asymmetric_key_init);
+module_exit(asymmetric_key_cleanup);
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
new file mode 100644
index 000000000000..cb2e29180a87
--- /dev/null
+++ b/crypto/asymmetric_keys/public_key.c
@@ -0,0 +1,108 @@
+/* In-software asymmetric public-key crypto subtype
+ *
+ * See Documentation/crypto/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) "PKEY: "fmt
+#include <linux/module.h>
+#include <linux/export.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/seq_file.h>
+#include <keys/asymmetric-subtype.h>
+#include "public_key.h"
+
+MODULE_LICENSE("GPL");
+
+const char *const pkey_algo[PKEY_ALGO__LAST] = {
+        [PKEY_ALGO_DSA]         = "DSA",
+        [PKEY_ALGO_RSA]         = "RSA",
+};
+EXPORT_SYMBOL_GPL(pkey_algo);
+
+const char *const pkey_hash_algo[PKEY_HASH__LAST] = {
+        [PKEY_HASH_MD4]         = "md4",
+        [PKEY_HASH_MD5]         = "md5",
+        [PKEY_HASH_SHA1]        = "sha1",
+        [PKEY_HASH_RIPE_MD_160] = "rmd160",
+        [PKEY_HASH_SHA256]      = "sha256",
+        [PKEY_HASH_SHA384]      = "sha384",
+        [PKEY_HASH_SHA512]      = "sha512",
+        [PKEY_HASH_SHA224]      = "sha224",
+};
+EXPORT_SYMBOL_GPL(pkey_hash_algo);
+
+const char *const pkey_id_type[PKEY_ID_TYPE__LAST] = {
+        [PKEY_ID_PGP]           = "PGP",
+        [PKEY_ID_X509]          = "X509",
+};
+EXPORT_SYMBOL_GPL(pkey_id_type);
+
+/*
+ * Provide a part of a description of the key for /proc/keys.
+ */
+static void public_key_describe(const struct key *asymmetric_key,
+                                struct seq_file *m)
+{
+        struct public_key *key = asymmetric_key->payload.data;
+
+        if (key)
+                seq_printf(m, "%s.%s",
+                           pkey_id_type[key->id_type], key->algo->name);
+}
+
+/*
+ * Destroy a public key algorithm key.
+ */
+void public_key_destroy(void *payload)
+{
+        struct public_key *key = payload;
+        int i;
+
+        if (key) {
+                for (i = 0; i < ARRAY_SIZE(key->mpi); i++)
+                        mpi_free(key->mpi[i]);
+                kfree(key);
+        }
+}
+EXPORT_SYMBOL_GPL(public_key_destroy);
+
+/*
+ * Verify a signature using a public key.
+ */
+static int public_key_verify_signature(const struct key *key,
+                                       const struct public_key_signature *sig)
+{
+        const struct public_key *pk = key->payload.data;
+
+        if (!pk->algo->verify_signature)
+                return -ENOTSUPP;
+
+        if (sig->nr_mpi != pk->algo->n_sig_mpi) {
+                pr_debug("Signature has %u MPI not %u\n",
+                         sig->nr_mpi, pk->algo->n_sig_mpi);
+                return -EINVAL;
+        }
+
+        return pk->algo->verify_signature(pk, sig);
+}
+
+/*
+ * Public key algorithm asymmetric key subtype
+ */
+struct asymmetric_key_subtype public_key_subtype = {
+        .owner                  = THIS_MODULE,
+        .name                   = "public_key",
+        .describe               = public_key_describe,
+        .destroy                = public_key_destroy,
+        .verify_signature       = public_key_verify_signature,
+};
+EXPORT_SYMBOL_GPL(public_key_subtype);
diff --git a/crypto/asymmetric_keys/public_key.h b/crypto/asymmetric_keys/public_key.h
new file mode 100644
index 000000000000..5e5e35626899
--- /dev/null
+++ b/crypto/asymmetric_keys/public_key.h
@@ -0,0 +1,30 @@
+/* Public key algorithm internals
+ *
+ * See Documentation/crypto/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <crypto/public_key.h>
+
+extern struct asymmetric_key_subtype public_key_subtype;
+
+/*
+ * Public key algorithm definition.
+ */
+struct public_key_algorithm {
+        const char      *name;
+        u8              n_pub_mpi;      /* Number of MPIs in public key */
+        u8              n_sec_mpi;      /* Number of MPIs in secret key */
+        u8              n_sig_mpi;      /* Number of MPIs in a signature */
+        int (*verify_signature)(const struct public_key *key,
+                                const struct public_key_signature *sig);
+};
+
+extern const struct public_key_algorithm RSA_public_key_algorithm;
diff --git a/crypto/asymmetric_keys/rsa.c b/crypto/asymmetric_keys/rsa.c
new file mode 100644
index 000000000000..4a6a0696f8a3
--- /dev/null
+++ b/crypto/asymmetric_keys/rsa.c
@@ -0,0 +1,277 @@
+/* RSA asymmetric public-key algorithm [RFC3447]
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) "RSA: "fmt
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include "public_key.h"
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("RSA Public Key Algorithm");
+
+#define kenter(FMT, ...) \
+        pr_devel("==> %s("FMT")\n", __func__, ##__VA_ARGS__)
+#define kleave(FMT, ...) \
+        pr_devel("<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
+
+/*
+ * Hash algorithm OIDs plus ASN.1 DER wrappings [RFC4880 sec 5.2.2].
+ */
+static const u8 RSA_digest_info_MD5[] = {
+        0x30, 0x20, 0x30, 0x0C, 0x06, 0x08,
+        0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05, /* OID */
+        0x05, 0x00, 0x04, 0x10
+};
+
+static const u8 RSA_digest_info_SHA1[] = {
+        0x30, 0x21, 0x30, 0x09, 0x06, 0x05,
+        0x2B, 0x0E, 0x03, 0x02, 0x1A,
+        0x05, 0x00, 0x04, 0x14
+};
+
+static const u8 RSA_digest_info_RIPE_MD_160[] = {
+        0x30, 0x21, 0x30, 0x09, 0x06, 0x05,
+        0x2B, 0x24, 0x03, 0x02, 0x01,
+        0x05, 0x00, 0x04, 0x14
+};
+
+static const u8 RSA_digest_info_SHA224[] = {
+        0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09,
+        0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04,
+        0x05, 0x00, 0x04, 0x1C
+};
+
+static const u8 RSA_digest_info_SHA256[] = {
+        0x30, 0x31, 0x30, 0x0d, 0x06, 0x09,
+        0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01,
+        0x05, 0x00, 0x04, 0x20
+};
+
+static const u8 RSA_digest_info_SHA384[] = {
+        0x30, 0x41, 0x30, 0x0d, 0x06, 0x09,
+        0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02,
+        0x05, 0x00, 0x04, 0x30
+};
+
+static const u8 RSA_digest_info_SHA512[] = {
+        0x30, 0x51, 0x30, 0x0d, 0x06, 0x09,
+        0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03,
+        0x05, 0x00, 0x04, 0x40
+};
+
+static const struct {
+        const u8 *data;
+        size_t size;
+} RSA_ASN1_templates[PKEY_HASH__LAST] = {
+#define _(X) { RSA_digest_info_##X, sizeof(RSA_digest_info_##X) }
+        [PKEY_HASH_MD5]         = _(MD5),
+        [PKEY_HASH_SHA1]        = _(SHA1),
+        [PKEY_HASH_RIPE_MD_160] = _(RIPE_MD_160),
+        [PKEY_HASH_SHA256]      = _(SHA256),
+        [PKEY_HASH_SHA384]      = _(SHA384),
+        [PKEY_HASH_SHA512]      = _(SHA512),
+        [PKEY_HASH_SHA224]      = _(SHA224),
+#undef _
+};
+
+/*
+ * RSAVP1() function [RFC3447 sec 5.2.2]
+ */
+static int RSAVP1(const struct public_key *key, MPI s, MPI *_m)
+{
+        MPI m;
+        int ret;
+
+        /* (1) Validate 0 <= s < n */
+        if (mpi_cmp_ui(s, 0) < 0) {
+                kleave(" = -EBADMSG [s < 0]");
+                return -EBADMSG;
+        }
+        if (mpi_cmp(s, key->rsa.n) >= 0) {
+                kleave(" = -EBADMSG [s >= n]");
+                return -EBADMSG;
+        }
+
+        m = mpi_alloc(0);
+        if (!m)
+                return -ENOMEM;
+
+        /* (2) m = s^e mod n */
+        ret = mpi_powm(m, s, key->rsa.e, key->rsa.n);
+        if (ret < 0) {
+                mpi_free(m);
+                return ret;
+        }
+
+        *_m = m;
+        return 0;
+}
+
+/*
+ * Integer to Octet String conversion [RFC3447 sec 4.1]
+ */
+static int RSA_I2OSP(MPI x, size_t xLen, u8 **_X)
+{
+        unsigned X_size, x_size;
+        int X_sign;
+        u8 *X;
+
+        /* Make sure the string is the right length.  The number should begin
+         * with { 0x00, 0x01, ... } so we have to account for 15 leading zero
+         * bits not being reported by MPI.
+         */
+        x_size = mpi_get_nbits(x);
+        pr_devel("size(x)=%u xLen*8=%zu\n", x_size, xLen * 8);
+        if (x_size != xLen * 8 - 15)
+                return -ERANGE;
+
+        X = mpi_get_buffer(x, &X_size, &X_sign);
+        if (!X)
+                return -ENOMEM;
+        if (X_sign < 0) {
+                kfree(X);
+                return -EBADMSG;
+        }
+        if (X_size != xLen - 1) {
+                kfree(X);
+                return -EBADMSG;
+        }
+
+        *_X = X;
+        return 0;
+}
+
+/*
+ * Perform the RSA signature verification.
+ * @H: Value of hash of data and metadata
+ * @EM: The computed signature value
+ * @k: The size of EM (EM[0] is an invalid location but should hold 0x00)
+ * @hash_size: The size of H
+ * @asn1_template: The DigestInfo ASN.1 template
+ * @asn1_size: Size of asm1_template[]
+ */
+static int RSA_verify(const u8 *H, const u8 *EM, size_t k, size_t hash_size,
+                      const u8 *asn1_template, size_t asn1_size)
+{
+        unsigned PS_end, T_offset, i;
+
+        kenter(",,%zu,%zu,%zu", k, hash_size, asn1_size);
+
+        if (k < 2 + 1 + asn1_size + hash_size)
+                return -EBADMSG;
+
+        /* Decode the EMSA-PKCS1-v1_5 */
+        if (EM[1] != 0x01) {
+                kleave(" = -EBADMSG [EM[1] == %02u]", EM[1]);
+                return -EBADMSG;
+        }
+
+        T_offset = k - (asn1_size + hash_size);
+        PS_end = T_offset - 1;
+        if (EM[PS_end] != 0x00) {
+                kleave(" = -EBADMSG [EM[T-1] == %02u]", EM[PS_end]);
+                return -EBADMSG;
+        }
+
+        for (i = 2; i < PS_end; i++) {
+                if (EM[i] != 0xff) {
+                        kleave(" = -EBADMSG [EM[PS%x] == %02u]", i - 2, EM[i]);
+                        return -EBADMSG;
+                }
+        }
+
+        if (memcmp(asn1_template, EM + T_offset, asn1_size) != 0) {
+                kleave(" = -EBADMSG [EM[T] ASN.1 mismatch]");
+                return -EBADMSG;
+        }
+
+        if (memcmp(H, EM + T_offset + asn1_size, hash_size) != 0) {
+                kleave(" = -EKEYREJECTED [EM[T] hash mismatch]");
+                return -EKEYREJECTED;
+        }
+
+        kleave(" = 0");
+        return 0;
+}
+
+/*
+ * Perform the verification step [RFC3447 sec 8.2.2].
+ */
+static int RSA_verify_signature(const struct public_key *key,
+                                const struct public_key_signature *sig)
+{
+        size_t tsize;
+        int ret;
+
+        /* Variables as per RFC3447 sec 8.2.2 */
+        const u8 *H = sig->digest;
+        u8 *EM = NULL;
+        MPI m = NULL;
+        size_t k;
+
+        kenter("");
+
+        if (!RSA_ASN1_templates[sig->pkey_hash_algo].data)
+                return -ENOTSUPP;
+
+        /* (1) Check the signature size against the public key modulus size */
+        k = mpi_get_nbits(key->rsa.n);
+        tsize = mpi_get_nbits(sig->rsa.s);
+
+        /* According to RFC 4880 sec 3.2, length of MPI is computed starting
+         * from most significant bit.  So the RFC 3447 sec 8.2.2 size check
+         * must be relaxed to conform with shorter signatures - so we fail here
+         * only if signature length is longer than modulus size.
+         */
+        pr_devel("step 1: k=%zu size(S)=%zu\n", k, tsize);
+        if (k < tsize) {
+                ret = -EBADMSG;
+                goto error;
+        }
+
+        /* Round up and convert to octets */
+        k = (k + 7) / 8;
+
+        /* (2b) Apply the RSAVP1 verification primitive to the public key */
+        ret = RSAVP1(key, sig->rsa.s, &m);
+        if (ret < 0)
+                goto error;
+
+        /* (2c) Convert the message representative (m) to an encoded message
+         *      (EM) of length k octets.
+         *
+         *      NOTE!  The leading zero byte is suppressed by MPI, so we pass a
+         *      pointer to the _preceding_ byte to RSA_verify()!
+         */
+        ret = RSA_I2OSP(m, k, &EM);
+        if (ret < 0)
+                goto error;
+
+        ret = RSA_verify(H, EM - 1, k, sig->digest_size,
+                         RSA_ASN1_templates[sig->pkey_hash_algo].data,
+                         RSA_ASN1_templates[sig->pkey_hash_algo].size);
+
+error:
+        kfree(EM);
+        mpi_free(m);
+        kleave(" = %d", ret);
+        return ret;
+}
+
+const struct public_key_algorithm RSA_public_key_algorithm = {
+        .name           = "RSA",
+        .n_pub_mpi      = 2,
+        .n_sec_mpi      = 3,
+        .n_sig_mpi      = 1,
+        .verify_signature = RSA_verify_signature,
+};
+EXPORT_SYMBOL_GPL(RSA_public_key_algorithm);
diff --git a/crypto/asymmetric_keys/signature.c b/crypto/asymmetric_keys/signature.c
new file mode 100644
index 000000000000..50b3f880b4ff
--- /dev/null
+++ b/crypto/asymmetric_keys/signature.c
@@ -0,0 +1,49 @@
+/* Signature verification with an asymmetric key
+ *
+ * See Documentation/security/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <keys/asymmetric-subtype.h>
+#include <linux/module.h>
+#include <linux/err.h>
+#include <crypto/public_key.h>
+#include "asymmetric_keys.h"
+
+/**
+ * verify_signature - Initiate the use of an asymmetric key to verify a signature
+ * @key: The asymmetric key to verify against
+ * @sig: The signature to check
+ *
+ * Returns 0 if successful or else an error.
+ */
+int verify_signature(const struct key *key,
+                     const struct public_key_signature *sig)
+{
+        const struct asymmetric_key_subtype *subtype;
+        int ret;
+
+        pr_devel("==>%s()\n", __func__);
+
+        if (key->type != &key_type_asymmetric)
+                return -EINVAL;
+        subtype = asymmetric_key_subtype(key);
+        if (!subtype ||
+            !key->payload.data)
+                return -EINVAL;
+        if (!subtype->verify_signature)
+                return -ENOTSUPP;
+
+        ret = subtype->verify_signature(key, sig);
+
+        pr_devel("<==%s() = %d\n", __func__, ret);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(verify_signature);
diff --git a/crypto/asymmetric_keys/x509.asn1 b/crypto/asymmetric_keys/x509.asn1
new file mode 100644
index 000000000000..bf32b3dff088
--- /dev/null
+++ b/crypto/asymmetric_keys/x509.asn1
@@ -0,0 +1,60 @@
+Certificate ::= SEQUENCE {
+        tbsCertificate          TBSCertificate ({ x509_note_tbs_certificate }),
+        signatureAlgorithm      AlgorithmIdentifier,
+        signature               BIT STRING ({ x509_note_signature })
+        }
+
+TBSCertificate ::= SEQUENCE {
+        version           [ 0 ] Version DEFAULT,
+        serialNumber            CertificateSerialNumber,
+        signature               AlgorithmIdentifier ({ x509_note_pkey_algo }),
+        issuer                  Name ({ x509_note_issuer }),
+        validity                Validity,
+        subject                 Name ({ x509_note_subject }),
+        subjectPublicKeyInfo    SubjectPublicKeyInfo,
+        issuerUniqueID    [ 1 ] IMPLICIT UniqueIdentifier OPTIONAL,
+        subjectUniqueID   [ 2 ] IMPLICIT UniqueIdentifier OPTIONAL,
+        extensions        [ 3 ] Extensions OPTIONAL
+        }
+
+Version ::= INTEGER
+CertificateSerialNumber ::= INTEGER
+
+AlgorithmIdentifier ::= SEQUENCE {
+        algorithm               OBJECT IDENTIFIER ({ x509_note_OID }),
+        parameters              ANY OPTIONAL
+}
+
+Name ::= SEQUENCE OF RelativeDistinguishedName
+
+RelativeDistinguishedName ::= SET OF AttributeValueAssertion
+
+AttributeValueAssertion ::= SEQUENCE {
+        attributeType           OBJECT IDENTIFIER ({ x509_note_OID }),
+        attributeValue          ANY ({ x509_extract_name_segment })
+        }
+
+Validity ::= SEQUENCE {
+        notBefore               Time ({ x509_note_not_before }),
+        notAfter                Time ({ x509_note_not_after })
+        }
+
+Time ::= CHOICE {
+        utcTime                 UTCTime,
+        generalTime             GeneralizedTime
+        }
+
+SubjectPublicKeyInfo ::= SEQUENCE {
+        algorithm               AlgorithmIdentifier,
+        subjectPublicKey        BIT STRING ({ x509_extract_key_data })
+        }
+
+UniqueIdentifier ::= BIT STRING
+
+Extensions ::= SEQUENCE OF Extension
+
+Extension ::= SEQUENCE {
+        extnid                  OBJECT IDENTIFIER ({ x509_note_OID }),
+        critical                BOOLEAN DEFAULT,
+        extnValue               OCTET STRING ({ x509_process_extension })
+        }
diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
new file mode 100644
index 000000000000..7fabc4c01993
--- /dev/null
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@ -0,0 +1,496 @@
+/* X.509 certificate parser
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) "X.509: "fmt
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/oid_registry.h>
+#include "public_key.h"
+#include "x509_parser.h"
+#include "x509-asn1.h"
+#include "x509_rsakey-asn1.h"
+
+struct x509_parse_context {
+        struct x509_certificate *cert;          /* Certificate being constructed */
+        unsigned long   data;                   /* Start of data */
+        const void      *cert_start;            /* Start of cert content */
+        const void      *key;                   /* Key data */
+        size_t          key_size;               /* Size of key data */
+        enum OID        last_oid;               /* Last OID encountered */
+        enum OID        algo_oid;               /* Algorithm OID */
+        unsigned char   nr_mpi;                 /* Number of MPIs stored */
+        u8              o_size;                 /* Size of organizationName (O) */
+        u8              cn_size;                /* Size of commonName (CN) */
+        u8              email_size;             /* Size of emailAddress */
+        u16             o_offset;               /* Offset of organizationName (O) */
+        u16             cn_offset;              /* Offset of commonName (CN) */
+        u16             email_offset;           /* Offset of emailAddress */
+};
+
+/*
+ * Free an X.509 certificate
+ */
+void x509_free_certificate(struct x509_certificate *cert)
+{
+        if (cert) {
+                public_key_destroy(cert->pub);
+                kfree(cert->issuer);
+                kfree(cert->subject);
+                kfree(cert->fingerprint);
+                kfree(cert->authority);
+                kfree(cert);
+        }
+}
+
+/*
+ * Parse an X.509 certificate
+ */
+struct x509_certificate *x509_cert_parse(const void *data, size_t datalen)
+{
+        struct x509_certificate *cert;
+        struct x509_parse_context *ctx;
+        long ret;
+
+        ret = -ENOMEM;
+        cert = kzalloc(sizeof(struct x509_certificate), GFP_KERNEL);
+        if (!cert)
+                goto error_no_cert;
+        cert->pub = kzalloc(sizeof(struct public_key), GFP_KERNEL);
+        if (!cert->pub)
+                goto error_no_ctx;
+        ctx = kzalloc(sizeof(struct x509_parse_context), GFP_KERNEL);
+        if (!ctx)
+                goto error_no_ctx;
+
+        ctx->cert = cert;
+        ctx->data = (unsigned long)data;
+
+        /* Attempt to decode the certificate */
+        ret = asn1_ber_decoder(&x509_decoder, ctx, data, datalen);
+        if (ret < 0)
+                goto error_decode;
+
+        /* Decode the public key */
+        ret = asn1_ber_decoder(&x509_rsakey_decoder, ctx,
+                               ctx->key, ctx->key_size);
+        if (ret < 0)
+                goto error_decode;
+
+        kfree(ctx);
+        return cert;
+
+error_decode:
+        kfree(ctx);
+error_no_ctx:
+        x509_free_certificate(cert);
+error_no_cert:
+        return ERR_PTR(ret);
+}
+
+/*
+ * Note an OID when we find one for later processing when we know how
+ * to interpret it.
+ */
+int x509_note_OID(void *context, size_t hdrlen,
+             unsigned char tag,
+             const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+
+        ctx->last_oid = look_up_OID(value, vlen);
+        if (ctx->last_oid == OID__NR) {
+                char buffer[50];
+                sprint_oid(value, vlen, buffer, sizeof(buffer));
+                pr_debug("Unknown OID: [%lu] %s\n",
+                         (unsigned long)value - ctx->data, buffer);
+        }
+        return 0;
+}
+
+/*
+ * Save the position of the TBS data so that we can check the signature over it
+ * later.
+ */
+int x509_note_tbs_certificate(void *context, size_t hdrlen,
+                              unsigned char tag,
+                              const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+
+        pr_debug("x509_note_tbs_certificate(,%zu,%02x,%ld,%zu)!\n",
+                 hdrlen, tag, (unsigned long)value - ctx->data, vlen);
+
+        ctx->cert->tbs = value - hdrlen;
+        ctx->cert->tbs_size = vlen + hdrlen;
+        return 0;
+}
+
+/*
+ * Record the public key algorithm
+ */
+int x509_note_pkey_algo(void *context, size_t hdrlen,
+                        unsigned char tag,
+                        const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+
+        pr_debug("PubKey Algo: %u\n", ctx->last_oid);
+
+        switch (ctx->last_oid) {
+        case OID_md2WithRSAEncryption:
+        case OID_md3WithRSAEncryption:
+        default:
+                return -ENOPKG; /* Unsupported combination */
+
+        case OID_md4WithRSAEncryption:
+                ctx->cert->sig_hash_algo = PKEY_HASH_MD5;
+                ctx->cert->sig_pkey_algo = PKEY_ALGO_RSA;
+                break;
+
+        case OID_sha1WithRSAEncryption:
+                ctx->cert->sig_hash_algo = PKEY_HASH_SHA1;
+                ctx->cert->sig_pkey_algo = PKEY_ALGO_RSA;
+                break;
+
+        case OID_sha256WithRSAEncryption:
+                ctx->cert->sig_hash_algo = PKEY_HASH_SHA256;
+                ctx->cert->sig_pkey_algo = PKEY_ALGO_RSA;
+                break;
+
+        case OID_sha384WithRSAEncryption:
+                ctx->cert->sig_hash_algo = PKEY_HASH_SHA384;
+                ctx->cert->sig_pkey_algo = PKEY_ALGO_RSA;
+                break;
+
+        case OID_sha512WithRSAEncryption:
+                ctx->cert->sig_hash_algo = PKEY_HASH_SHA512;
+                ctx->cert->sig_pkey_algo = PKEY_ALGO_RSA;
+                break;
+
+        case OID_sha224WithRSAEncryption:
+                ctx->cert->sig_hash_algo = PKEY_HASH_SHA224;
+                ctx->cert->sig_pkey_algo = PKEY_ALGO_RSA;
+                break;
+        }
+
+        ctx->algo_oid = ctx->last_oid;
+        return 0;
+}
+
+/*
+ * Note the whereabouts and type of the signature.
+ */
+int x509_note_signature(void *context, size_t hdrlen,
+                        unsigned char tag,
+                        const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+
+        pr_debug("Signature type: %u size %zu\n", ctx->last_oid, vlen);
+
+        if (ctx->last_oid != ctx->algo_oid) {
+                pr_warn("Got cert with pkey (%u) and sig (%u) algorithm OIDs\n",
+                        ctx->algo_oid, ctx->last_oid);
+                return -EINVAL;
+        }
+
+        ctx->cert->sig = value;
+        ctx->cert->sig_size = vlen;
+        return 0;
+}
+
+/*
+ * Note some of the name segments from which we'll fabricate a name.
+ */
+int x509_extract_name_segment(void *context, size_t hdrlen,
+                              unsigned char tag,
+                              const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+
+        switch (ctx->last_oid) {
+        case OID_commonName:
+                ctx->cn_size = vlen;
+                ctx->cn_offset = (unsigned long)value - ctx->data;
+                break;
+        case OID_organizationName:
+                ctx->o_size = vlen;
+                ctx->o_offset = (unsigned long)value - ctx->data;
+                break;
+        case OID_email_address:
+                ctx->email_size = vlen;
+                ctx->email_offset = (unsigned long)value - ctx->data;
+                break;
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+/*
+ * Fabricate and save the issuer and subject names
+ */
+static int x509_fabricate_name(struct x509_parse_context *ctx, size_t hdrlen,
+                               unsigned char tag,
+                               char **_name, size_t vlen)
+{
+        const void *name, *data = (const void *)ctx->data;
+        size_t namesize;
+        char *buffer;
+
+        if (*_name)
+                return -EINVAL;
+
+        /* Empty name string if no material */
+        if (!ctx->cn_size && !ctx->o_size && !ctx->email_size) {
+                buffer = kmalloc(1, GFP_KERNEL);
+                if (!buffer)
+                        return -ENOMEM;
+                buffer[0] = 0;
+                goto done;
+        }
+
+        if (ctx->cn_size && ctx->o_size) {
+                /* Consider combining O and CN, but use only the CN if it is
+                 * prefixed by the O, or a significant portion thereof.
+                 */
+                namesize = ctx->cn_size;
+                name = data + ctx->cn_offset;
+                if (ctx->cn_size >= ctx->o_size &&
+                    memcmp(data + ctx->cn_offset, data + ctx->o_offset,
+                           ctx->o_size) == 0)
+                        goto single_component;
+                if (ctx->cn_size >= 7 &&
+                    ctx->o_size >= 7 &&
+                    memcmp(data + ctx->cn_offset, data + ctx->o_offset, 7) == 0)
+                        goto single_component;
+
+                buffer = kmalloc(ctx->o_size + 2 + ctx->cn_size + 1,
+                                 GFP_KERNEL);
+                if (!buffer)
+                        return -ENOMEM;
+
+                memcpy(buffer,
+                       data + ctx->o_offset, ctx->o_size);
+                buffer[ctx->o_size + 0] = ':';
+                buffer[ctx->o_size + 1] = ' ';
+                memcpy(buffer + ctx->o_size + 2,
+                       data + ctx->cn_offset, ctx->cn_size);
+                buffer[ctx->o_size + 2 + ctx->cn_size] = 0;
+                goto done;
+
+        } else if (ctx->cn_size) {
+                namesize = ctx->cn_size;
+                name = data + ctx->cn_offset;
+        } else if (ctx->o_size) {
+                namesize = ctx->o_size;
+                name = data + ctx->o_offset;
+        } else {
+                namesize = ctx->email_size;
+                name = data + ctx->email_offset;
+        }
+
+single_component:
+        buffer = kmalloc(namesize + 1, GFP_KERNEL);
+        if (!buffer)
+                return -ENOMEM;
+        memcpy(buffer, name, namesize);
+        buffer[namesize] = 0;
+
+done:
+        *_name = buffer;
+        ctx->cn_size = 0;
+        ctx->o_size = 0;
+        ctx->email_size = 0;
+        return 0;
+}
+
+int x509_note_issuer(void *context, size_t hdrlen,
+                     unsigned char tag,
+                     const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+        return x509_fabricate_name(ctx, hdrlen, tag, &ctx->cert->issuer, vlen);
+}
+
+int x509_note_subject(void *context, size_t hdrlen,
+                      unsigned char tag,
+                      const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+        return x509_fabricate_name(ctx, hdrlen, tag, &ctx->cert->subject, vlen);
+}
+
+/*
+ * Extract the data for the public key algorithm
+ */
+int x509_extract_key_data(void *context, size_t hdrlen,
+                          unsigned char tag,
+                          const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+
+        if (ctx->last_oid != OID_rsaEncryption)
+                return -ENOPKG;
+
+        /* There seems to be an extraneous 0 byte on the front of the data */
+        ctx->cert->pkey_algo = PKEY_ALGO_RSA;
+        ctx->key = value + 1;
+        ctx->key_size = vlen - 1;
+        return 0;
+}
+
+/*
+ * Extract a RSA public key value
+ */
+int rsa_extract_mpi(void *context, size_t hdrlen,
+                    unsigned char tag,
+                    const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+        MPI mpi;
+
+        if (ctx->nr_mpi >= ARRAY_SIZE(ctx->cert->pub->mpi)) {
+                pr_err("Too many public key MPIs in certificate\n");
+                return -EBADMSG;
+        }
+
+        mpi = mpi_read_raw_data(value, vlen);
+        if (!mpi)
+                return -ENOMEM;
+
+        ctx->cert->pub->mpi[ctx->nr_mpi++] = mpi;
+        return 0;
+}
+
+/*
+ * Process certificate extensions that are used to qualify the certificate.
+ */
+int x509_process_extension(void *context, size_t hdrlen,
+                           unsigned char tag,
+                           const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+        const unsigned char *v = value;
+        char *f;
+        int i;
+
+        pr_debug("Extension: %u\n", ctx->last_oid);
+
+        if (ctx->last_oid == OID_subjectKeyIdentifier) {
+                /* Get hold of the key fingerprint */
+                if (vlen < 3)
+                        return -EBADMSG;
+                if (v[0] != ASN1_OTS || v[1] != vlen - 2)
+                        return -EBADMSG;
+                v += 2;
+                vlen -= 2;
+
+                f = kmalloc(vlen * 2 + 1, GFP_KERNEL);
+                if (!f)
+                        return -ENOMEM;
+                for (i = 0; i < vlen; i++)
+                        sprintf(f + i * 2, "%02x", v[i]);
+                pr_debug("fingerprint %s\n", f);
+                ctx->cert->fingerprint = f;
+                return 0;
+        }
+
+        if (ctx->last_oid == OID_authorityKeyIdentifier) {
+                /* Get hold of the CA key fingerprint */
+                if (vlen < 5)
+                        return -EBADMSG;
+                if (v[0] != (ASN1_SEQ | (ASN1_CONS << 5)) ||
+                    v[1] != vlen - 2 ||
+                    v[2] != (ASN1_CONT << 6) ||
+                    v[3] != vlen - 4)
+                        return -EBADMSG;
+                v += 4;
+                vlen -= 4;
+
+                f = kmalloc(vlen * 2 + 1, GFP_KERNEL);
+                if (!f)
+                        return -ENOMEM;
+                for (i = 0; i < vlen; i++)
+                        sprintf(f + i * 2, "%02x", v[i]);
+                pr_debug("authority   %s\n", f);
+                ctx->cert->authority = f;
+                return 0;
+        }
+
+        return 0;
+}
+
+/*
+ * Record a certificate time.
+ */
+static int x509_note_time(struct tm *tm,  size_t hdrlen,
+                          unsigned char tag,
+                          const unsigned char *value, size_t vlen)
+{
+        const unsigned char *p = value;
+
+#define dec2bin(X) ((X) - '0')
+#define DD2bin(P) ({ unsigned x = dec2bin(P[0]) * 10 + dec2bin(P[1]); P += 2; x; })
+
+        if (tag == ASN1_UNITIM) {
+                /* UTCTime: YYMMDDHHMMSSZ */
+                if (vlen != 13)
+                        goto unsupported_time;
+                tm->tm_year = DD2bin(p);
+                if (tm->tm_year >= 50)
+                        tm->tm_year += 1900;
+                else
+                        tm->tm_year += 2000;
+        } else if (tag == ASN1_GENTIM) {
+                /* GenTime: YYYYMMDDHHMMSSZ */
+                if (vlen != 15)
+                        goto unsupported_time;
+                tm->tm_year = DD2bin(p) * 100 + DD2bin(p);
+        } else {
+                goto unsupported_time;
+        }
+
+        tm->tm_year -= 1900;
+        tm->tm_mon  = DD2bin(p) - 1;
+        tm->tm_mday = DD2bin(p);
+        tm->tm_hour = DD2bin(p);
+        tm->tm_min  = DD2bin(p);
+        tm->tm_sec  = DD2bin(p);
+
+        if (*p != 'Z')
+                goto unsupported_time;
+
+        return 0;
+
+unsupported_time:
+        pr_debug("Got unsupported time [tag %02x]: '%*.*s'\n",
+                 tag, (int)vlen, (int)vlen, value);
+        return -EBADMSG;
+}
+
+int x509_note_not_before(void *context, size_t hdrlen,
+                         unsigned char tag,
+                         const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+        return x509_note_time(&ctx->cert->valid_from, hdrlen, tag, value, vlen);
+}
+
+int x509_note_not_after(void *context, size_t hdrlen,
+                        unsigned char tag,
+                        const void *value, size_t vlen)
+{
+        struct x509_parse_context *ctx = context;
+        return x509_note_time(&ctx->cert->valid_to, hdrlen, tag, value, vlen);
+}
diff --git a/crypto/asymmetric_keys/x509_parser.h b/crypto/asymmetric_keys/x509_parser.h
new file mode 100644
index 000000000000..f86dc5fcc4ad
--- /dev/null
+++ b/crypto/asymmetric_keys/x509_parser.h
@@ -0,0 +1,36 @@
+/* X.509 certificate parser internal definitions
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <crypto/public_key.h>
+
+struct x509_certificate {
+        struct x509_certificate *next;
+        struct public_key *pub;                 /* Public key details */
+        char            *issuer;                /* Name of certificate issuer */
+        char            *subject;               /* Name of certificate subject */
+        char            *fingerprint;           /* Key fingerprint as hex */
+        char            *authority;             /* Authority key fingerprint as hex */
+        struct tm       valid_from;
+        struct tm       valid_to;
+        enum pkey_algo  pkey_algo : 8;          /* Public key algorithm */
+        enum pkey_algo  sig_pkey_algo : 8;      /* Signature public key algorithm */
+        enum pkey_hash_algo sig_hash_algo : 8;  /* Signature hash algorithm */
+        const void      *tbs;                   /* Signed data */
+        size_t          tbs_size;               /* Size of signed data */
+        const void      *sig;                   /* Signature data */
+        size_t          sig_size;               /* Size of sigature */
+};
+
+/*
+ * x509_cert_parser.c
+ */
+extern void x509_free_certificate(struct x509_certificate *cert);
+extern struct x509_certificate *x509_cert_parse(const void *data, size_t datalen);
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c
new file mode 100644
index 000000000000..06007f0e880c
--- /dev/null
+++ b/crypto/asymmetric_keys/x509_public_key.c
@@ -0,0 +1,239 @@
+/* Instantiate a public key crypto key from an X.509 Certificate
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) "X.509: "fmt
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/mpi.h>
+#include <linux/asn1_decoder.h>
+#include <keys/asymmetric-subtype.h>
+#include <keys/asymmetric-parser.h>
+#include <crypto/hash.h>
+#include "asymmetric_keys.h"
+#include "public_key.h"
+#include "x509_parser.h"
+
+static const
+struct public_key_algorithm *x509_public_key_algorithms[PKEY_ALGO__LAST] = {
+        [PKEY_ALGO_DSA]         = NULL,
+#if defined(CONFIG_PUBLIC_KEY_ALGO_RSA) || \
+        defined(CONFIG_PUBLIC_KEY_ALGO_RSA_MODULE)
+        [PKEY_ALGO_RSA]         = &RSA_public_key_algorithm,
+#endif
+};
+
+/*
+ * Check the signature on a certificate using the provided public key
+ */
+static int x509_check_signature(const struct public_key *pub,
+                                const struct x509_certificate *cert)
+{
+        struct public_key_signature *sig;
+        struct crypto_shash *tfm;
+        struct shash_desc *desc;
+        size_t digest_size, desc_size;
+        int ret;
+
+        pr_devel("==>%s()\n", __func__);
+        
+        /* Allocate the hashing algorithm we're going to need and find out how
+         * big the hash operational data will be.
+         */
+        tfm = crypto_alloc_shash(pkey_hash_algo[cert->sig_hash_algo], 0, 0);
+        if (IS_ERR(tfm))
+                return (PTR_ERR(tfm) == -ENOENT) ? -ENOPKG : PTR_ERR(tfm);
+
+        desc_size = crypto_shash_descsize(tfm) + sizeof(*desc);
+        digest_size = crypto_shash_digestsize(tfm);
+
+        /* We allocate the hash operational data storage on the end of our
+         * context data.
+         */
+        ret = -ENOMEM;
+        sig = kzalloc(sizeof(*sig) + desc_size + digest_size, GFP_KERNEL);
+        if (!sig)
+                goto error_no_sig;
+
+        sig->pkey_hash_algo     = cert->sig_hash_algo;
+        sig->digest             = (u8 *)sig + sizeof(*sig) + desc_size;
+        sig->digest_size        = digest_size;
+
+        desc = (void *)sig + sizeof(*sig);
+        desc->tfm       = tfm;
+        desc->flags     = CRYPTO_TFM_REQ_MAY_SLEEP;
+
+        ret = crypto_shash_init(desc);
+        if (ret < 0)
+                goto error;
+
+        ret = -ENOMEM;
+        sig->rsa.s = mpi_read_raw_data(cert->sig, cert->sig_size);
+        if (!sig->rsa.s)
+                goto error;
+
+        ret = crypto_shash_finup(desc, cert->tbs, cert->tbs_size, sig->digest);
+        if (ret < 0)
+                goto error_mpi;
+
+        ret = pub->algo->verify_signature(pub, sig);
+
+        pr_debug("Cert Verification: %d\n", ret);
+
+error_mpi:
+        mpi_free(sig->rsa.s);
+error:
+        kfree(sig);
+error_no_sig:
+        crypto_free_shash(tfm);
+
+        pr_devel("<==%s() = %d\n", __func__, ret);
+        return ret;
+}
+
+/*
+ * Attempt to parse a data blob for a key as an X509 certificate.
+ */
+static int x509_key_preparse(struct key_preparsed_payload *prep)
+{
+        struct x509_certificate *cert;
+        struct tm now;
+        size_t srlen, sulen;
+        char *desc = NULL;
+        int ret;
+
+        cert = x509_cert_parse(prep->data, prep->datalen);
+        if (IS_ERR(cert))
+                return PTR_ERR(cert);
+
+        pr_devel("Cert Issuer: %s\n", cert->issuer);
+        pr_devel("Cert Subject: %s\n", cert->subject);
+        pr_devel("Cert Key Algo: %s\n", pkey_algo[cert->pkey_algo]);
+        pr_devel("Cert Valid From: %04ld-%02d-%02d %02d:%02d:%02d\n",
+                 cert->valid_from.tm_year + 1900, cert->valid_from.tm_mon + 1,
+                 cert->valid_from.tm_mday, cert->valid_from.tm_hour,
+                 cert->valid_from.tm_min,  cert->valid_from.tm_sec);
+        pr_devel("Cert Valid To: %04ld-%02d-%02d %02d:%02d:%02d\n",
+                 cert->valid_to.tm_year + 1900, cert->valid_to.tm_mon + 1,
+                 cert->valid_to.tm_mday, cert->valid_to.tm_hour,
+                 cert->valid_to.tm_min,  cert->valid_to.tm_sec);
+        pr_devel("Cert Signature: %s + %s\n",
+                 pkey_algo[cert->sig_pkey_algo],
+                 pkey_hash_algo[cert->sig_hash_algo]);
+
+        if (!cert->fingerprint || !cert->authority) {
+                pr_warn("Cert for '%s' must have SubjKeyId and AuthKeyId extensions\n",
+                        cert->subject);
+                ret = -EKEYREJECTED;
+                goto error_free_cert;
+        }
+
+        time_to_tm(CURRENT_TIME.tv_sec, 0, &now);
+        pr_devel("Now: %04ld-%02d-%02d %02d:%02d:%02d\n",
+                 now.tm_year + 1900, now.tm_mon + 1, now.tm_mday,
+                 now.tm_hour, now.tm_min,  now.tm_sec);
+        if (now.tm_year < cert->valid_from.tm_year ||
+            (now.tm_year == cert->valid_from.tm_year &&
+             (now.tm_mon < cert->valid_from.tm_mon ||
+              (now.tm_mon == cert->valid_from.tm_mon &&
+               (now.tm_mday < cert->valid_from.tm_mday ||
+                (now.tm_mday == cert->valid_from.tm_mday &&
+                 (now.tm_hour < cert->valid_from.tm_hour ||
+                  (now.tm_hour == cert->valid_from.tm_hour &&
+                   (now.tm_min < cert->valid_from.tm_min ||
+                    (now.tm_min == cert->valid_from.tm_min &&
+                     (now.tm_sec < cert->valid_from.tm_sec
+                      ))))))))))) {
+                pr_warn("Cert %s is not yet valid\n", cert->fingerprint);
+                ret = -EKEYREJECTED;
+                goto error_free_cert;
+        }
+        if (now.tm_year > cert->valid_to.tm_year ||
+            (now.tm_year == cert->valid_to.tm_year &&
+             (now.tm_mon > cert->valid_to.tm_mon ||
+              (now.tm_mon == cert->valid_to.tm_mon &&
+               (now.tm_mday > cert->valid_to.tm_mday ||
+                (now.tm_mday == cert->valid_to.tm_mday &&
+                 (now.tm_hour > cert->valid_to.tm_hour ||
+                  (now.tm_hour == cert->valid_to.tm_hour &&
+                   (now.tm_min > cert->valid_to.tm_min ||
+                    (now.tm_min == cert->valid_to.tm_min &&
+                     (now.tm_sec > cert->valid_to.tm_sec
+                      ))))))))))) {
+                pr_warn("Cert %s has expired\n", cert->fingerprint);
+                ret = -EKEYEXPIRED;
+                goto error_free_cert;
+        }
+
+        cert->pub->algo = x509_public_key_algorithms[cert->pkey_algo];
+        cert->pub->id_type = PKEY_ID_X509;
+
+        /* Check the signature on the key */
+        if (strcmp(cert->fingerprint, cert->authority) == 0) {
+                ret = x509_check_signature(cert->pub, cert);
+                if (ret < 0)
+                        goto error_free_cert;
+        }
+
+        /* Propose a description */
+        sulen = strlen(cert->subject);
+        srlen = strlen(cert->fingerprint);
+        ret = -ENOMEM;
+        desc = kmalloc(sulen + 2 + srlen + 1, GFP_KERNEL);
+        if (!desc)
+                goto error_free_cert;
+        memcpy(desc, cert->subject, sulen);
+        desc[sulen] = ':';
+        desc[sulen + 1] = ' ';
+        memcpy(desc + sulen + 2, cert->fingerprint, srlen);
+        desc[sulen + 2 + srlen] = 0;
+
+        /* We're pinning the module by being linked against it */
+        __module_get(public_key_subtype.owner);
+        prep->type_data[0] = &public_key_subtype;
+        prep->type_data[1] = cert->fingerprint;
+        prep->payload = cert->pub;
+        prep->description = desc;
+        prep->quotalen = 100;
+
+        /* We've finished with the certificate */
+        cert->pub = NULL;
+        cert->fingerprint = NULL;
+        desc = NULL;
+        ret = 0;
+
+error_free_cert:
+        x509_free_certificate(cert);
+        return ret;
+}
+
+static struct asymmetric_key_parser x509_key_parser = {
+        .owner  = THIS_MODULE,
+        .name   = "x509",
+        .parse  = x509_key_preparse,
+};
+
+/*
+ * Module stuff
+ */
+static int __init x509_key_init(void)
+{
+        return register_asymmetric_key_parser(&x509_key_parser);
+}
+
+static void __exit x509_key_exit(void)
+{
+        unregister_asymmetric_key_parser(&x509_key_parser);
+}
+
+module_init(x509_key_init);
+module_exit(x509_key_exit);
diff --git a/crypto/asymmetric_keys/x509_rsakey.asn1 b/crypto/asymmetric_keys/x509_rsakey.asn1
new file mode 100644
index 000000000000..4ec7cc6532c1
--- /dev/null
+++ b/crypto/asymmetric_keys/x509_rsakey.asn1
@@ -0,0 +1,4 @@
+RSAPublicKey ::= SEQUENCE {
+        modulus                 INTEGER ({ rsa_extract_mpi }),  -- n
+        publicExponent          INTEGER ({ rsa_extract_mpi })   -- e
+        }
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index e622863b292f..086f381d6489 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -31,18 +31,18 @@
 
 /* create a new cifs key */
 static int
-cifs_spnego_key_instantiate(struct key *key, const void *data, size_t datalen)
+cifs_spnego_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
 {
         char *payload;
         int ret;
 
         ret = -ENOMEM;
-        payload = kmalloc(datalen, GFP_KERNEL);
+        payload = kmalloc(prep->datalen, GFP_KERNEL);
         if (!payload)
                 goto error;
 
         /* attach the data */
-        memcpy(payload, data, datalen);
+        memcpy(payload, prep->data, prep->datalen);
         key->payload.data = payload;
         ret = 0;
 
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 2ee5c54797fa..fc783e264420 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -167,17 +167,17 @@ static struct shrinker cifs_shrinker = {
 };
 
 static int
-cifs_idmap_key_instantiate(struct key *key, const void *data, size_t datalen)
+cifs_idmap_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
 {
         char *payload;
 
-        payload = kmalloc(datalen, GFP_KERNEL);
+        payload = kmalloc(prep->datalen, GFP_KERNEL);
         if (!payload)
                 return -ENOMEM;
 
-        memcpy(payload, data, datalen);
+        memcpy(payload, prep->data, prep->datalen);
         key->payload.data = payload;
-        key->datalen = datalen;
+        key->datalen = prep->datalen;
         return 0;
 }
 
diff --git a/include/asm-generic/bitops/count_zeros.h b/include/asm-generic/bitops/count_zeros.h
new file mode 100644
index 000000000000..97520d21fe62
--- /dev/null
+++ b/include/asm-generic/bitops/count_zeros.h
@@ -0,0 +1,57 @@
+/* Count leading and trailing zeros functions
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
+#define _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
+
+#include <asm/bitops.h>
+
+/**
+ * count_leading_zeros - Count the number of zeros from the MSB back
+ * @x: The value
+ *
+ * Count the number of leading zeros from the MSB going towards the LSB in @x.
+ *
+ * If the MSB of @x is set, the result is 0.
+ * If only the LSB of @x is set, then the result is BITS_PER_LONG-1.
+ * If @x is 0 then the result is COUNT_LEADING_ZEROS_0.
+ */
+static inline int count_leading_zeros(unsigned long x)
+{
+        if (sizeof(x) == 4)
+                return BITS_PER_LONG - fls(x);
+        else
+                return BITS_PER_LONG - fls64(x);
+}
+
+#define COUNT_LEADING_ZEROS_0 BITS_PER_LONG
+
+/**
+ * count_trailing_zeros - Count the number of zeros from the LSB forwards
+ * @x: The value
+ *
+ * Count the number of trailing zeros from the LSB going towards the MSB in @x.
+ *
+ * If the LSB of @x is set, the result is 0.
+ * If only the MSB of @x is set, then the result is BITS_PER_LONG-1.
+ * If @x is 0 then the result is COUNT_TRAILING_ZEROS_0.
+ */
+static inline int count_trailing_zeros(unsigned long x)
+{
+#define COUNT_TRAILING_ZEROS_0 (-1)
+
+        if (sizeof(x) == 4)
+                return ffs(x);
+        else
+                return (x != 0) ? __ffs(x) : COUNT_TRAILING_ZEROS_0;
+}
+
+#endif /* _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_ */
diff --git a/include/asm-generic/module.h b/include/asm-generic/module.h
index ed5b44de4c91..14dc41d185a7 100644
--- a/include/asm-generic/module.h
+++ b/include/asm-generic/module.h
@@ -5,18 +5,44 @@
  * Many architectures just need a simple module
  * loader without arch specific data.
  */
+#ifndef CONFIG_HAVE_MOD_ARCH_SPECIFIC
 struct mod_arch_specific
 {
 };
+#endif
 
 #ifdef CONFIG_64BIT
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Sym Elf64_Sym
-#define Elf_Ehdr Elf64_Ehdr
-#else
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
+#define Elf_Shdr        Elf64_Shdr
+#define Elf_Phdr        Elf64_Phdr
+#define Elf_Sym         Elf64_Sym
+#define Elf_Dyn         Elf64_Dyn
+#define Elf_Ehdr        Elf64_Ehdr
+#define Elf_Addr        Elf64_Addr
+#ifdef CONFIG_MODULES_USE_ELF_REL
+#define Elf_Rel         Elf64_Rel
+#endif
+#ifdef CONFIG_MODULES_USE_ELF_RELA
+#define Elf_Rela        Elf64_Rela
+#endif
+#define ELF_R_TYPE(X)   ELF64_R_TYPE(X)
+#define ELF_R_SYM(X)    ELF64_R_SYM(X)
+
+#else /* CONFIG_64BIT */
+
+#define Elf_Shdr        Elf32_Shdr
+#define Elf_Phdr        Elf32_Phdr
+#define Elf_Sym         Elf32_Sym
+#define Elf_Dyn         Elf32_Dyn
+#define Elf_Ehdr        Elf32_Ehdr
+#define Elf_Addr        Elf32_Addr
+#ifdef CONFIG_MODULES_USE_ELF_REL
+#define Elf_Rel         Elf32_Rel
+#endif
+#ifdef CONFIG_MODULES_USE_ELF_RELA
+#define Elf_Rela        Elf32_Rela
+#endif
+#define ELF_R_TYPE(X)   ELF32_R_TYPE(X)
+#define ELF_R_SYM(X)    ELF32_R_SYM(X)
 #endif
 
 #endif /* __ASM_GENERIC_MODULE_H */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 4e2e1cc505ab..d1ea7ce0b4cb 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -530,9 +530,18 @@
                 *(.scommon)                                             \
         }
 
+/*
+ * Allow archectures to redefine BSS_FIRST_SECTIONS to add extra
+ * sections to the front of bss.
+ */
+#ifndef BSS_FIRST_SECTIONS
+#define BSS_FIRST_SECTIONS
+#endif
+
 #define BSS(bss_align)                                                  \
         . = ALIGN(bss_align);                                           \
         .bss : AT(ADDR(.bss) - LOAD_OFFSET) {                           \
+                BSS_FIRST_SECTIONS                                      \
                 *(.bss..page_aligned)                                   \
                 *(.dynbss)                                              \
                 *(.bss)                                                 \
diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h
new file mode 100644
index 000000000000..f5b0224c9967
--- /dev/null
+++ b/include/crypto/public_key.h
@@ -0,0 +1,108 @@
+/* Asymmetric public-key algorithm definitions
+ *
+ * See Documentation/crypto/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_PUBLIC_KEY_H
+#define _LINUX_PUBLIC_KEY_H
+
+#include <linux/mpi.h>
+
+enum pkey_algo {
+        PKEY_ALGO_DSA,
+        PKEY_ALGO_RSA,
+        PKEY_ALGO__LAST
+};
+
+extern const char *const pkey_algo[PKEY_ALGO__LAST];
+
+enum pkey_hash_algo {
+        PKEY_HASH_MD4,
+        PKEY_HASH_MD5,
+        PKEY_HASH_SHA1,
+        PKEY_HASH_RIPE_MD_160,
+        PKEY_HASH_SHA256,
+        PKEY_HASH_SHA384,
+        PKEY_HASH_SHA512,
+        PKEY_HASH_SHA224,
+        PKEY_HASH__LAST
+};
+
+extern const char *const pkey_hash_algo[PKEY_HASH__LAST];
+
+enum pkey_id_type {
+        PKEY_ID_PGP,            /* OpenPGP generated key ID */
+        PKEY_ID_X509,           /* X.509 arbitrary subjectKeyIdentifier */
+        PKEY_ID_TYPE__LAST
+};
+
+extern const char *const pkey_id_type[PKEY_ID_TYPE__LAST];
+
+/*
+ * Cryptographic data for the public-key subtype of the asymmetric key type.
+ *
+ * Note that this may include private part of the key as well as the public
+ * part.
+ */
+struct public_key {
+        const struct public_key_algorithm *algo;
+        u8      capabilities;
+#define PKEY_CAN_ENCRYPT        0x01
+#define PKEY_CAN_DECRYPT        0x02
+#define PKEY_CAN_SIGN           0x04
+#define PKEY_CAN_VERIFY         0x08
+        enum pkey_id_type id_type : 8;
+        union {
+                MPI     mpi[5];
+                struct {
+                        MPI     p;      /* DSA prime */
+                        MPI     q;      /* DSA group order */
+                        MPI     g;      /* DSA group generator */
+                        MPI     y;      /* DSA public-key value = g^x mod p */
+                        MPI     x;      /* DSA secret exponent (if present) */
+                } dsa;
+                struct {
+                        MPI     n;      /* RSA public modulus */
+                        MPI     e;      /* RSA public encryption exponent */
+                        MPI     d;      /* RSA secret encryption exponent (if present) */
+                        MPI     p;      /* RSA secret prime (if present) */
+                        MPI     q;      /* RSA secret prime (if present) */
+                } rsa;
+        };
+};
+
+extern void public_key_destroy(void *payload);
+
+/*
+ * Public key cryptography signature data
+ */
+struct public_key_signature {
+        u8 *digest;
+        u8 digest_size;                 /* Number of bytes in digest */
+        u8 nr_mpi;                      /* Occupancy of mpi[] */
+        enum pkey_hash_algo pkey_hash_algo : 8;
+        union {
+                MPI mpi[2];
+                struct {
+                        MPI s;          /* m^d mod n */
+                } rsa;
+                struct {
+                        MPI r;
+                        MPI s;
+                } dsa;
+        };
+};
+
+struct key;
+extern int verify_signature(const struct key *key,
+                            const struct public_key_signature *sig);
+
+#endif /* _LINUX_PUBLIC_KEY_H */
diff --git a/include/keys/asymmetric-parser.h b/include/keys/asymmetric-parser.h
new file mode 100644
index 000000000000..09b3b4807f5c
--- /dev/null
+++ b/include/keys/asymmetric-parser.h
@@ -0,0 +1,37 @@
+/* Asymmetric public-key cryptography data parser
+ *
+ * See Documentation/crypto/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _KEYS_ASYMMETRIC_PARSER_H
+#define _KEYS_ASYMMETRIC_PARSER_H
+
+/*
+ * Key data parser.  Called during key instantiation.
+ */
+struct asymmetric_key_parser {
+        struct list_head        link;
+        struct module           *owner;
+        const char              *name;
+
+        /* Attempt to parse a key from the data blob passed to add_key() or
+         * keyctl_instantiate().  Should also generate a proposed description
+         * that the caller can optionally use for the key.
+         *
+         * Return EBADMSG if not recognised.
+         */
+        int (*parse)(struct key_preparsed_payload *prep);
+};
+
+extern int register_asymmetric_key_parser(struct asymmetric_key_parser *);
+extern void unregister_asymmetric_key_parser(struct asymmetric_key_parser *);
+
+#endif /* _KEYS_ASYMMETRIC_PARSER_H */
diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
new file mode 100644
index 000000000000..4b840e822209
--- /dev/null
+++ b/include/keys/asymmetric-subtype.h
@@ -0,0 +1,55 @@
+/* Asymmetric public-key cryptography key subtype
+ *
+ * See Documentation/security/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _KEYS_ASYMMETRIC_SUBTYPE_H
+#define _KEYS_ASYMMETRIC_SUBTYPE_H
+
+#include <linux/seq_file.h>
+#include <keys/asymmetric-type.h>
+
+struct public_key_signature;
+
+/*
+ * Keys of this type declare a subtype that indicates the handlers and
+ * capabilities.
+ */
+struct asymmetric_key_subtype {
+        struct module           *owner;
+        const char              *name;
+        unsigned short          name_len;       /* length of name */
+
+        /* Describe a key of this subtype for /proc/keys */
+        void (*describe)(const struct key *key, struct seq_file *m);
+
+        /* Destroy a key of this subtype */
+        void (*destroy)(void *payload);
+
+        /* Verify the signature on a key of this subtype (optional) */
+        int (*verify_signature)(const struct key *key,
+                                const struct public_key_signature *sig);
+};
+
+/**
+ * asymmetric_key_subtype - Get the subtype from an asymmetric key
+ * @key: The key of interest.
+ *
+ * Retrieves and returns the subtype pointer of the asymmetric key from the
+ * type-specific data attached to the key.
+ */
+static inline
+struct asymmetric_key_subtype *asymmetric_key_subtype(const struct key *key)
+{
+        return key->type_data.p[0];
+}
+
+#endif /* _KEYS_ASYMMETRIC_SUBTYPE_H */
diff --git a/include/keys/asymmetric-type.h b/include/keys/asymmetric-type.h
new file mode 100644
index 000000000000..7dd473496180
--- /dev/null
+++ b/include/keys/asymmetric-type.h
@@ -0,0 +1,25 @@
+/* Asymmetric Public-key cryptography key type interface
+ *
+ * See Documentation/security/asymmetric-keys.txt
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _KEYS_ASYMMETRIC_TYPE_H
+#define _KEYS_ASYMMETRIC_TYPE_H
+
+#include <linux/key-type.h>
+
+extern struct key_type key_type_asymmetric;
+
+/*
+ * The payload is at the discretion of the subtype.
+ */
+
+#endif /* _KEYS_ASYMMETRIC_TYPE_H */
diff --git a/include/keys/user-type.h b/include/keys/user-type.h
index bc9ec1d7698c..5e452c84f1e6 100644
--- a/include/keys/user-type.h
+++ b/include/keys/user-type.h
@@ -35,8 +35,10 @@ struct user_key_payload {
 extern struct key_type key_type_user;
 extern struct key_type key_type_logon;
 
-extern int user_instantiate(struct key *key, const void *data, size_t datalen);
-extern int user_update(struct key *key, const void *data, size_t datalen);
+struct key_preparsed_payload;
+
+extern int user_instantiate(struct key *key, struct key_preparsed_payload *prep);
+extern int user_update(struct key *key, struct key_preparsed_payload *prep);
 extern int user_match(const struct key *key, const void *criterion);
 extern void user_revoke(struct key *key);
 extern void user_destroy(struct key *key);
diff --git a/include/linux/asn1.h b/include/linux/asn1.h
new file mode 100644
index 000000000000..5c3f4e4b9a23
--- /dev/null
+++ b/include/linux/asn1.h
@@ -0,0 +1,67 @@
+/* ASN.1 BER/DER/CER encoding definitions
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_ASN1_H
+#define _LINUX_ASN1_H
+
+/* Class */
+enum asn1_class {
+        ASN1_UNIV       = 0,    /* Universal */
+        ASN1_APPL       = 1,    /* Application */
+        ASN1_CONT       = 2,    /* Context */
+        ASN1_PRIV       = 3     /* Private */
+};
+#define ASN1_CLASS_BITS 0xc0
+
+
+enum asn1_method {
+        ASN1_PRIM       = 0,    /* Primitive */
+        ASN1_CONS       = 1     /* Constructed */
+};
+#define ASN1_CONS_BIT   0x20
+
+/* Tag */
+enum asn1_tag {
+        ASN1_EOC        = 0,    /* End Of Contents or N/A */
+        ASN1_BOOL       = 1,    /* Boolean */
+        ASN1_INT        = 2,    /* Integer */
+        ASN1_BTS        = 3,    /* Bit String */
+        ASN1_OTS        = 4,    /* Octet String */
+        ASN1_NULL       = 5,    /* Null */
+        ASN1_OID        = 6,    /* Object Identifier  */
+        ASN1_ODE        = 7,    /* Object Description */
+        ASN1_EXT        = 8,    /* External */
+        ASN1_REAL       = 9,    /* Real float */
+        ASN1_ENUM       = 10,   /* Enumerated */
+        ASN1_EPDV       = 11,   /* Embedded PDV */
+        ASN1_UTF8STR    = 12,   /* UTF8 String */
+        ASN1_RELOID     = 13,   /* Relative OID */
+        /* 14 - Reserved */
+        /* 15 - Reserved */
+        ASN1_SEQ        = 16,   /* Sequence and Sequence of */
+        ASN1_SET        = 17,   /* Set and Set of */
+        ASN1_NUMSTR     = 18,   /* Numerical String */
+        ASN1_PRNSTR     = 19,   /* Printable String */
+        ASN1_TEXSTR     = 20,   /* T61 String / Teletext String */
+        ASN1_VIDSTR     = 21,   /* Videotex String */
+        ASN1_IA5STR     = 22,   /* IA5 String */
+        ASN1_UNITIM     = 23,   /* Universal Time */
+        ASN1_GENTIM     = 24,   /* General Time */
+        ASN1_GRASTR     = 25,   /* Graphic String */
+        ASN1_VISSTR     = 26,   /* Visible String */
+        ASN1_GENSTR     = 27,   /* General String */
+        ASN1_UNISTR     = 28,   /* Universal String */
+        ASN1_CHRSTR     = 29,   /* Character String */
+        ASN1_BMPSTR     = 30,   /* BMP String */
+        ASN1_LONG_TAG   = 31    /* Long form tag */
+};
+
+#endif /* _LINUX_ASN1_H */
diff --git a/include/linux/asn1_ber_bytecode.h b/include/linux/asn1_ber_bytecode.h
new file mode 100644
index 000000000000..945d44ae529c
--- /dev/null
+++ b/include/linux/asn1_ber_bytecode.h
@@ -0,0 +1,87 @@
+/* ASN.1 BER/DER/CER parsing state machine internal definitions
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_ASN1_BER_BYTECODE_H
+#define _LINUX_ASN1_BER_BYTECODE_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#endif
+#include <linux/asn1.h>
+
+typedef int (*asn1_action_t)(void *context,
+                             size_t hdrlen, /* In case of ANY type */
+                             unsigned char tag, /* In case of ANY type */
+                             const void *value, size_t vlen);
+
+struct asn1_decoder {
+        const unsigned char *machine;
+        size_t machlen;
+        const asn1_action_t *actions;
+};
+
+enum asn1_opcode {
+        /* The tag-matching ops come first and the odd-numbered slots
+         * are for OR_SKIP ops.
+         */
+#define ASN1_OP_MATCH__SKIP               0x01
+#define ASN1_OP_MATCH__ACT                0x02
+#define ASN1_OP_MATCH__JUMP               0x04
+#define ASN1_OP_MATCH__ANY                0x08
+#define ASN1_OP_MATCH__COND               0x10
+
+        ASN1_OP_MATCH                   = 0x00,
+        ASN1_OP_MATCH_OR_SKIP           = 0x01,
+        ASN1_OP_MATCH_ACT               = 0x02,
+        ASN1_OP_MATCH_ACT_OR_SKIP       = 0x03,
+        ASN1_OP_MATCH_JUMP              = 0x04,
+        ASN1_OP_MATCH_JUMP_OR_SKIP      = 0x05,
+        ASN1_OP_MATCH_ANY               = 0x08,
+        ASN1_OP_MATCH_ANY_ACT           = 0x0a,
+        /* Everything before here matches unconditionally */
+
+        ASN1_OP_COND_MATCH_OR_SKIP      = 0x11,
+        ASN1_OP_COND_MATCH_ACT_OR_SKIP  = 0x13,
+        ASN1_OP_COND_MATCH_JUMP_OR_SKIP = 0x15,
+        ASN1_OP_COND_MATCH_ANY          = 0x18,
+        ASN1_OP_COND_MATCH_ANY_ACT      = 0x1a,
+
+        /* Everything before here will want a tag from the data */
+#define ASN1_OP__MATCHES_TAG ASN1_OP_COND_MATCH_ANY_ACT
+
+        /* These are here to help fill up space */
+        ASN1_OP_COND_FAIL               = 0x1b,
+        ASN1_OP_COMPLETE                = 0x1c,
+        ASN1_OP_ACT                     = 0x1d,
+        ASN1_OP_RETURN                  = 0x1e,
+
+        /* The following eight have bit 0 -> SET, 1 -> OF, 2 -> ACT */
+        ASN1_OP_END_SEQ                 = 0x20,
+        ASN1_OP_END_SET                 = 0x21,
+        ASN1_OP_END_SEQ_OF              = 0x22,
+        ASN1_OP_END_SET_OF              = 0x23,
+        ASN1_OP_END_SEQ_ACT             = 0x24,
+        ASN1_OP_END_SET_ACT             = 0x25,
+        ASN1_OP_END_SEQ_OF_ACT          = 0x26,
+        ASN1_OP_END_SET_OF_ACT          = 0x27,
+#define ASN1_OP_END__SET                  0x01
+#define ASN1_OP_END__OF                   0x02
+#define ASN1_OP_END__ACT                  0x04
+
+        ASN1_OP__NR
+};
+
+#define _tag(CLASS, CP, TAG) ((ASN1_##CLASS << 6) | (ASN1_##CP << 5) | ASN1_##TAG)
+#define _tagn(CLASS, CP, TAG) ((ASN1_##CLASS << 6) | (ASN1_##CP << 5) | TAG)
+#define _jump_target(N) (N)
+#define _action(N) (N)
+
+#endif /* _LINUX_ASN1_BER_BYTECODE_H */
diff --git a/include/linux/asn1_decoder.h b/include/linux/asn1_decoder.h
new file mode 100644
index 000000000000..fa2ff5bc0483
--- /dev/null
+++ b/include/linux/asn1_decoder.h
@@ -0,0 +1,24 @@
+/* ASN.1 decoder
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_ASN1_DECODER_H
+#define _LINUX_ASN1_DECODER_H
+
+#include <linux/asn1.h>
+
+struct asn1_decoder;
+
+extern int asn1_ber_decoder(const struct asn1_decoder *decoder,
+                            void *context,
+                            const unsigned char *data,
+                            size_t datalen);
+
+#endif /* _LINUX_ASN1_DECODER_H */
diff --git a/include/linux/key-type.h b/include/linux/key-type.h
index f0c651cda7b0..518a53afb9ea 100644
--- a/include/linux/key-type.h
+++ b/include/linux/key-type.h
@@ -26,6 +26,27 @@ struct key_construction {
         struct key      *authkey;/* authorisation for key being constructed */
 };
 
+/*
+ * Pre-parsed payload, used by key add, update and instantiate.
+ *
+ * This struct will be cleared and data and datalen will be set with the data
+ * and length parameters from the caller and quotalen will be set from
+ * def_datalen from the key type.  Then if the preparse() op is provided by the
+ * key type, that will be called.  Then the struct will be passed to the
+ * instantiate() or the update() op.
+ *
+ * If the preparse() op is given, the free_preparse() op will be called to
+ * clear the contents.
+ */
+struct key_preparsed_payload {
+        char            *description;   /* Proposed key description (or NULL) */
+        void            *type_data[2];  /* Private key-type data */
+        void            *payload;       /* Proposed payload */
+        const void      *data;          /* Raw data */
+        size_t          datalen;        /* Raw datalen */
+        size_t          quotalen;       /* Quota length for proposed payload */
+};
+
 typedef int (*request_key_actor_t)(struct key_construction *key,
                                    const char *op, void *aux);
 
@@ -45,18 +66,28 @@ struct key_type {
         /* vet a description */
         int (*vet_description)(const char *description);
 
+        /* Preparse the data blob from userspace that is to be the payload,
+         * generating a proposed description and payload that will be handed to
+         * the instantiate() and update() ops.
+         */
+        int (*preparse)(struct key_preparsed_payload *prep);
+
+        /* Free a preparse data structure.
+         */
+        void (*free_preparse)(struct key_preparsed_payload *prep);
+
         /* instantiate a key of this type
          * - this method should call key_payload_reserve() to determine if the
          *   user's quota will hold the payload
          */
-        int (*instantiate)(struct key *key, const void *data, size_t datalen);
+        int (*instantiate)(struct key *key, struct key_preparsed_payload *prep);
 
         /* update a key of this type (optional)
          * - this method should call key_payload_reserve() to recalculate the
          *   quota consumption
          * - the key must be locked against read when modifying
          */
-        int (*update)(struct key *key, const void *data, size_t datalen);
+        int (*update)(struct key *key, struct key_preparsed_payload *prep);
 
         /* match a key against a description */
         int (*match)(const struct key *key, const void *desc);
diff --git a/include/linux/module.h b/include/linux/module.h
index fbcafe2ee13e..7760c6d344a3 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -21,6 +21,9 @@
 #include <linux/percpu.h>
 #include <asm/module.h>
 
+/* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
+#define MODULE_SIG_STRING "~Module signature appended~\n"
+
 /* Not Yet Implemented */
 #define MODULE_SUPPORTED_DEVICE(name)
 
@@ -260,6 +263,11 @@ struct module
         const unsigned long *unused_gpl_crcs;
 #endif
 
+#ifdef CONFIG_MODULE_SIG
+        /* Signature was verified. */
+        bool sig_ok;
+#endif
+
         /* symbols that will be GPL-only in the near future. */
         const struct kernel_symbol *gpl_future_syms;
         const unsigned long *gpl_future_crcs;
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
index b2be02ebf453..560ca53a75fa 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -28,21 +28,49 @@ void *module_alloc(unsigned long size);
 /* Free memory returned from module_alloc. */
 void module_free(struct module *mod, void *module_region);
 
-/* Apply the given relocation to the (simplified) ELF.  Return -error
-   or 0. */
+/*
+ * Apply the given relocation to the (simplified) ELF.  Return -error
+ * or 0.
+ */
+#ifdef CONFIG_MODULES_USE_ELF_REL
 int apply_relocate(Elf_Shdr *sechdrs,
                    const char *strtab,
                    unsigned int symindex,
                    unsigned int relsec,
                    struct module *mod);
+#else
+static inline int apply_relocate(Elf_Shdr *sechdrs,
+                                 const char *strtab,
+                                 unsigned int symindex,
+                                 unsigned int relsec,
+                                 struct module *me)
+{
+        printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
+        return -ENOEXEC;
+}
+#endif
 
-/* Apply the given add relocation to the (simplified) ELF.  Return
-   -error or 0 */
+/*
+ * Apply the given add relocation to the (simplified) ELF.  Return
+ * -error or 0
+ */
+#ifdef CONFIG_MODULES_USE_ELF_RELA
 int apply_relocate_add(Elf_Shdr *sechdrs,
                        const char *strtab,
                        unsigned int symindex,
                        unsigned int relsec,
                        struct module *mod);
+#else
+static inline int apply_relocate_add(Elf_Shdr *sechdrs,
+                                     const char *strtab,
+                                     unsigned int symindex,
+                                     unsigned int relsec,
+                                     struct module *me)
+{
+        printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
+        return -ENOEXEC;
+}
+#endif
 
 /* Any final processing of module before access.  Return -error or 0. */
 int module_finalize(const Elf_Ehdr *hdr,
diff --git a/include/linux/mpi.h b/include/linux/mpi.h
index d02cca6cc8ce..5af1b81def49 100644
--- a/include/linux/mpi.h
+++ b/include/linux/mpi.h
@@ -76,6 +76,7 @@ void mpi_swap(MPI a, MPI b);
 
 /*-- mpicoder.c --*/
 MPI do_encode_md(const void *sha_buffer, unsigned nbits);
+MPI mpi_read_raw_data(const void *xbuffer, size_t nbytes);
 MPI mpi_read_from_buffer(const void *buffer, unsigned *ret_nread);
 int mpi_fromstr(MPI val, const char *str);
 u32 mpi_get_keyid(MPI a, u32 *keyid);
diff --git a/include/linux/oid_registry.h b/include/linux/oid_registry.h
new file mode 100644
index 000000000000..6926db724258
--- /dev/null
+++ b/include/linux/oid_registry.h
@@ -0,0 +1,92 @@
+/* ASN.1 Object identifier (OID) registry
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_OID_REGISTRY_H
+#define _LINUX_OID_REGISTRY_H
+
+#include <linux/types.h>
+
+/*
+ * OIDs are turned into these values if possible, or OID__NR if not held here.
+ *
+ * NOTE!  Do not mess with the format of each line as this is read by
+ *        build_OID_registry.pl to generate the data for look_up_OID().
+ */
+enum OID {
+        OID_id_dsa_with_sha1,           /* 1.2.840.10030.4.3 */
+        OID_id_dsa,                     /* 1.2.840.10040.4.1 */
+        OID_id_ecdsa_with_sha1,         /* 1.2.840.10045.4.1 */
+        OID_id_ecPublicKey,             /* 1.2.840.10045.2.1 */
+
+        /* PKCS#1 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1)} */
+        OID_rsaEncryption,              /* 1.2.840.113549.1.1.1 */
+        OID_md2WithRSAEncryption,       /* 1.2.840.113549.1.1.2 */
+        OID_md3WithRSAEncryption,       /* 1.2.840.113549.1.1.3 */
+        OID_md4WithRSAEncryption,       /* 1.2.840.113549.1.1.4 */
+        OID_sha1WithRSAEncryption,      /* 1.2.840.113549.1.1.5 */
+        OID_sha256WithRSAEncryption,    /* 1.2.840.113549.1.1.11 */
+        OID_sha384WithRSAEncryption,    /* 1.2.840.113549.1.1.12 */
+        OID_sha512WithRSAEncryption,    /* 1.2.840.113549.1.1.13 */
+        OID_sha224WithRSAEncryption,    /* 1.2.840.113549.1.1.14 */
+        /* PKCS#7 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-7(7)} */
+        OID_data,                       /* 1.2.840.113549.1.7.1 */
+        OID_signed_data,                /* 1.2.840.113549.1.7.2 */
+        /* PKCS#9 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9)} */
+        OID_email_address,              /* 1.2.840.113549.1.9.1 */
+        OID_content_type,               /* 1.2.840.113549.1.9.3 */
+        OID_messageDigest,              /* 1.2.840.113549.1.9.4 */
+        OID_signingTime,                /* 1.2.840.113549.1.9.5 */
+        OID_smimeCapabilites,           /* 1.2.840.113549.1.9.15 */
+        OID_smimeAuthenticatedAttrs,    /* 1.2.840.113549.1.9.16.2.11 */
+
+        /* {iso(1) member-body(2) us(840) rsadsi(113549) digestAlgorithm(2)} */
+        OID_md2,                        /* 1.2.840.113549.2.2 */
+        OID_md4,                        /* 1.2.840.113549.2.4 */
+        OID_md5,                        /* 1.2.840.113549.2.5 */
+
+        OID_certAuthInfoAccess,         /* 1.3.6.1.5.5.7.1.1 */
+        OID_msOutlookExpress,           /* 1.3.6.1.4.1.311.16.4 */
+        OID_sha1,                       /* 1.3.14.3.2.26 */
+
+        /* Distinguished Name attribute IDs [RFC 2256] */
+        OID_commonName,                 /* 2.5.4.3 */
+        OID_surname,                    /* 2.5.4.4 */
+        OID_countryName,                /* 2.5.4.6 */
+        OID_locality,                   /* 2.5.4.7 */
+        OID_stateOrProvinceName,        /* 2.5.4.8 */
+        OID_organizationName,           /* 2.5.4.10 */
+        OID_organizationUnitName,       /* 2.5.4.11 */
+        OID_title,                      /* 2.5.4.12 */
+        OID_description,                /* 2.5.4.13 */
+        OID_name,                       /* 2.5.4.41 */
+        OID_givenName,                  /* 2.5.4.42 */
+        OID_initials,                   /* 2.5.4.43 */
+        OID_generationalQualifier,      /* 2.5.4.44 */
+
+        /* Certificate extension IDs */
+        OID_subjectKeyIdentifier,       /* 2.5.29.14 */
+        OID_keyUsage,                   /* 2.5.29.15 */
+        OID_subjectAltName,             /* 2.5.29.17 */
+        OID_issuerAltName,              /* 2.5.29.18 */
+        OID_basicConstraints,           /* 2.5.29.19 */
+        OID_crlDistributionPoints,      /* 2.5.29.31 */
+        OID_certPolicies,               /* 2.5.29.32 */
+        OID_authorityKeyIdentifier,     /* 2.5.29.35 */
+        OID_extKeyUsage,                /* 2.5.29.37 */
+
+        OID__NR
+};
+
+extern enum OID look_up_OID(const void *data, size_t datasize);
+extern int sprint_oid(const void *, size_t, char *, size_t);
+extern int sprint_OID(enum OID, char *, size_t);
+
+#endif /* _LINUX_OID_REGISTRY_H */
diff --git a/init/Kconfig b/init/Kconfig
index 89e4cf672dfe..6fdd6e339326 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1574,6 +1574,66 @@ config MODULE_SRCVERSION_ALL
           the version).  With this option, such a "srcversion" field
           will be created for all modules.  If unsure, say N.
 
+config MODULE_SIG
+        bool "Module signature verification"
+        depends on MODULES
+        select KEYS
+        select CRYPTO
+        select ASYMMETRIC_KEY_TYPE
+        select ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+        select PUBLIC_KEY_ALGO_RSA
+        select ASN1
+        select OID_REGISTRY
+        select X509_CERTIFICATE_PARSER
+        help
+          Check modules for valid signatures upon load: the signature
+          is simply appended to the module. For more information see
+          Documentation/module-signing.txt.
+
+          !!!WARNING!!!  If you enable this option, you MUST make sure that the
+          module DOES NOT get stripped after being signed.  This includes the
+          debuginfo strip done by some packagers (such as rpmbuild) and
+          inclusion into an initramfs that wants the module size reduced.
+
+config MODULE_SIG_FORCE
+        bool "Require modules to be validly signed"
+        depends on MODULE_SIG
+        help
+          Reject unsigned modules or signed modules for which we don't have a
+          key.  Without this, such modules will simply taint the kernel.
+
+choice
+        prompt "Which hash algorithm should modules be signed with?"
+        depends on MODULE_SIG
+        help
+          This determines which sort of hashing algorithm will be used during
+          signature generation.  This algorithm _must_ be built into the kernel
+          directly so that signature verification can take place.  It is not
+          possible to load a signed module containing the algorithm to check
+          the signature on that module.
+
+config MODULE_SIG_SHA1
+        bool "Sign modules with SHA-1"
+        select CRYPTO_SHA1
+
+config MODULE_SIG_SHA224
+        bool "Sign modules with SHA-224"
+        select CRYPTO_SHA256
+
+config MODULE_SIG_SHA256
+        bool "Sign modules with SHA-256"
+        select CRYPTO_SHA256
+
+config MODULE_SIG_SHA384
+        bool "Sign modules with SHA-384"
+        select CRYPTO_SHA512
+
+config MODULE_SIG_SHA512
+        bool "Sign modules with SHA-512"
+        select CRYPTO_SHA512
+
+endchoice
+
 endif # MODULES
 
 config INIT_ALL_POSSIBLE
@@ -1607,4 +1667,12 @@ config PADATA
 config BROKEN_RODATA
         bool
 
+config ASN1
+        tristate
+        help
+          Build a simple ASN.1 grammar compiler that produces a bytecode output
+          that can be interpreted by the ASN.1 stream decoder and used to
+          inform it as to what tags are to be expected in a stream and what
+          functions to call on what tags.
+
 source "kernel/Kconfig.locks"
diff --git a/kernel/Makefile b/kernel/Makefile
index 5404911eaee9..0dfeca4324ee 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -54,6 +54,7 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
 obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
 obj-$(CONFIG_UID16) += uid16.o
 obj-$(CONFIG_MODULES) += module.o
+obj-$(CONFIG_MODULE_SIG) += module_signing.o modsign_pubkey.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
 obj-$(CONFIG_KEXEC) += kexec.o
@@ -130,3 +131,79 @@ quiet_cmd_timeconst  = TIMEC   $@
 targets += timeconst.h
 $(obj)/timeconst.h: $(src)/timeconst.pl FORCE
         $(call if_changed,timeconst)
+
+ifeq ($(CONFIG_MODULE_SIG),y)
+#
+# Pull the signing certificate and any extra certificates into the kernel
+#
+extra_certificates:
+        touch $@
+
+kernel/modsign_pubkey.o: signing_key.x509 extra_certificates
+
+###############################################################################
+#
+# If module signing is requested, say by allyesconfig, but a key has not been
+# supplied, then one will need to be generated to make sure the build does not
+# fail and that the kernel may be used afterwards.
+#
+###############################################################################
+sign_key_with_hash :=
+ifeq ($(CONFIG_MODULE_SIG_SHA1),y)
+sign_key_with_hash := -sha1
+endif
+ifeq ($(CONFIG_MODULE_SIG_SHA224),y)
+sign_key_with_hash := -sha224
+endif
+ifeq ($(CONFIG_MODULE_SIG_SHA256),y)
+sign_key_with_hash := -sha256
+endif
+ifeq ($(CONFIG_MODULE_SIG_SHA384),y)
+sign_key_with_hash := -sha384
+endif
+ifeq ($(CONFIG_MODULE_SIG_SHA512),y)
+sign_key_with_hash := -sha512
+endif
+ifeq ($(sign_key_with_hash),)
+$(error Could not determine digest type to use from kernel config)
+endif
+
+signing_key.priv signing_key.x509: x509.genkey
+        @echo "###"
+        @echo "### Now generating an X.509 key pair to be used for signing modules."
+        @echo "###"
+        @echo "### If this takes a long time, you might wish to run rngd in the"
+        @echo "### background to keep the supply of entropy topped up.  It"
+        @echo "### needs to be run as root, and should use a hardware random"
+        @echo "### number generator if one is available, eg:"
+        @echo "###"
+        @echo "###     rngd -r /dev/hwrandom"
+        @echo "###"
+        openssl req -new -nodes -utf8 $(sign_key_with_hash) -days 36500 -batch \
+                -x509 -config x509.genkey \
+                -outform DER -out signing_key.x509 \
+                -keyout signing_key.priv
+        @echo "###"
+        @echo "### Key pair generated."
+        @echo "###"
+
+x509.genkey:
+        @echo Generating X.509 key generation config
+        @echo  >x509.genkey "[ req ]"
+        @echo >>x509.genkey "default_bits = 4096"
+        @echo >>x509.genkey "distinguished_name = req_distinguished_name"
+        @echo >>x509.genkey "prompt = no"
+        @echo >>x509.genkey "string_mask = utf8only"
+        @echo >>x509.genkey "x509_extensions = myexts"
+        @echo >>x509.genkey
+        @echo >>x509.genkey "[ req_distinguished_name ]"
+        @echo >>x509.genkey "O = Magrathea"
+        @echo >>x509.genkey "CN = Glacier signing key"
+        @echo >>x509.genkey "emailAddress = slartibartfast@magrathea.h2g2"
+        @echo >>x509.genkey
+        @echo >>x509.genkey "[ myexts ]"
+        @echo >>x509.genkey "basicConstraints=critical,CA:FALSE"
+        @echo >>x509.genkey "keyUsage=digitalSignature"
+        @echo >>x509.genkey "subjectKeyIdentifier=hash"
+        @echo >>x509.genkey "authorityKeyIdentifier=keyid"
+endif
diff --git a/kernel/modsign_pubkey.c b/kernel/modsign_pubkey.c
new file mode 100644
index 000000000000..4646eb2c3820
--- /dev/null
+++ b/kernel/modsign_pubkey.c
@@ -0,0 +1,113 @@
+/* Public keys for module signature verification
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/cred.h>
+#include <linux/err.h>
+#include <keys/asymmetric-type.h>
+#include "module-internal.h"
+
+struct key *modsign_keyring;
+
+extern __initdata const u8 modsign_certificate_list[];
+extern __initdata const u8 modsign_certificate_list_end[];
+asm(".section .init.data,\"aw\"\n"
+    "modsign_certificate_list:\n"
+    ".incbin \"signing_key.x509\"\n"
+    ".incbin \"extra_certificates\"\n"
+    "modsign_certificate_list_end:"
+    );
+
+/*
+ * We need to make sure ccache doesn't cache the .o file as it doesn't notice
+ * if modsign.pub changes.
+ */
+static __initdata const char annoy_ccache[] = __TIME__ "foo";
+
+/*
+ * Load the compiled-in keys
+ */
+static __init int module_verify_init(void)
+{
+        pr_notice("Initialise module verification\n");
+
+        modsign_keyring = key_alloc(&key_type_keyring, ".module_sign",
+                                    KUIDT_INIT(0), KGIDT_INIT(0),
+                                    current_cred(),
+                                    (KEY_POS_ALL & ~KEY_POS_SETATTR) |
+                                    KEY_USR_VIEW | KEY_USR_READ,
+                                    KEY_ALLOC_NOT_IN_QUOTA);
+        if (IS_ERR(modsign_keyring))
+                panic("Can't allocate module signing keyring\n");
+
+        if (key_instantiate_and_link(modsign_keyring, NULL, 0, NULL, NULL) < 0)
+                panic("Can't instantiate module signing keyring\n");
+
+        return 0;
+}
+
+/*
+ * Must be initialised before we try and load the keys into the keyring.
+ */
+device_initcall(module_verify_init);
+
+/*
+ * Load the compiled-in keys
+ */
+static __init int load_module_signing_keys(void)
+{
+        key_ref_t key;
+        const u8 *p, *end;
+        size_t plen;
+
+        pr_notice("Loading module verification certificates\n");
+
+        end = modsign_certificate_list_end;
+        p = modsign_certificate_list;
+        while (p < end) {
+                /* Each cert begins with an ASN.1 SEQUENCE tag and must be more
+                 * than 256 bytes in size.
+                 */
+                if (end - p < 4)
+                        goto dodgy_cert;
+                if (p[0] != 0x30 &&
+                    p[1] != 0x82)
+                        goto dodgy_cert;
+                plen = (p[2] << 8) | p[3];
+                plen += 4;
+                if (plen > end - p)
+                        goto dodgy_cert;
+
+                key = key_create_or_update(make_key_ref(modsign_keyring, 1),
+                                           "asymmetric",
+                                           NULL,
+                                           p,
+                                           plen,
+                                           (KEY_POS_ALL & ~KEY_POS_SETATTR) |
+                                           KEY_USR_VIEW,
+                                           KEY_ALLOC_NOT_IN_QUOTA);
+                if (IS_ERR(key))
+                        pr_err("MODSIGN: Problem loading in-kernel X.509 certificate (%ld)\n",
+                               PTR_ERR(key));
+                else
+                        pr_notice("MODSIGN: Loaded cert '%s'\n",
+                                  key_ref_to_ptr(key)->description);
+                p += plen;
+        }
+
+        return 0;
+
+dodgy_cert:
+        pr_err("MODSIGN: Problem parsing in-kernel X.509 certificate list\n");
+        return 0;
+}
+late_initcall(load_module_signing_keys);
diff --git a/kernel/module-internal.h b/kernel/module-internal.h
new file mode 100644
index 000000000000..6114a13419bd
--- /dev/null
+++ b/kernel/module-internal.h
@@ -0,0 +1,15 @@
+/* Module internals
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+extern struct key *modsign_keyring;
+
+extern int mod_verify_sig(const void *mod, unsigned long modlen,
+                          const void *sig, unsigned long siglen);
diff --git a/kernel/module.c b/kernel/module.c
index 4edbd9c11aca..0e2da8695f8e 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -58,6 +58,8 @@
 #include <linux/jump_label.h>
 #include <linux/pfn.h>
 #include <linux/bsearch.h>
+#include <linux/fips.h>
+#include "module-internal.h"
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/module.h>
@@ -102,6 +104,43 @@ static LIST_HEAD(modules);
 struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
 #endif /* CONFIG_KGDB_KDB */
 
+#ifdef CONFIG_MODULE_SIG
+#ifdef CONFIG_MODULE_SIG_FORCE
+static bool sig_enforce = true;
+#else
+static bool sig_enforce = false;
+
+static int param_set_bool_enable_only(const char *val,
+                                      const struct kernel_param *kp)
+{
+        int err;
+        bool test;
+        struct kernel_param dummy_kp = *kp;
+
+        dummy_kp.arg = &test;
+
+        err = param_set_bool(val, &dummy_kp);
+        if (err)
+                return err;
+
+        /* Don't let them unset it once it's set! */
+        if (!test && sig_enforce)
+                return -EROFS;
+
+        if (test)
+                sig_enforce = true;
+        return 0;
+}
+
+static const struct kernel_param_ops param_ops_bool_enable_only = {
+        .set = param_set_bool_enable_only,
+        .get = param_get_bool,
+};
+#define param_check_bool_enable_only param_check_bool
+
+module_param(sig_enforce, bool_enable_only, 0644);
+#endif /* !CONFIG_MODULE_SIG_FORCE */
+#endif /* CONFIG_MODULE_SIG */
 
 /* Block module loading/unloading? */
 int modules_disabled = 0;
@@ -136,6 +175,7 @@ struct load_info {
         unsigned long symoffs, stroffs;
         struct _ddebug *debug;
         unsigned int num_debug;
+        bool sig_ok;
         struct {
                 unsigned int sym, str, mod, vers, info, pcpu;
         } index;
@@ -1949,26 +1989,6 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
         return ret;
 }
 
-int __weak apply_relocate(Elf_Shdr *sechdrs,
-                          const char *strtab,
-                          unsigned int symindex,
-                          unsigned int relsec,
-                          struct module *me)
-{
-        pr_err("module %s: REL relocation unsupported\n", me->name);
-        return -ENOEXEC;
-}
-
-int __weak apply_relocate_add(Elf_Shdr *sechdrs,
-                              const char *strtab,
-                              unsigned int symindex,
-                              unsigned int relsec,
-                              struct module *me)
-{
-        pr_err("module %s: RELA relocation unsupported\n", me->name);
-        return -ENOEXEC;
-}
-
 static int apply_relocations(struct module *mod, const struct load_info *info)
 {
         unsigned int i;
@@ -2399,7 +2419,52 @@ static inline void kmemleak_load_module(const struct module *mod,
 }
 #endif
 
-/* Sets info->hdr and info->len. */
+#ifdef CONFIG_MODULE_SIG
+static int module_sig_check(struct load_info *info,
+                            const void *mod, unsigned long *len)
+{
+        int err = -ENOKEY;
+        const unsigned long markerlen = sizeof(MODULE_SIG_STRING) - 1;
+        const void *p = mod, *end = mod + *len;
+
+        /* Poor man's memmem. */
+        while ((p = memchr(p, MODULE_SIG_STRING[0], end - p))) {
+                if (p + markerlen > end)
+                        break;
+
+                if (memcmp(p, MODULE_SIG_STRING, markerlen) == 0) {
+                        const void *sig = p + markerlen;
+                        /* Truncate module up to signature. */
+                        *len = p - mod;
+                        err = mod_verify_sig(mod, *len, sig, end - sig);
+                        break;
+                }
+                p++;
+        }
+
+        if (!err) {
+                info->sig_ok = true;
+                return 0;
+        }
+
+        /* Not having a signature is only an error if we're strict. */
+        if (err < 0 && fips_enabled)
+                panic("Module verification failed with error %d in FIPS mode\n",
+                      err);
+        if (err == -ENOKEY && !sig_enforce)
+                err = 0;
+
+        return err;
+}
+#else /* !CONFIG_MODULE_SIG */
+static int module_sig_check(struct load_info *info,
+                            void *mod, unsigned long *len)
+{
+        return 0;
+}
+#endif /* !CONFIG_MODULE_SIG */
+
+/* Sets info->hdr, info->len and info->sig_ok. */
 static int copy_and_check(struct load_info *info,
                           const void __user *umod, unsigned long len,
                           const char __user *uargs)
@@ -2419,6 +2484,10 @@ static int copy_and_check(struct load_info *info,
                 goto free_hdr;
         }
 
+        err = module_sig_check(info, hdr, &len);
+        if (err)
+                goto free_hdr;
+
         /* Sanity checks against insmoding binaries or wrong arch,
            weird elf version */
         if (memcmp(hdr->e_ident, ELFMAG, SELFMAG) != 0
@@ -2730,6 +2799,10 @@ static int check_module_license_and_versions(struct module *mod)
         if (strcmp(mod->name, "driverloader") == 0)
                 add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
 
+        /* lve claims to be GPL but upstream won't provide source */
+        if (strcmp(mod->name, "lve") == 0)
+                add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
+
 #ifdef CONFIG_MODVERSIONS
         if ((mod->num_syms && !mod->crcs)
             || (mod->num_gpl_syms && !mod->gpl_crcs)
@@ -2861,6 +2934,20 @@ static int post_relocation(struct module *mod, const struct load_info *info)
         return module_finalize(info->hdr, info->sechdrs, mod);
 }
 
+/* Is this module of this name done loading?  No locks held. */
+static bool finished_loading(const char *name)
+{
+        struct module *mod;
+        bool ret;
+
+        mutex_lock(&module_mutex);
+        mod = find_module(name);
+        ret = !mod || mod->state != MODULE_STATE_COMING;
+        mutex_unlock(&module_mutex);
+
+        return ret;
+}
+
 /* Allocate and load the module: note that size of section 0 is always
    zero, and we rely on this for optional sections. */
 static struct module *load_module(void __user *umod,
@@ -2868,7 +2955,7 @@ static struct module *load_module(void __user *umod,
                                   const char __user *uargs)
 {
         struct load_info info = { NULL, };
-        struct module *mod;
+        struct module *mod, *old;
         long err;
 
         pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n",
@@ -2886,6 +2973,12 @@ static struct module *load_module(void __user *umod,
                 goto free_copy;
         }
 
+#ifdef CONFIG_MODULE_SIG
+        mod->sig_ok = info.sig_ok;
+        if (!mod->sig_ok)
+                add_taint_module(mod, TAINT_FORCED_MODULE);
+#endif
+
         /* Now module is in final location, initialize linked lists, etc. */
         err = module_unload_init(mod);
         if (err)
@@ -2934,8 +3027,18 @@ static struct module *load_module(void __user *umod,
          * function to insert in a way safe to concurrent readers.
          * The mutex protects against concurrent writers.
          */
+again:
         mutex_lock(&module_mutex);
-        if (find_module(mod->name)) {
+        if ((old = find_module(mod->name)) != NULL) {
+                if (old->state == MODULE_STATE_COMING) {
+                        /* Wait in case it fails to load. */
+                        mutex_unlock(&module_mutex);
+                        err = wait_event_interruptible(module_wq,
+                                               finished_loading(mod->name));
+                        if (err)
+                                goto free_arch_cleanup;
+                        goto again;
+                }
                 err = -EEXIST;
                 goto unlock;
         }
@@ -2975,7 +3078,7 @@ static struct module *load_module(void __user *umod,
         /* Unlink carefully: kallsyms could be walking list. */
         list_del_rcu(&mod->list);
         module_bug_cleanup(mod);
-
+        wake_up_all(&module_wq);
  ddebug:
         dynamic_debug_remove(info.debug);
  unlock:
@@ -3050,7 +3153,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
                 blocking_notifier_call_chain(&module_notify_list,
                                              MODULE_STATE_GOING, mod);
                 free_module(mod);
-                wake_up(&module_wq);
+                wake_up_all(&module_wq);
                 return ret;
         }
         if (ret > 0) {
@@ -3062,9 +3165,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
                 dump_stack();
         }
 
-        /* Now it's a first class citizen!  Wake up anyone waiting for it. */
+        /* Now it's a first class citizen! */
         mod->state = MODULE_STATE_LIVE;
-        wake_up(&module_wq);
         blocking_notifier_call_chain(&module_notify_list,
                                      MODULE_STATE_LIVE, mod);
 
@@ -3087,6 +3189,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
         mod->init_ro_size = 0;
         mod->init_text_size = 0;
         mutex_unlock(&module_mutex);
+        wake_up_all(&module_wq);
 
         return 0;
 }
diff --git a/kernel/module_signing.c b/kernel/module_signing.c
new file mode 100644
index 000000000000..6b09f6983ac0
--- /dev/null
+++ b/kernel/module_signing.c
@@ -0,0 +1,243 @@
+/* Module signature checker
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <crypto/public_key.h>
+#include <crypto/hash.h>
+#include <keys/asymmetric-type.h>
+#include "module-internal.h"
+
+/*
+ * Module signature information block.
+ *
+ * The constituents of the signature section are, in order:
+ *
+ *      - Signer's name
+ *      - Key identifier
+ *      - Signature data
+ *      - Information block
+ */
+struct module_signature {
+        enum pkey_algo          algo : 8;       /* Public-key crypto algorithm */
+        enum pkey_hash_algo     hash : 8;       /* Digest algorithm */
+        enum pkey_id_type       id_type : 8;    /* Key identifier type */
+        u8                      signer_len;     /* Length of signer's name */
+        u8                      key_id_len;     /* Length of key identifier */
+        u8                      __pad[3];
+        __be32                  sig_len;        /* Length of signature data */
+};
+
+/*
+ * Digest the module contents.
+ */
+static struct public_key_signature *mod_make_digest(enum pkey_hash_algo hash,
+                                                    const void *mod,
+                                                    unsigned long modlen)
+{
+        struct public_key_signature *pks;
+        struct crypto_shash *tfm;
+        struct shash_desc *desc;
+        size_t digest_size, desc_size;
+        int ret;
+
+        pr_devel("==>%s()\n", __func__);
+        
+        /* Allocate the hashing algorithm we're going to need and find out how
+         * big the hash operational data will be.
+         */
+        tfm = crypto_alloc_shash(pkey_hash_algo[hash], 0, 0);
+        if (IS_ERR(tfm))
+                return (PTR_ERR(tfm) == -ENOENT) ? ERR_PTR(-ENOPKG) : ERR_CAST(tfm);
+
+        desc_size = crypto_shash_descsize(tfm) + sizeof(*desc);
+        digest_size = crypto_shash_digestsize(tfm);
+
+        /* We allocate the hash operational data storage on the end of our
+         * context data and the digest output buffer on the end of that.
+         */
+        ret = -ENOMEM;
+        pks = kzalloc(digest_size + sizeof(*pks) + desc_size, GFP_KERNEL);
+        if (!pks)
+                goto error_no_pks;
+
+        pks->pkey_hash_algo     = hash;
+        pks->digest             = (u8 *)pks + sizeof(*pks) + desc_size;
+        pks->digest_size        = digest_size;
+
+        desc = (void *)pks + sizeof(*pks);
+        desc->tfm   = tfm;
+        desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
+
+        ret = crypto_shash_init(desc);
+        if (ret < 0)
+                goto error;
+
+        ret = crypto_shash_finup(desc, mod, modlen, pks->digest);
+        if (ret < 0)
+                goto error;
+
+        crypto_free_shash(tfm);
+        pr_devel("<==%s() = ok\n", __func__);
+        return pks;
+
+error:
+        kfree(pks);
+error_no_pks:
+        crypto_free_shash(tfm);
+        pr_devel("<==%s() = %d\n", __func__, ret);
+        return ERR_PTR(ret);
+}
+
+/*
+ * Extract an MPI array from the signature data.  This represents the actual
+ * signature.  Each raw MPI is prefaced by a BE 2-byte value indicating the
+ * size of the MPI in bytes.
+ *
+ * RSA signatures only have one MPI, so currently we only read one.
+ */
+static int mod_extract_mpi_array(struct public_key_signature *pks,
+                                 const void *data, size_t len)
+{
+        size_t nbytes;
+        MPI mpi;
+
+        if (len < 3)
+                return -EBADMSG;
+        nbytes = ((const u8 *)data)[0] << 8 | ((const u8 *)data)[1];
+        data += 2;
+        len -= 2;
+        if (len != nbytes)
+                return -EBADMSG;
+
+        mpi = mpi_read_raw_data(data, nbytes);
+        if (!mpi)
+                return -ENOMEM;
+        pks->mpi[0] = mpi;
+        pks->nr_mpi = 1;
+        return 0;
+}
+
+/*
+ * Request an asymmetric key.
+ */
+static struct key *request_asymmetric_key(const char *signer, size_t signer_len,
+                                          const u8 *key_id, size_t key_id_len)
+{
+        key_ref_t key;
+        size_t i;
+        char *id, *q;
+
+        pr_devel("==>%s(,%zu,,%zu)\n", __func__, signer_len, key_id_len);
+
+        /* Construct an identifier. */
+        id = kmalloc(signer_len + 2 + key_id_len * 2 + 1, GFP_KERNEL);
+        if (!id)
+                return ERR_PTR(-ENOKEY);
+
+        memcpy(id, signer, signer_len);
+
+        q = id + signer_len;
+        *q++ = ':';
+        *q++ = ' ';
+        for (i = 0; i < key_id_len; i++) {
+                *q++ = hex_asc[*key_id >> 4];
+                *q++ = hex_asc[*key_id++ & 0x0f];
+        }
+
+        *q = 0;
+
+        pr_debug("Look up: \"%s\"\n", id);
+
+        key = keyring_search(make_key_ref(modsign_keyring, 1),
+                             &key_type_asymmetric, id);
+        if (IS_ERR(key))
+                pr_warn("Request for unknown module key '%s' err %ld\n",
+                        id, PTR_ERR(key));
+        kfree(id);
+
+        if (IS_ERR(key)) {
+                switch (PTR_ERR(key)) {
+                        /* Hide some search errors */
+                case -EACCES:
+                case -ENOTDIR:
+                case -EAGAIN:
+                        return ERR_PTR(-ENOKEY);
+                default:
+                        return ERR_CAST(key);
+                }
+        }
+
+        pr_devel("<==%s() = 0 [%x]\n", __func__, key_serial(key_ref_to_ptr(key)));
+        return key_ref_to_ptr(key);
+}
+
+/*
+ * Verify the signature on a module.
+ */
+int mod_verify_sig(const void *mod, unsigned long modlen,
+                   const void *sig, unsigned long siglen)
+{
+        struct public_key_signature *pks;
+        struct module_signature ms;
+        struct key *key;
+        size_t sig_len;
+        int ret;
+
+        pr_devel("==>%s(,%lu,,%lu,)\n", __func__, modlen, siglen);
+
+        if (siglen <= sizeof(ms))
+                return -EBADMSG;
+
+        memcpy(&ms, sig + (siglen - sizeof(ms)), sizeof(ms));
+        siglen -= sizeof(ms);
+
+        sig_len = be32_to_cpu(ms.sig_len);
+        if (sig_len >= siglen ||
+            siglen - sig_len != (size_t)ms.signer_len + ms.key_id_len)
+                return -EBADMSG;
+
+        /* For the moment, only support RSA and X.509 identifiers */
+        if (ms.algo != PKEY_ALGO_RSA ||
+            ms.id_type != PKEY_ID_X509)
+                return -ENOPKG;
+
+        if (ms.hash >= PKEY_HASH__LAST ||
+            !pkey_hash_algo[ms.hash])
+                return -ENOPKG;
+
+        key = request_asymmetric_key(sig, ms.signer_len,
+                                     sig + ms.signer_len, ms.key_id_len);
+        if (IS_ERR(key))
+                return PTR_ERR(key);
+
+        pks = mod_make_digest(ms.hash, mod, modlen);
+        if (IS_ERR(pks)) {
+                ret = PTR_ERR(pks);
+                goto error_put_key;
+        }
+
+        ret = mod_extract_mpi_array(pks, sig + ms.signer_len + ms.key_id_len,
+                                    sig_len);
+        if (ret < 0)
+                goto error_free_pks;
+
+        ret = verify_signature(key, pks);
+        pr_devel("verify_signature() = %d\n", ret);
+
+error_free_pks:
+        mpi_free(pks->rsa.s);
+        kfree(pks);
+error_put_key:
+        key_put(key);
+        pr_devel("<==%s() = %d\n", __func__, ret);
+        return ret;     
+}
diff --git a/lib/.gitignore b/lib/.gitignore
index 3bef1ea94c99..09aae85418ab 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -3,4 +3,4 @@
 #
 gen_crc32table
 crc32table.h
-
+oid_registry_data.c
diff --git a/lib/Kconfig b/lib/Kconfig
index bb94c1ba616a..4b31a46fb307 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -396,4 +396,9 @@ config SIGNATURE
 config LIBFDT
         bool
 
+config OID_REGISTRY
+        tristate
+        help
+          Enable fast lookup object identifier registry.
+
 endmenu
diff --git a/lib/Makefile b/lib/Makefile
index 3128e357e286..821a16229111 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -145,6 +145,8 @@ obj-$(CONFIG_INTERVAL_TREE_TEST) += interval_tree_test.o
 
 interval_tree_test-objs := interval_tree_test_main.o interval_tree.o
 
+obj-$(CONFIG_ASN1) += asn1_decoder.o
+
 hostprogs-y     := gen_crc32table
 clean-files     := crc32table.h
 
@@ -155,3 +157,19 @@ quiet_cmd_crc32 = GEN     $@
 
 $(obj)/crc32table.h: $(obj)/gen_crc32table
         $(call cmd,crc32)
+
+#
+# Build a fast OID lookip registry from include/linux/oid_registry.h
+#
+obj-$(CONFIG_OID_REGISTRY) += oid_registry.o
+
+$(obj)/oid_registry.c: $(obj)/oid_registry_data.c
+
+$(obj)/oid_registry_data.c: $(srctree)/include/linux/oid_registry.h \
+                            $(src)/build_OID_registry
+        $(call cmd,build_OID_registry)
+
+quiet_cmd_build_OID_registry = GEN     $@
+      cmd_build_OID_registry = perl $(srctree)/$(src)/build_OID_registry $< $@
+
+clean-files     += oid_registry_data.c
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
new file mode 100644
index 000000000000..de2c8b5a715b
--- /dev/null
+++ b/lib/asn1_decoder.c
@@ -0,0 +1,487 @@
+/* Decoder for ASN.1 BER/DER/CER encoded bytestream
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <linux/export.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/asn1_decoder.h>
+#include <linux/asn1_ber_bytecode.h>
+
+static const unsigned char asn1_op_lengths[ASN1_OP__NR] = {
+        /*                                      OPC TAG JMP ACT */
+        [ASN1_OP_MATCH]                         = 1 + 1,
+        [ASN1_OP_MATCH_OR_SKIP]                 = 1 + 1,
+        [ASN1_OP_MATCH_ACT]                     = 1 + 1     + 1,
+        [ASN1_OP_MATCH_ACT_OR_SKIP]             = 1 + 1     + 1,
+        [ASN1_OP_MATCH_JUMP]                    = 1 + 1 + 1,
+        [ASN1_OP_MATCH_JUMP_OR_SKIP]            = 1 + 1 + 1,
+        [ASN1_OP_MATCH_ANY]                     = 1,
+        [ASN1_OP_MATCH_ANY_ACT]                 = 1         + 1,
+        [ASN1_OP_COND_MATCH_OR_SKIP]            = 1 + 1,
+        [ASN1_OP_COND_MATCH_ACT_OR_SKIP]        = 1 + 1     + 1,
+        [ASN1_OP_COND_MATCH_JUMP_OR_SKIP]       = 1 + 1 + 1,
+        [ASN1_OP_COND_MATCH_ANY]                = 1,
+        [ASN1_OP_COND_MATCH_ANY_ACT]            = 1         + 1,
+        [ASN1_OP_COND_FAIL]                     = 1,
+        [ASN1_OP_COMPLETE]                      = 1,
+        [ASN1_OP_ACT]                           = 1         + 1,
+        [ASN1_OP_RETURN]                        = 1,
+        [ASN1_OP_END_SEQ]                       = 1,
+        [ASN1_OP_END_SEQ_OF]                    = 1     + 1,
+        [ASN1_OP_END_SET]                       = 1,
+        [ASN1_OP_END_SET_OF]                    = 1     + 1,
+        [ASN1_OP_END_SEQ_ACT]                   = 1         + 1,
+        [ASN1_OP_END_SEQ_OF_ACT]                = 1     + 1 + 1,
+        [ASN1_OP_END_SET_ACT]                   = 1         + 1,
+        [ASN1_OP_END_SET_OF_ACT]                = 1     + 1 + 1,
+};
+
+/*
+ * Find the length of an indefinite length object
+ * @data: The data buffer
+ * @datalen: The end of the innermost containing element in the buffer
+ * @_dp: The data parse cursor (updated before returning)
+ * @_len: Where to return the size of the element.
+ * @_errmsg: Where to return a pointer to an error message on error
+ */
+static int asn1_find_indefinite_length(const unsigned char *data, size_t datalen,
+                                       size_t *_dp, size_t *_len,
+                                       const char **_errmsg)
+{
+        unsigned char tag, tmp;
+        size_t dp = *_dp, len, n;
+        int indef_level = 1;
+
+next_tag:
+        if (unlikely(datalen - dp < 2)) {
+                if (datalen == dp)
+                        goto missing_eoc;
+                goto data_overrun_error;
+        }
+
+        /* Extract a tag from the data */
+        tag = data[dp++];
+        if (tag == 0) {
+                /* It appears to be an EOC. */
+                if (data[dp++] != 0)
+                        goto invalid_eoc;
+                if (--indef_level <= 0) {
+                        *_len = dp - *_dp;
+                        *_dp = dp;
+                        return 0;
+                }
+                goto next_tag;
+        }
+
+        if (unlikely((tag & 0x1f) == 0x1f)) {
+                do {
+                        if (unlikely(datalen - dp < 2))
+                                goto data_overrun_error;
+                        tmp = data[dp++];
+                } while (tmp & 0x80);
+        }
+
+        /* Extract the length */
+        len = data[dp++];
+        if (len < 0x7f) {
+                dp += len;
+                goto next_tag;
+        }
+
+        if (unlikely(len == 0x80)) {
+                /* Indefinite length */
+                if (unlikely((tag & ASN1_CONS_BIT) == ASN1_PRIM << 5))
+                        goto indefinite_len_primitive;
+                indef_level++;
+                goto next_tag;
+        }
+
+        n = len - 0x80;
+        if (unlikely(n > sizeof(size_t) - 1))
+                goto length_too_long;
+        if (unlikely(n > datalen - dp))
+                goto data_overrun_error;
+        for (len = 0; n > 0; n--) {
+                len <<= 8;
+                len |= data[dp++];
+        }
+        dp += len;
+        goto next_tag;
+
+length_too_long:
+        *_errmsg = "Unsupported length";
+        goto error;
+indefinite_len_primitive:
+        *_errmsg = "Indefinite len primitive not permitted";
+        goto error;
+invalid_eoc:
+        *_errmsg = "Invalid length EOC";
+        goto error;
+data_overrun_error:
+        *_errmsg = "Data overrun error";
+        goto error;
+missing_eoc:
+        *_errmsg = "Missing EOC in indefinite len cons";
+error:
+        *_dp = dp;
+        return -1;
+}
+
+/**
+ * asn1_ber_decoder - Decoder BER/DER/CER ASN.1 according to pattern
+ * @decoder: The decoder definition (produced by asn1_compiler)
+ * @context: The caller's context (to be passed to the action functions)
+ * @data: The encoded data
+ * @datasize: The size of the encoded data
+ *
+ * Decode BER/DER/CER encoded ASN.1 data according to a bytecode pattern
+ * produced by asn1_compiler.  Action functions are called on marked tags to
+ * allow the caller to retrieve significant data.
+ *
+ * LIMITATIONS:
+ *
+ * To keep down the amount of stack used by this function, the following limits
+ * have been imposed:
+ *
+ *  (1) This won't handle datalen > 65535 without increasing the size of the
+ *      cons stack elements and length_too_long checking.
+ *
+ *  (2) The stack of constructed types is 10 deep.  If the depth of non-leaf
+ *      constructed types exceeds this, the decode will fail.
+ *
+ *  (3) The SET type (not the SET OF type) isn't really supported as tracking
+ *      what members of the set have been seen is a pain.
+ */
+int asn1_ber_decoder(const struct asn1_decoder *decoder,
+                     void *context,
+                     const unsigned char *data,
+                     size_t datalen)
+{
+        const unsigned char *machine = decoder->machine;
+        const asn1_action_t *actions = decoder->actions;
+        size_t machlen = decoder->machlen;
+        enum asn1_opcode op;
+        unsigned char tag = 0, csp = 0, jsp = 0, optag = 0, hdr = 0;
+        const char *errmsg;
+        size_t pc = 0, dp = 0, tdp = 0, len = 0;
+        int ret;
+
+        unsigned char flags = 0;
+#define FLAG_INDEFINITE_LENGTH  0x01
+#define FLAG_MATCHED            0x02
+#define FLAG_CONS               0x20 /* Corresponds to CONS bit in the opcode tag
+                                      * - ie. whether or not we are going to parse
+                                      *   a compound type.
+                                      */
+
+#define NR_CONS_STACK 10
+        unsigned short cons_dp_stack[NR_CONS_STACK];
+        unsigned short cons_datalen_stack[NR_CONS_STACK];
+        unsigned char cons_hdrlen_stack[NR_CONS_STACK];
+#define NR_JUMP_STACK 10
+        unsigned char jump_stack[NR_JUMP_STACK];
+
+        if (datalen > 65535)
+                return -EMSGSIZE;
+
+next_op:
+        pr_debug("next_op: pc=\e[32m%zu\e[m/%zu dp=\e[33m%zu\e[m/%zu C=%d J=%d\n",
+                 pc, machlen, dp, datalen, csp, jsp);
+        if (unlikely(pc >= machlen))
+                goto machine_overrun_error;
+        op = machine[pc];
+        if (unlikely(pc + asn1_op_lengths[op] > machlen))
+                goto machine_overrun_error;
+
+        /* If this command is meant to match a tag, then do that before
+         * evaluating the command.
+         */
+        if (op <= ASN1_OP__MATCHES_TAG) {
+                unsigned char tmp;
+
+                /* Skip conditional matches if possible */
+                if ((op & ASN1_OP_MATCH__COND &&
+                     flags & FLAG_MATCHED) ||
+                    dp == datalen) {
+                        pc += asn1_op_lengths[op];
+                        goto next_op;
+                }
+
+                flags = 0;
+                hdr = 2;
+
+                /* Extract a tag from the data */
+                if (unlikely(dp >= datalen - 1))
+                        goto data_overrun_error;
+                tag = data[dp++];
+                if (unlikely((tag & 0x1f) == 0x1f))
+                        goto long_tag_not_supported;
+
+                if (op & ASN1_OP_MATCH__ANY) {
+                        pr_debug("- any %02x\n", tag);
+                } else {
+                        /* Extract the tag from the machine
+                         * - Either CONS or PRIM are permitted in the data if
+                         *   CONS is not set in the op stream, otherwise CONS
+                         *   is mandatory.
+                         */
+                        optag = machine[pc + 1];
+                        flags |= optag & FLAG_CONS;
+
+                        /* Determine whether the tag matched */
+                        tmp = optag ^ tag;
+                        tmp &= ~(optag & ASN1_CONS_BIT);
+                        pr_debug("- match? %02x %02x %02x\n", tag, optag, tmp);
+                        if (tmp != 0) {
+                                /* All odd-numbered tags are MATCH_OR_SKIP. */
+                                if (op & ASN1_OP_MATCH__SKIP) {
+                                        pc += asn1_op_lengths[op];
+                                        dp--;
+                                        goto next_op;
+                                }
+                                goto tag_mismatch;
+                        }
+                }
+                flags |= FLAG_MATCHED;
+
+                len = data[dp++];
+                if (len > 0x7f) {
+                        if (unlikely(len == 0x80)) {
+                                /* Indefinite length */
+                                if (unlikely(!(tag & ASN1_CONS_BIT)))
+                                        goto indefinite_len_primitive;
+                                flags |= FLAG_INDEFINITE_LENGTH;
+                                if (unlikely(2 > datalen - dp))
+                                        goto data_overrun_error;
+                        } else {
+                                int n = len - 0x80;
+                                if (unlikely(n > 2))
+                                        goto length_too_long;
+                                if (unlikely(dp >= datalen - n))
+                                        goto data_overrun_error;
+                                hdr += n;
+                                for (len = 0; n > 0; n--) {
+                                        len <<= 8;
+                                        len |= data[dp++];
+                                }
+                                if (unlikely(len > datalen - dp))
+                                        goto data_overrun_error;
+                        }
+                }
+
+                if (flags & FLAG_CONS) {
+                        /* For expected compound forms, we stack the positions
+                         * of the start and end of the data.
+                         */
+                        if (unlikely(csp >= NR_CONS_STACK))
+                                goto cons_stack_overflow;
+                        cons_dp_stack[csp] = dp;
+                        cons_hdrlen_stack[csp] = hdr;
+                        if (!(flags & FLAG_INDEFINITE_LENGTH)) {
+                                cons_datalen_stack[csp] = datalen;
+                                datalen = dp + len;
+                        } else {
+                                cons_datalen_stack[csp] = 0;
+                        }
+                        csp++;
+                }
+
+                pr_debug("- TAG: %02x %zu%s\n",
+                         tag, len, flags & FLAG_CONS ? " CONS" : "");
+                tdp = dp;
+        }
+
+        /* Decide how to handle the operation */
+        switch (op) {
+        case ASN1_OP_MATCH_ANY_ACT:
+        case ASN1_OP_COND_MATCH_ANY_ACT:
+                ret = actions[machine[pc + 1]](context, hdr, tag, data + dp, len);
+                if (ret < 0)
+                        return ret;
+                goto skip_data;
+
+        case ASN1_OP_MATCH_ACT:
+        case ASN1_OP_MATCH_ACT_OR_SKIP:
+        case ASN1_OP_COND_MATCH_ACT_OR_SKIP:
+                ret = actions[machine[pc + 2]](context, hdr, tag, data + dp, len);
+                if (ret < 0)
+                        return ret;
+                goto skip_data;
+
+        case ASN1_OP_MATCH:
+        case ASN1_OP_MATCH_OR_SKIP:
+        case ASN1_OP_MATCH_ANY:
+        case ASN1_OP_COND_MATCH_OR_SKIP:
+        case ASN1_OP_COND_MATCH_ANY:
+        skip_data:
+                if (!(flags & FLAG_CONS)) {
+                        if (flags & FLAG_INDEFINITE_LENGTH) {
+                                ret = asn1_find_indefinite_length(
+                                        data, datalen, &dp, &len, &errmsg);
+                                if (ret < 0)
+                                        goto error;
+                        } else {
+                                dp += len;
+                        }
+                        pr_debug("- LEAF: %zu\n", len);
+                }
+                pc += asn1_op_lengths[op];
+                goto next_op;
+
+        case ASN1_OP_MATCH_JUMP:
+        case ASN1_OP_MATCH_JUMP_OR_SKIP:
+        case ASN1_OP_COND_MATCH_JUMP_OR_SKIP:
+                pr_debug("- MATCH_JUMP\n");
+                if (unlikely(jsp == NR_JUMP_STACK))
+                        goto jump_stack_overflow;
+                jump_stack[jsp++] = pc + asn1_op_lengths[op];
+                pc = machine[pc + 2];
+                goto next_op;
+
+        case ASN1_OP_COND_FAIL:
+                if (unlikely(!(flags & FLAG_MATCHED)))
+                        goto tag_mismatch;
+                pc += asn1_op_lengths[op];
+                goto next_op;
+
+        case ASN1_OP_COMPLETE:
+                if (unlikely(jsp != 0 || csp != 0)) {
+                        pr_err("ASN.1 decoder error: Stacks not empty at completion (%u, %u)\n",
+                               jsp, csp);
+                        return -EBADMSG;
+                }
+                return 0;
+
+        case ASN1_OP_END_SET:
+        case ASN1_OP_END_SET_ACT:
+                if (unlikely(!(flags & FLAG_MATCHED)))
+                        goto tag_mismatch;
+        case ASN1_OP_END_SEQ:
+        case ASN1_OP_END_SET_OF:
+        case ASN1_OP_END_SEQ_OF:
+        case ASN1_OP_END_SEQ_ACT:
+        case ASN1_OP_END_SET_OF_ACT:
+        case ASN1_OP_END_SEQ_OF_ACT:
+                if (unlikely(csp <= 0))
+                        goto cons_stack_underflow;
+                csp--;
+                tdp = cons_dp_stack[csp];
+                hdr = cons_hdrlen_stack[csp];
+                len = datalen;
+                datalen = cons_datalen_stack[csp];
+                pr_debug("- end cons t=%zu dp=%zu l=%zu/%zu\n",
+                         tdp, dp, len, datalen);
+                if (datalen == 0) {
+                        /* Indefinite length - check for the EOC. */
+                        datalen = len;
+                        if (unlikely(datalen - dp < 2))
+                                goto data_overrun_error;
+                        if (data[dp++] != 0) {
+                                if (op & ASN1_OP_END__OF) {
+                                        dp--;
+                                        csp++;
+                                        pc = machine[pc + 1];
+                                        pr_debug("- continue\n");
+                                        goto next_op;
+                                }
+                                goto missing_eoc;
+                        }
+                        if (data[dp++] != 0)
+                                goto invalid_eoc;
+                        len = dp - tdp - 2;
+                } else {
+                        if (dp < len && (op & ASN1_OP_END__OF)) {
+                                datalen = len;
+                                csp++;
+                                pc = machine[pc + 1];
+                                pr_debug("- continue\n");
+                                goto next_op;
+                        }
+                        if (dp != len)
+                                goto cons_length_error;
+                        len -= tdp;
+                        pr_debug("- cons len l=%zu d=%zu\n", len, dp - tdp);
+                }
+
+                if (op & ASN1_OP_END__ACT) {
+                        unsigned char act;
+                        if (op & ASN1_OP_END__OF)
+                                act = machine[pc + 2];
+                        else
+                                act = machine[pc + 1];
+                        ret = actions[act](context, hdr, 0, data + tdp, len);
+                }
+                pc += asn1_op_lengths[op];
+                goto next_op;
+
+        case ASN1_OP_ACT:
+                ret = actions[machine[pc + 1]](context, hdr, tag, data + tdp, len);
+                pc += asn1_op_lengths[op];
+                goto next_op;
+
+        case ASN1_OP_RETURN:
+                if (unlikely(jsp <= 0))
+                        goto jump_stack_underflow;
+                pc = jump_stack[--jsp];
+                goto next_op;
+
+        default:
+                break;
+        }
+
+        /* Shouldn't reach here */
+        pr_err("ASN.1 decoder error: Found reserved opcode (%u)\n", op);
+        return -EBADMSG;
+
+data_overrun_error:
+        errmsg = "Data overrun error";
+        goto error;
+machine_overrun_error:
+        errmsg = "Machine overrun error";
+        goto error;
+jump_stack_underflow:
+        errmsg = "Jump stack underflow";
+        goto error;
+jump_stack_overflow:
+        errmsg = "Jump stack overflow";
+        goto error;
+cons_stack_underflow:
+        errmsg = "Cons stack underflow";
+        goto error;
+cons_stack_overflow:
+        errmsg = "Cons stack overflow";
+        goto error;
+cons_length_error:
+        errmsg = "Cons length error";
+        goto error;
+missing_eoc:
+        errmsg = "Missing EOC in indefinite len cons";
+        goto error;
+invalid_eoc:
+        errmsg = "Invalid length EOC";
+        goto error;
+length_too_long:
+        errmsg = "Unsupported length";
+        goto error;
+indefinite_len_primitive:
+        errmsg = "Indefinite len primitive not permitted";
+        goto error;
+tag_mismatch:
+        errmsg = "Unexpected tag";
+        goto error;
+long_tag_not_supported:
+        errmsg = "Long tag not supported";
+error:
+        pr_debug("\nASN1: %s [m=%zu d=%zu ot=%02x t=%02x l=%zu]\n",
+                 errmsg, pc, dp, optag, tag, len);
+        return -EBADMSG;
+}
+EXPORT_SYMBOL_GPL(asn1_ber_decoder);
diff --git a/lib/build_OID_registry b/lib/build_OID_registry
new file mode 100755
index 000000000000..dfbdaab81bc8
--- /dev/null
+++ b/lib/build_OID_registry
@@ -0,0 +1,209 @@
+#!/usr/bin/perl -w
+#
+# Build a static ASN.1 Object Identified (OID) registry
+#
+# Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+# Written by David Howells (dhowells@redhat.com)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public Licence
+# as published by the Free Software Foundation; either version
+# 2 of the Licence, or (at your option) any later version.
+#
+
+use strict;
+
+my @names = ();
+my @oids = ();
+
+if ($#ARGV != 1) {
+    print STDERR "Format: ", $0, " <in-h-file> <out-c-file>\n";
+    exit(2);
+}
+
+#
+# Open the file to read from
+#
+open IN_FILE, "<$ARGV[0]" || die;
+while (<IN_FILE>) {
+    chomp;
+    if (m!\s+OID_([a-zA-z][a-zA-Z0-9_]+),\s+/[*]\s+([012][.0-9]*)\s+[*]/!) {
+        push @names, $1;
+        push @oids, $2;
+    }
+}
+close IN_FILE || die;
+
+#
+# Open the files to write into
+#
+open C_FILE, ">$ARGV[1]" or die;
+print C_FILE "/*\n";
+print C_FILE " * Automatically generated by ", $0, ".  Do not edit\n";
+print C_FILE " */\n";
+
+#
+# Split the data up into separate lists and also determine the lengths of the
+# encoded data arrays.
+#
+my @indices = ();
+my @lengths = ();
+my $total_length = 0;
+
+print "Compiling ", $#names + 1, " OIDs\n";
+
+for (my $i = 0; $i <= $#names; $i++) {
+    my $name = $names[$i];
+    my $oid = $oids[$i];
+
+    my @components = split(/[.]/, $oid);
+
+    # Determine the encoded length of this OID
+    my $size = $#components;
+    for (my $loop = 2; $loop <= $#components; $loop++) {
+        my $c = $components[$loop];
+
+        # We will base128 encode the number
+        my $tmp = ($c == 0) ? 0 : int(log($c)/log(2));
+        $tmp = int($tmp / 7);
+        $size += $tmp;
+    }
+    push @lengths, $size;
+    push @indices, $total_length;
+    $total_length += $size;
+}
+
+#
+# Emit the look-up-by-OID index table
+#
+print C_FILE "\n";
+if ($total_length <= 255) {
+    print C_FILE "static const unsigned char oid_index[OID__NR + 1] = {\n";
+} else {
+    print C_FILE "static const unsigned short oid_index[OID__NR + 1] = {\n";
+}
+for (my $i = 0; $i <= $#names; $i++) {
+    print C_FILE "\t[OID_", $names[$i], "] = ", $indices[$i], ",\n"
+}
+print C_FILE "\t[OID__NR] = ", $total_length, "\n";
+print C_FILE "};\n";
+
+#
+# Encode the OIDs
+#
+my @encoded_oids = ();
+
+for (my $i = 0; $i <= $#names; $i++) {
+    my @octets = ();
+
+    my @components = split(/[.]/, $oids[$i]);
+
+    push @octets, $components[0] * 40 + $components[1];
+
+    for (my $loop = 2; $loop <= $#components; $loop++) {
+        my $c = $components[$loop];
+
+        # Base128 encode the number
+        my $tmp = ($c == 0) ? 0 : int(log($c)/log(2));
+        $tmp = int($tmp / 7);
+
+        for (; $tmp > 0; $tmp--) {
+            push @octets, (($c >> $tmp * 7) & 0x7f) | 0x80;
+        }
+        push @octets, $c & 0x7f;
+    }
+
+    push @encoded_oids, \@octets;
+}
+
+#
+# Create a hash value for each OID
+#
+my @hash_values = ();
+for (my $i = 0; $i <= $#names; $i++) {
+    my @octets = @{$encoded_oids[$i]};
+
+    my $hash = $#octets;
+    foreach (@octets) {
+        $hash += $_ * 33;
+    }
+
+    $hash = ($hash >> 24) ^ ($hash >> 16) ^ ($hash >> 8) ^ ($hash);
+
+    push @hash_values, $hash & 0xff;
+}
+
+#
+# Emit the OID data
+#
+print C_FILE "\n";
+print C_FILE "static const unsigned char oid_data[", $total_length, "] = {\n";
+for (my $i = 0; $i <= $#names; $i++) {
+    my @octets = @{$encoded_oids[$i]};
+    print C_FILE "\t";
+    print C_FILE $_, ", " foreach (@octets);
+    print C_FILE "\t// ", $names[$i];
+    print C_FILE "\n";
+}
+print C_FILE "};\n";
+
+#
+# Build the search index table (ordered by length then hash then content)
+#
+my @index_table = ( 0 .. $#names );
+
+@index_table = sort {
+    my @octets_a = @{$encoded_oids[$a]};
+    my @octets_b = @{$encoded_oids[$b]};
+
+    return $hash_values[$a] <=> $hash_values[$b]
+        if ($hash_values[$a] != $hash_values[$b]);
+    return $#octets_a <=> $#octets_b
+        if ($#octets_a != $#octets_b);
+    for (my $i = $#octets_a; $i >= 0; $i--) {
+        return $octets_a[$i] <=> $octets_b[$i]
+            if ($octets_a[$i] != $octets_b[$i]);
+    }
+    return 0;
+
+} @index_table;
+
+#
+# Emit the search index and hash value table
+#
+print C_FILE "\n";
+print C_FILE "static const struct {\n";
+print C_FILE "\tunsigned char hash;\n";
+if ($#names <= 255) {
+    print C_FILE "\tenum OID oid : 8;\n";
+} else {
+    print C_FILE "\tenum OID oid : 16;\n";
+}
+print C_FILE "} oid_search_table[OID__NR] = {\n";
+for (my $i = 0; $i <= $#names; $i++) {
+    my @octets = @{$encoded_oids[$index_table[$i]]};
+    printf(C_FILE "\t[%3u] = { %3u, OID_%-35s }, // ",
+           $i,
+           $hash_values[$index_table[$i]],
+           $names[$index_table[$i]]);
+    printf C_FILE "%02x", $_ foreach (@octets);
+    print C_FILE "\n";
+}
+print C_FILE "};\n";
+
+#
+# Emit the OID debugging name table
+#
+#print C_FILE "\n";
+#print C_FILE "const char *const oid_name_table[OID__NR + 1] = {\n";
+#
+#for (my $i = 0; $i <= $#names; $i++) {
+#    print C_FILE "\t\"", $names[$i], "\",\n"
+#}
+#print C_FILE "\t\"Unknown-OID\"\n";
+#print C_FILE "};\n";
+
+#
+# Polish off
+#
+close C_FILE or die;
diff --git a/lib/mpi/Makefile b/lib/mpi/Makefile
index 45ca90a8639c..019a68c90144 100644
--- a/lib/mpi/Makefile
+++ b/lib/mpi/Makefile
@@ -14,6 +14,7 @@ mpi-y = \
         generic_mpih-add1.o             \
         mpicoder.o                      \
         mpi-bit.o                       \
+        mpi-cmp.o                       \
         mpih-cmp.o                      \
         mpih-div.o                      \
         mpih-mul.o                      \
diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
index 29f98624ef93..678ce4f1e124 100644
--- a/lib/mpi/longlong.h
+++ b/lib/mpi/longlong.h
@@ -19,6 +19,8 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA. */
 
+#include <asm-generic/bitops/count_zeros.h>
+
 /* You have to define the following before including this file:
  *
  * UWtype -- An unsigned type, default type for operations (typically a "word")
@@ -146,12 +148,6 @@ do { \
         : "1" ((USItype)(n1)), \
                 "r" ((USItype)(n0)), \
                 "r" ((USItype)(d)))
-
-#define count_leading_zeros(count, x) \
-        __asm__ ("clz %0,%1" \
-        : "=r" ((USItype)(count)) \
-        : "r" ((USItype)(x)))
-#define COUNT_LEADING_ZEROS_0 32
 #endif /* __a29k__ */
 
 #if defined(__alpha) && W_TYPE_SIZE == 64
@@ -298,11 +294,6 @@ extern UDItype __udiv_qrnnd();
         : "1" ((USItype)(nh)), \
                 "0" ((USItype)(nl)), \
                 "g" ((USItype)(d)))
-#define count_leading_zeros(count, x) \
-        __asm__ ("bsch/1 %1,%0" \
-        : "=g" (count) \
-        : "g" ((USItype)(x)), \
-             "0" ((USItype)0))
 #endif
 
 /***************************************
@@ -354,27 +345,6 @@ do { USItype __r; \
 } while (0)
 extern USItype __udiv_qrnnd();
 #endif /* LONGLONG_STANDALONE */
-#define count_leading_zeros(count, x) \
-do { \
-        USItype __tmp; \
-        __asm__ ( \
-        "ldi             1,%0\n" \
-        "extru,=        %1,15,16,%%r0  ; Bits 31..16 zero?\n" \
-        "extru,tr       %1,15,16,%1    ; No.  Shift down, skip add.\n" \
-        "ldo            16(%0),%0      ; Yes.   Perform add.\n" \
-        "extru,=        %1,23,8,%%r0   ; Bits 15..8 zero?\n" \
-        "extru,tr       %1,23,8,%1     ; No.  Shift down, skip add.\n" \
-        "ldo            8(%0),%0       ; Yes.   Perform add.\n" \
-        "extru,=        %1,27,4,%%r0   ; Bits 7..4 zero?\n" \
-        "extru,tr       %1,27,4,%1     ; No.  Shift down, skip add.\n" \
-        "ldo            4(%0),%0       ; Yes.   Perform add.\n" \
-        "extru,=        %1,29,2,%%r0   ; Bits 3..2 zero?\n" \
-        "extru,tr       %1,29,2,%1     ; No.  Shift down, skip add.\n" \
-        "ldo            2(%0),%0       ; Yes.   Perform add.\n" \
-        "extru          %1,30,1,%1     ; Extract bit 1.\n" \
-        "sub            %0,%1,%0       ; Subtract it.              " \
-        : "=r" (count), "=r" (__tmp) : "1" (x)); \
-} while (0)
 #endif /* hppa */
 
 /***************************************
@@ -457,15 +427,6 @@ do { \
         : "0" ((USItype)(n0)), \
              "1" ((USItype)(n1)), \
              "rm" ((USItype)(d)))
-#define count_leading_zeros(count, x) \
-do { \
-        USItype __cbtmp; \
-        __asm__ ("bsrl %1,%0" \
-        : "=r" (__cbtmp) : "rm" ((USItype)(x))); \
-        (count) = __cbtmp ^ 31; \
-} while (0)
-#define count_trailing_zeros(count, x) \
-        __asm__ ("bsfl %1,%0" : "=r" (count) : "rm" ((USItype)(x)))
 #ifndef UMUL_TIME
 #define UMUL_TIME 40
 #endif
@@ -536,15 +497,6 @@ do { \
              "dI" ((USItype)(d))); \
         (r) = __rq.__i.__l; (q) = __rq.__i.__h; \
 } while (0)
-#define count_leading_zeros(count, x) \
-do { \
-        USItype __cbtmp; \
-        __asm__ ("scanbit %1,%0" \
-        : "=r" (__cbtmp) \
-        : "r" ((USItype)(x))); \
-        (count) = __cbtmp ^ 31; \
-} while (0)
-#define COUNT_LEADING_ZEROS_0 (-32)     /* sic */
 #if defined(__i960mx)           /* what is the proper symbol to test??? */
 #define rshift_rhlc(r, h, l, c) \
 do { \
@@ -603,11 +555,6 @@ do { \
         : "0" ((USItype)(n0)), \
              "1" ((USItype)(n1)), \
              "dmi" ((USItype)(d)))
-#define count_leading_zeros(count, x) \
-        __asm__ ("bfffo %1{%b2:%b2},%0" \
-        : "=d" ((USItype)(count)) \
-        : "od" ((USItype)(x)), "n" (0))
-#define COUNT_LEADING_ZEROS_0 32
 #else /* not mc68020 */
 #define umul_ppmm(xh, xl, a, b) \
 do { USItype __umul_tmp1, __umul_tmp2; \
@@ -664,15 +611,6 @@ do { USItype __umul_tmp1, __umul_tmp2; \
              "rJ" ((USItype)(bh)), \
              "rJ" ((USItype)(al)), \
              "rJ" ((USItype)(bl)))
-#define count_leading_zeros(count, x) \
-do { \
-        USItype __cbtmp; \
-        __asm__ ("ff1 %0,%1" \
-        : "=r" (__cbtmp) \
-        : "r" ((USItype)(x))); \
-        (count) = __cbtmp ^ 31; \
-} while (0)
-#define COUNT_LEADING_ZEROS_0 63        /* sic */
 #if defined(__m88110__)
 #define umul_ppmm(wh, wl, u, v) \
 do { \
@@ -779,12 +717,6 @@ do { \
         : "0" (__xx.__ll), \
              "g" ((USItype)(d))); \
         (r) = __xx.__i.__l; (q) = __xx.__i.__h; })
-#define count_trailing_zeros(count, x) \
-do { \
-        __asm__("ffsd      %2,%0" \
-        : "=r"((USItype) (count)) \
-        : "0"((USItype) 0), "r"((USItype) (x))); \
-        } while (0)
 #endif /* __ns32000__ */
 
 /***************************************
@@ -855,11 +787,6 @@ do { \
                 "rI" ((USItype)(al)), \
                 "r" ((USItype)(bl))); \
 } while (0)
-#define count_leading_zeros(count, x) \
-        __asm__ ("{cntlz|cntlzw} %0,%1" \
-        : "=r" ((USItype)(count)) \
-        : "r" ((USItype)(x)))
-#define COUNT_LEADING_ZEROS_0 32
 #if defined(_ARCH_PPC)
 #define umul_ppmm(ph, pl, m0, m1) \
 do { \
@@ -1001,19 +928,6 @@ do { \
 } while (0)
 #define UMUL_TIME 20
 #define UDIV_TIME 200
-#define count_leading_zeros(count, x) \
-do { \
-        if ((x) >= 0x10000) \
-                __asm__ ("clz     %0,%1" \
-                : "=r" ((USItype)(count)) \
-                : "r" ((USItype)(x) >> 16)); \
-        else { \
-                __asm__ ("clz   %0,%1" \
-                : "=r" ((USItype)(count)) \
-                : "r" ((USItype)(x))); \
-                (count) += 16; \
-        } \
-} while (0)
 #endif /* RT/ROMP */
 
 /***************************************
@@ -1142,13 +1056,6 @@ do { \
         "rI" ((USItype)(d)) \
         : "%g1" __AND_CLOBBER_CC)
 #define UDIV_TIME 37
-#define count_leading_zeros(count, x) \
-        __asm__ ("scan %1,0,%0" \
-        : "=r" ((USItype)(x)) \
-        : "r" ((USItype)(count)))
-/* Early sparclites return 63 for an argument of 0, but they warn that future
-        implementations might change this.  Therefore, leave COUNT_LEADING_ZEROS_0
-        undefined.  */
 #endif /* __sparclite__ */
 #endif /* __sparc_v8__ */
         /* Default to sparc v7 versions of umul_ppmm and udiv_qrnnd.  */
@@ -1454,47 +1361,6 @@ do { \
 #define udiv_qrnnd __udiv_qrnnd_c
 #endif
 
-#undef count_leading_zeros
-#if !defined(count_leading_zeros)
-        extern
-#ifdef __STDC__
-                        const
-#endif
-                        unsigned char __clz_tab[];
-#define count_leading_zeros(count, x) \
-do { \
-        UWtype __xr = (x); \
-        UWtype __a; \
-        \
-        if (W_TYPE_SIZE <= 32) { \
-                __a = __xr < ((UWtype) 1 << 2*__BITS4) \
-                ? (__xr < ((UWtype) 1 << __BITS4) ? 0 : __BITS4) \
-                : (__xr < ((UWtype) 1 << 3*__BITS4) ?  2*__BITS4 : 3*__BITS4); \
-        } \
-        else { \
-                for (__a = W_TYPE_SIZE - 8; __a > 0; __a -= 8) \
-                        if (((__xr >> __a) & 0xff) != 0) \
-                                break; \
-        } \
-        \
-        (count) = W_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a); \
-} while (0)
-        /* This version gives a well-defined value for zero. */
-#define COUNT_LEADING_ZEROS_0 W_TYPE_SIZE
-#endif
-
-#if !defined(count_trailing_zeros)
-/* Define count_trailing_zeros using count_leading_zeros.  The latter might be
-        defined in asm, but if it is not, the C version above is good enough.  */
-#define count_trailing_zeros(count, x) \
-do { \
-        UWtype __ctz_x = (x); \
-        UWtype __ctz_c; \
-        count_leading_zeros(__ctz_c, __ctz_x & -__ctz_x); \
-        (count) = W_TYPE_SIZE - 1 - __ctz_c; \
-} while (0)
-#endif
-
 #ifndef UDIV_NEEDS_NORMALIZATION
 #define UDIV_NEEDS_NORMALIZATION 0
 #endif
diff --git a/lib/mpi/mpi-bit.c b/lib/mpi/mpi-bit.c
index 568724804f29..503537e08436 100644
--- a/lib/mpi/mpi-bit.c
+++ b/lib/mpi/mpi-bit.c
@@ -45,7 +45,7 @@ unsigned mpi_get_nbits(MPI a)
         if (a->nlimbs) {
                 mpi_limb_t alimb = a->d[a->nlimbs - 1];
                 if (alimb)
-                        count_leading_zeros(n, alimb);
+                        n = count_leading_zeros(alimb);
                 else
                         n = BITS_PER_MPI_LIMB;
                 n = BITS_PER_MPI_LIMB - n + (a->nlimbs - 1) * BITS_PER_MPI_LIMB;
diff --git a/lib/mpi/mpi-cmp.c b/lib/mpi/mpi-cmp.c
new file mode 100644
index 000000000000..1871e7b61ca0
--- /dev/null
+++ b/lib/mpi/mpi-cmp.c
@@ -0,0 +1,70 @@
+/* mpi-cmp.c  -  MPI functions
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "mpi-internal.h"
+
+int mpi_cmp_ui(MPI u, unsigned long v)
+{
+        mpi_limb_t limb = v;
+
+        mpi_normalize(u);
+        if (!u->nlimbs && !limb)
+                return 0;
+        if (u->sign)
+                return -1;
+        if (u->nlimbs > 1)
+                return 1;
+
+        if (u->d[0] == limb)
+                return 0;
+        else if (u->d[0] > limb)
+                return 1;
+        else
+                return -1;
+}
+EXPORT_SYMBOL_GPL(mpi_cmp_ui);
+
+int mpi_cmp(MPI u, MPI v)
+{
+        mpi_size_t usize, vsize;
+        int cmp;
+
+        mpi_normalize(u);
+        mpi_normalize(v);
+        usize = u->nlimbs;
+        vsize = v->nlimbs;
+        if (!u->sign && v->sign)
+                return 1;
+        if (u->sign && !v->sign)
+                return -1;
+        if (usize != vsize && !u->sign && !v->sign)
+                return usize - vsize;
+        if (usize != vsize && u->sign && v->sign)
+                return vsize + usize;
+        if (!usize)
+                return 0;
+        cmp = mpihelp_cmp(u->d, v->d, usize);
+        if (!cmp)
+                return 0;
+        if ((cmp < 0 ? 1 : 0) == (u->sign ? 1 : 0))
+                return 1;
+        return -1;
+}
+EXPORT_SYMBOL_GPL(mpi_cmp);
diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c
index 67f3e79af914..5464c8744ea9 100644
--- a/lib/mpi/mpi-pow.c
+++ b/lib/mpi/mpi-pow.c
@@ -77,7 +77,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
         mp = mp_marker = mpi_alloc_limb_space(msize);
         if (!mp)
                 goto enomem;
-        count_leading_zeros(mod_shift_cnt, mod->d[msize - 1]);
+        mod_shift_cnt = count_leading_zeros(mod->d[msize - 1]);
         if (mod_shift_cnt)
                 mpihelp_lshift(mp, mod->d, msize, mod_shift_cnt);
         else
@@ -169,7 +169,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
 
                 i = esize - 1;
                 e = ep[i];
-                count_leading_zeros(c, e);
+                c = count_leading_zeros(e);
                 e = (e << c) << 1;      /* shift the exp bits to the left, lose msb */
                 c = BITS_PER_MPI_LIMB - 1 - c;
 
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c
index f0fa65995800..3962b7f7fe3f 100644
--- a/lib/mpi/mpicoder.c
+++ b/lib/mpi/mpicoder.c
@@ -18,10 +18,65 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
+#include <linux/bitops.h>
+#include <asm-generic/bitops/count_zeros.h>
 #include "mpi-internal.h"
 
 #define MAX_EXTERN_MPI_BITS 16384
 
+/**
+ * mpi_read_raw_data - Read a raw byte stream as a positive integer
+ * @xbuffer: The data to read
+ * @nbytes: The amount of data to read
+ */
+MPI mpi_read_raw_data(const void *xbuffer, size_t nbytes)
+{
+        const uint8_t *buffer = xbuffer;
+        int i, j;
+        unsigned nbits, nlimbs;
+        mpi_limb_t a;
+        MPI val = NULL;
+
+        while (nbytes >= 0 && buffer[0] == 0) {
+                buffer++;
+                nbytes--;
+        }
+
+        nbits = nbytes * 8;
+        if (nbits > MAX_EXTERN_MPI_BITS) {
+                pr_info("MPI: mpi too large (%u bits)\n", nbits);
+                return NULL;
+        }
+        if (nbytes > 0)
+                nbits -= count_leading_zeros(buffer[0]);
+        else
+                nbits = 0;
+
+        nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;
+        val = mpi_alloc(nlimbs);
+        if (!val)
+                return NULL;
+        val->nbits = nbits;
+        val->sign = 0;
+        val->nlimbs = nlimbs;
+
+        if (nbytes > 0) {
+                i = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
+                i %= BYTES_PER_MPI_LIMB;
+                for (j = nlimbs; j > 0; j--) {
+                        a = 0;
+                        for (; i < BYTES_PER_MPI_LIMB; i++) {
+                                a <<= 8;
+                                a |= *buffer++;
+                        }
+                        i = 0;
+                        val->d[j - 1] = a;
+                }
+        }
+        return val;
+}
+EXPORT_SYMBOL_GPL(mpi_read_raw_data);
+
 MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)
 {
         const uint8_t *buffer = xbuffer;
diff --git a/lib/oid_registry.c b/lib/oid_registry.c
new file mode 100644
index 000000000000..d8de11f45908
--- /dev/null
+++ b/lib/oid_registry.c
@@ -0,0 +1,170 @@
+/* ASN.1 Object identifier (OID) registry
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <linux/export.h>
+#include <linux/oid_registry.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/bug.h>
+#include "oid_registry_data.c"
+
+/**
+ * look_up_OID - Find an OID registration for the specified data
+ * @data: Binary representation of the OID
+ * @datasize: Size of the binary representation
+ */
+enum OID look_up_OID(const void *data, size_t datasize)
+{
+        const unsigned char *octets = data;
+        enum OID oid;
+        unsigned char xhash;
+        unsigned i, j, k, hash;
+        size_t len;
+
+        /* Hash the OID data */
+        hash = datasize - 1;
+
+        for (i = 0; i < datasize; i++)
+                hash += octets[i] * 33;
+        hash = (hash >> 24) ^ (hash >> 16) ^ (hash >> 8) ^ hash;
+        hash &= 0xff;
+
+        /* Binary search the OID registry.  OIDs are stored in ascending order
+         * of hash value then ascending order of size and then in ascending
+         * order of reverse value.
+         */
+        i = 0;
+        k = OID__NR;
+        while (i < k) {
+                j = (i + k) / 2;
+
+                xhash = oid_search_table[j].hash;
+                if (xhash > hash) {
+                        k = j;
+                        continue;
+                }
+                if (xhash < hash) {
+                        i = j + 1;
+                        continue;
+                }
+
+                oid = oid_search_table[j].oid;
+                len = oid_index[oid + 1] - oid_index[oid];
+                if (len > datasize) {
+                        k = j;
+                        continue;
+                }
+                if (len < datasize) {
+                        i = j + 1;
+                        continue;
+                }
+
+                /* Variation is most likely to be at the tail end of the
+                 * OID, so do the comparison in reverse.
+                 */
+                while (len > 0) {
+                        unsigned char a = oid_data[oid_index[oid] + --len];
+                        unsigned char b = octets[len];
+                        if (a > b) {
+                                k = j;
+                                goto next;
+                        }
+                        if (a < b) {
+                                i = j + 1;
+                                goto next;
+                        }
+                }
+                return oid;
+        next:
+                ;
+        }
+
+        return OID__NR;
+}
+EXPORT_SYMBOL_GPL(look_up_OID);
+
+/*
+ * sprint_OID - Print an Object Identifier into a buffer
+ * @data: The encoded OID to print
+ * @datasize: The size of the encoded OID
+ * @buffer: The buffer to render into
+ * @bufsize: The size of the buffer
+ *
+ * The OID is rendered into the buffer in "a.b.c.d" format and the number of
+ * bytes is returned.  -EBADMSG is returned if the data could not be intepreted
+ * and -ENOBUFS if the buffer was too small.
+ */
+int sprint_oid(const void *data, size_t datasize, char *buffer, size_t bufsize)
+{
+        const unsigned char *v = data, *end = v + datasize;
+        unsigned long num;
+        unsigned char n;
+        size_t ret;
+        int count;
+
+        if (v >= end)
+                return -EBADMSG;
+
+        n = *v++;
+        ret = count = snprintf(buffer, bufsize, "%u.%u", n / 40, n % 40);
+        buffer += count;
+        bufsize -= count;
+        if (bufsize == 0)
+                return -ENOBUFS;
+
+        while (v < end) {
+                num = 0;
+                n = *v++;
+                if (!(n & 0x80)) {
+                        num = n;
+                } else {
+                        num = n & 0x7f;
+                        do {
+                                if (v >= end)
+                                        return -EBADMSG;
+                                n = *v++;
+                                num <<= 7;
+                                num |= n & 0x7f;
+                        } while (n & 0x80);
+                }
+                ret += count = snprintf(buffer, bufsize, ".%lu", num);
+                buffer += count;
+                bufsize -= count;
+                if (bufsize == 0)
+                        return -ENOBUFS;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(sprint_oid);
+
+/**
+ * sprint_OID - Print an Object Identifier into a buffer
+ * @oid: The OID to print
+ * @buffer: The buffer to render into
+ * @bufsize: The size of the buffer
+ *
+ * The OID is rendered into the buffer in "a.b.c.d" format and the number of
+ * bytes is returned.
+ */
+int sprint_OID(enum OID oid, char *buffer, size_t bufsize)
+{
+        int ret;
+
+        BUG_ON(oid >= OID__NR);
+
+        ret = sprint_oid(oid_data + oid_index[oid],
+                         oid_index[oid + 1] - oid_index[oid],
+                         buffer, bufsize);
+        BUG_ON(ret == -EBADMSG);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(sprint_OID);
diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index 9da7fdd3cd8a..af14cb425164 100644
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -423,14 +423,15 @@ int ceph_encrypt2(struct ceph_crypto_key *secret, void *dst, size_t *dst_len,
         }
 }
 
-int ceph_key_instantiate(struct key *key, const void *data, size_t datalen)
+int ceph_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
 {
         struct ceph_crypto_key *ckey;
+        size_t datalen = prep->datalen;
         int ret;
         void *p;
 
         ret = -EINVAL;
-        if (datalen <= 0 || datalen > 32767 || !data)
+        if (datalen <= 0 || datalen > 32767 || !prep->data)
                 goto err;
 
         ret = key_payload_reserve(key, datalen);
@@ -443,8 +444,8 @@ int ceph_key_instantiate(struct key *key, const void *data, size_t datalen)
                 goto err;
 
         /* TODO ceph_crypto_key_decode should really take const input */
-        p = (void *)data;
-        ret = ceph_crypto_key_decode(ckey, &p, (char*)data+datalen);
+        p = (void *)prep->data;
+        ret = ceph_crypto_key_decode(ckey, &p, (char*)prep->data+datalen);
         if (ret < 0)
                 goto err_ckey;
 
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index 9807945a56d9..8aa4b1115384 100644
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -59,13 +59,13 @@ const struct cred *dns_resolver_cache;
  *        "ip1,ip2,...#foo=bar"
  */
 static int
-dns_resolver_instantiate(struct key *key, const void *_data, size_t datalen)
+dns_resolver_instantiate(struct key *key, struct key_preparsed_payload *prep)
 {
         struct user_key_payload *upayload;
         unsigned long derrno;
         int ret;
-        size_t result_len = 0;
-        const char *data = _data, *end, *opt;
+        size_t datalen = prep->datalen, result_len = 0;
+        const char *data = prep->data, *end, *opt;
 
         kenter("%%%d,%s,'%*.*s',%zu",
                key->serial, key->description,
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c
index 011d2384b115..7633a752c65e 100644
--- a/net/rxrpc/ar-key.c
+++ b/net/rxrpc/ar-key.c
@@ -26,8 +26,8 @@
 #include "ar-internal.h"
 
 static int rxrpc_vet_description_s(const char *);
-static int rxrpc_instantiate(struct key *, const void *, size_t);
-static int rxrpc_instantiate_s(struct key *, const void *, size_t);
+static int rxrpc_instantiate(struct key *, struct key_preparsed_payload *);
+static int rxrpc_instantiate_s(struct key *, struct key_preparsed_payload *);
 static void rxrpc_destroy(struct key *);
 static void rxrpc_destroy_s(struct key *);
 static void rxrpc_describe(const struct key *, struct seq_file *);
@@ -678,7 +678,7 @@ error:
  *
  * if no data is provided, then a no-security key is made
  */
-static int rxrpc_instantiate(struct key *key, const void *data, size_t datalen)
+static int rxrpc_instantiate(struct key *key, struct key_preparsed_payload *prep)
 {
         const struct rxrpc_key_data_v1 *v1;
         struct rxrpc_key_token *token, **pp;
@@ -686,26 +686,26 @@ static int rxrpc_instantiate(struct key *key, const void *data, size_t datalen)
         u32 kver;
         int ret;
 
-        _enter("{%x},,%zu", key_serial(key), datalen);
+        _enter("{%x},,%zu", key_serial(key), prep->datalen);
 
         /* handle a no-security key */
-        if (!data && datalen == 0)
+        if (!prep->data && prep->datalen == 0)
                 return 0;
 
         /* determine if the XDR payload format is being used */
-        if (datalen > 7 * 4) {
-                ret = rxrpc_instantiate_xdr(key, data, datalen);
+        if (prep->datalen > 7 * 4) {
+                ret = rxrpc_instantiate_xdr(key, prep->data, prep->datalen);
                 if (ret != -EPROTO)
                         return ret;
         }
 
         /* get the key interface version number */
         ret = -EINVAL;
-        if (datalen <= 4 || !data)
+        if (prep->datalen <= 4 || !prep->data)
                 goto error;
-        memcpy(&kver, data, sizeof(kver));
-        data += sizeof(kver);
-        datalen -= sizeof(kver);
+        memcpy(&kver, prep->data, sizeof(kver));
+        prep->data += sizeof(kver);
+        prep->datalen -= sizeof(kver);
 
         _debug("KEY I/F VERSION: %u", kver);
 
@@ -715,11 +715,11 @@ static int rxrpc_instantiate(struct key *key, const void *data, size_t datalen)
 
         /* deal with a version 1 key */
         ret = -EINVAL;
-        if (datalen < sizeof(*v1))
+        if (prep->datalen < sizeof(*v1))
                 goto error;
 
-        v1 = data;
-        if (datalen != sizeof(*v1) + v1->ticket_length)
+        v1 = prep->data;
+        if (prep->datalen != sizeof(*v1) + v1->ticket_length)
                 goto error;
 
         _debug("SCIX: %u", v1->security_index);
@@ -784,17 +784,17 @@ error:
  * instantiate a server secret key
  * data should be a pointer to the 8-byte secret key
  */
-static int rxrpc_instantiate_s(struct key *key, const void *data,
-                               size_t datalen)
+static int rxrpc_instantiate_s(struct key *key,
+                               struct key_preparsed_payload *prep)
 {
         struct crypto_blkcipher *ci;
 
-        _enter("{%x},,%zu", key_serial(key), datalen);
+        _enter("{%x},,%zu", key_serial(key), prep->datalen);
 
-        if (datalen != 8)
+        if (prep->datalen != 8)
                 return -EINVAL;
 
-        memcpy(&key->type_data, data, 8);
+        memcpy(&key->type_data, prep->data, 8);
 
         ci = crypto_alloc_blkcipher("pcbc(des)", 0, CRYPTO_ALG_ASYNC);
         if (IS_ERR(ci)) {
@@ -802,7 +802,7 @@ static int rxrpc_instantiate_s(struct key *key, const void *data,
                 return PTR_ERR(ci);
         }
 
-        if (crypto_blkcipher_setkey(ci, data, 8) < 0)
+        if (crypto_blkcipher_setkey(ci, prep->data, 8) < 0)
                 BUG();
 
         key->payload.data = ci;
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 65f362d931b5..fb070fa1038f 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -10,3 +10,4 @@ ihex2fw
 recordmcount
 docproc
 sortextable
+asn1_compiler
diff --git a/scripts/Makefile b/scripts/Makefile
index a55b0067758a..01e7adb838d9 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -16,8 +16,10 @@ hostprogs-$(CONFIG_VT)           += conmakehash
 hostprogs-$(CONFIG_IKCONFIG)     += bin2c
 hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
 hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable
+hostprogs-$(CONFIG_ASN1)         += asn1_compiler
 
 HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
+HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
 
 always          := $(hostprogs-y) $(hostprogs-m)
 
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index ff1720d28d0c..0e801c3cdaf8 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -354,6 +354,17 @@ quiet_cmd_cpp_lds_S = LDS     $@
 $(obj)/%.lds: $(src)/%.lds.S FORCE
         $(call if_changed_dep,cpp_lds_S)
 
+# ASN.1 grammar
+# ---------------------------------------------------------------------------
+quiet_cmd_asn1_compiler = ASN.1   $@
+      cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \
+                                $(subst .h,.c,$@) $(subst .c,.h,$@)
+
+.PRECIOUS: $(objtree)/$(obj)/%-asn1.c $(objtree)/$(obj)/%-asn1.h
+
+$(obj)/%-asn1.c $(obj)/%-asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler
+        $(call cmd,asn1_compiler)
+
 # Build the compiled-in targets
 # ---------------------------------------------------------------------------
 
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index a1cb0222ebe6..002089141df4 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -14,7 +14,8 @@
 # 3)  create one <module>.mod.c file pr. module
 # 4)  create one Module.symvers file with CRC for all exported symbols
 # 5) compile all <module>.mod.c files
-# 6) final link of the module to a <module.ko> file
+# 6) final link of the module to a <module.ko> (or <module.unsigned>) file
+# 7) signs the modules to a <module.ko> file
 
 # Step 3 is used to place certain information in the module's ELF
 # section, including information such as:
@@ -32,6 +33,8 @@
 # Step 4 is solely used to allow module versioning in external modules,
 # where the CRC of each module is retrieved from the Module.symvers file.
 
+# Step 7 is dependent on CONFIG_MODULE_SIG being enabled.
+
 # KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined
 # symbols in the final module linking stage
 # KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules.
@@ -116,6 +119,7 @@ $(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE
 targets += $(modules:.ko=.mod.o)
 
 # Step 6), final link of the modules
+ifneq ($(CONFIG_MODULE_SIG),y)
 quiet_cmd_ld_ko_o = LD [M]  $@
       cmd_ld_ko_o = $(LD) -r $(LDFLAGS)                                 \
                              $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \
@@ -125,7 +129,78 @@ $(modules): %.ko :%.o %.mod.o FORCE
         $(call if_changed,ld_ko_o)
 
 targets += $(modules)
+else
+quiet_cmd_ld_ko_unsigned_o = LD [M]  $@
+      cmd_ld_ko_unsigned_o =                                            \
+                $(LD) -r $(LDFLAGS)                                     \
+                         $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE)     \
+                         -o $@ $(filter-out FORCE,$^)                   \
+                $(if $(AFTER_LINK),; $(AFTER_LINK))
+
+$(modules:.ko=.ko.unsigned): %.ko.unsigned :%.o %.mod.o FORCE
+        $(call if_changed,ld_ko_unsigned_o)
+
+targets += $(modules:.ko=.ko.unsigned)
+
+# Step 7), sign the modules
+MODSECKEY = ./signing_key.priv
+MODPUBKEY = ./signing_key.x509
+
+ifeq ($(wildcard $(MODSECKEY))+$(wildcard $(MODPUBKEY)),$(MODSECKEY)+$(MODPUBKEY))
+ifeq ($(KBUILD_SRC),)
+        # no O= is being used
+        SCRIPTS_DIR := scripts
+else
+        SCRIPTS_DIR := $(KBUILD_SRC)/scripts
+endif
+SIGN_MODULES := 1
+else
+SIGN_MODULES := 0
+endif
+
+# only sign if it's an in-tree module
+ifneq ($(KBUILD_EXTMOD),)
+SIGN_MODULES := 0
+endif
 
+# We strip the module as best we can - note that using both strip and eu-strip
+# results in a smaller module than using either alone.
+EU_STRIP = $(shell which eu-strip || echo true)
+
+quiet_cmd_sign_ko_stripped_ko_unsigned = STRIP [M] $@
+      cmd_sign_ko_stripped_ko_unsigned = \
+                cp $< $@ && \
+                strip -x -g $@ && \
+                $(EU_STRIP) $@
+
+ifeq ($(SIGN_MODULES),1)
+
+quiet_cmd_genkeyid = GENKEYID $@
+      cmd_genkeyid = \
+                perl $(SCRIPTS_DIR)/x509keyid $< $<.signer $<.keyid
+
+%.signer %.keyid: %
+        $(call if_changed,genkeyid)
+
+KEYRING_DEP := $(MODSECKEY) $(MODPUBKEY) $(MODPUBKEY).signer $(MODPUBKEY).keyid
+quiet_cmd_sign_ko_ko_stripped = SIGN [M] $@
+      cmd_sign_ko_ko_stripped = \
+                sh $(SCRIPTS_DIR)/sign-file $(MODSECKEY) $(MODPUBKEY) $< $@
+else
+KEYRING_DEP :=
+quiet_cmd_sign_ko_ko_unsigned = NO SIGN [M] $@
+      cmd_sign_ko_ko_unsigned = \
+                cp $< $@
+endif
+
+$(modules): %.ko :%.ko.stripped $(KEYRING_DEP) FORCE
+        $(call if_changed,sign_ko_ko_stripped)
+
+$(patsubst %.ko,%.ko.stripped,$(modules)): %.ko.stripped :%.ko.unsigned FORCE
+        $(call if_changed,sign_ko_stripped_ko_unsigned)
+
+targets += $(modules)
+endif
 
 # Add FORCE to the prequisites of a target to force it to be always rebuilt.
 # ---------------------------------------------------------------------------
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c
new file mode 100644
index 000000000000..db0e5cd34c70
--- /dev/null
+++ b/scripts/asn1_compiler.c
@@ -0,0 +1,1545 @@
+/* Simplified ASN.1 notation parser
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <linux/asn1_ber_bytecode.h>
+
+enum token_type {
+        DIRECTIVE_ABSENT,
+        DIRECTIVE_ALL,
+        DIRECTIVE_ANY,
+        DIRECTIVE_APPLICATION,
+        DIRECTIVE_AUTOMATIC,
+        DIRECTIVE_BEGIN,
+        DIRECTIVE_BIT,
+        DIRECTIVE_BMPString,
+        DIRECTIVE_BOOLEAN,
+        DIRECTIVE_BY,
+        DIRECTIVE_CHARACTER,
+        DIRECTIVE_CHOICE,
+        DIRECTIVE_CLASS,
+        DIRECTIVE_COMPONENT,
+        DIRECTIVE_COMPONENTS,
+        DIRECTIVE_CONSTRAINED,
+        DIRECTIVE_CONTAINING,
+        DIRECTIVE_DEFAULT,
+        DIRECTIVE_DEFINED,
+        DIRECTIVE_DEFINITIONS,
+        DIRECTIVE_EMBEDDED,
+        DIRECTIVE_ENCODED,
+        DIRECTIVE_ENCODING_CONTROL,
+        DIRECTIVE_END,
+        DIRECTIVE_ENUMERATED,
+        DIRECTIVE_EXCEPT,
+        DIRECTIVE_EXPLICIT,
+        DIRECTIVE_EXPORTS,
+        DIRECTIVE_EXTENSIBILITY,
+        DIRECTIVE_EXTERNAL,
+        DIRECTIVE_FALSE,
+        DIRECTIVE_FROM,
+        DIRECTIVE_GeneralString,
+        DIRECTIVE_GeneralizedTime,
+        DIRECTIVE_GraphicString,
+        DIRECTIVE_IA5String,
+        DIRECTIVE_IDENTIFIER,
+        DIRECTIVE_IMPLICIT,
+        DIRECTIVE_IMPLIED,
+        DIRECTIVE_IMPORTS,
+        DIRECTIVE_INCLUDES,
+        DIRECTIVE_INSTANCE,
+        DIRECTIVE_INSTRUCTIONS,
+        DIRECTIVE_INTEGER,
+        DIRECTIVE_INTERSECTION,
+        DIRECTIVE_ISO646String,
+        DIRECTIVE_MAX,
+        DIRECTIVE_MIN,
+        DIRECTIVE_MINUS_INFINITY,
+        DIRECTIVE_NULL,
+        DIRECTIVE_NumericString,
+        DIRECTIVE_OBJECT,
+        DIRECTIVE_OCTET,
+        DIRECTIVE_OF,
+        DIRECTIVE_OPTIONAL,
+        DIRECTIVE_ObjectDescriptor,
+        DIRECTIVE_PATTERN,
+        DIRECTIVE_PDV,
+        DIRECTIVE_PLUS_INFINITY,
+        DIRECTIVE_PRESENT,
+        DIRECTIVE_PRIVATE,
+        DIRECTIVE_PrintableString,
+        DIRECTIVE_REAL,
+        DIRECTIVE_RELATIVE_OID,
+        DIRECTIVE_SEQUENCE,
+        DIRECTIVE_SET,
+        DIRECTIVE_SIZE,
+        DIRECTIVE_STRING,
+        DIRECTIVE_SYNTAX,
+        DIRECTIVE_T61String,
+        DIRECTIVE_TAGS,
+        DIRECTIVE_TRUE,
+        DIRECTIVE_TeletexString,
+        DIRECTIVE_UNION,
+        DIRECTIVE_UNIQUE,
+        DIRECTIVE_UNIVERSAL,
+        DIRECTIVE_UTCTime,
+        DIRECTIVE_UTF8String,
+        DIRECTIVE_UniversalString,
+        DIRECTIVE_VideotexString,
+        DIRECTIVE_VisibleString,
+        DIRECTIVE_WITH,
+        NR__DIRECTIVES,
+        TOKEN_ASSIGNMENT = NR__DIRECTIVES,
+        TOKEN_OPEN_CURLY,
+        TOKEN_CLOSE_CURLY,
+        TOKEN_OPEN_SQUARE,
+        TOKEN_CLOSE_SQUARE,
+        TOKEN_OPEN_ACTION,
+        TOKEN_CLOSE_ACTION,
+        TOKEN_COMMA,
+        TOKEN_NUMBER,
+        TOKEN_TYPE_NAME,
+        TOKEN_ELEMENT_NAME,
+        NR__TOKENS
+};
+
+static const unsigned char token_to_tag[NR__TOKENS] = {
+        /* EOC goes first */
+        [DIRECTIVE_BOOLEAN]             = ASN1_BOOL,
+        [DIRECTIVE_INTEGER]             = ASN1_INT,
+        [DIRECTIVE_BIT]                 = ASN1_BTS,
+        [DIRECTIVE_OCTET]               = ASN1_OTS,
+        [DIRECTIVE_NULL]                = ASN1_NULL,
+        [DIRECTIVE_OBJECT]              = ASN1_OID,
+        [DIRECTIVE_ObjectDescriptor]    = ASN1_ODE,
+        [DIRECTIVE_EXTERNAL]            = ASN1_EXT,
+        [DIRECTIVE_REAL]                = ASN1_REAL,
+        [DIRECTIVE_ENUMERATED]          = ASN1_ENUM,
+        [DIRECTIVE_EMBEDDED]            = 0,
+        [DIRECTIVE_UTF8String]          = ASN1_UTF8STR,
+        [DIRECTIVE_RELATIVE_OID]        = ASN1_RELOID,
+        /* 14 */
+        /* 15 */
+        [DIRECTIVE_SEQUENCE]            = ASN1_SEQ,
+        [DIRECTIVE_SET]                 = ASN1_SET,
+        [DIRECTIVE_NumericString]       = ASN1_NUMSTR,
+        [DIRECTIVE_PrintableString]     = ASN1_PRNSTR,
+        [DIRECTIVE_T61String]           = ASN1_TEXSTR,
+        [DIRECTIVE_TeletexString]       = ASN1_TEXSTR,
+        [DIRECTIVE_VideotexString]      = ASN1_VIDSTR,
+        [DIRECTIVE_IA5String]           = ASN1_IA5STR,
+        [DIRECTIVE_UTCTime]             = ASN1_UNITIM,
+        [DIRECTIVE_GeneralizedTime]     = ASN1_GENTIM,
+        [DIRECTIVE_GraphicString]       = ASN1_GRASTR,
+        [DIRECTIVE_VisibleString]       = ASN1_VISSTR,
+        [DIRECTIVE_GeneralString]       = ASN1_GENSTR,
+        [DIRECTIVE_UniversalString]     = ASN1_UNITIM,
+        [DIRECTIVE_CHARACTER]           = ASN1_CHRSTR,
+        [DIRECTIVE_BMPString]           = ASN1_BMPSTR,
+};
+
+static const char asn1_classes[4][5] = {
+        [ASN1_UNIV]     = "UNIV",
+        [ASN1_APPL]     = "APPL",
+        [ASN1_CONT]     = "CONT",
+        [ASN1_PRIV]     = "PRIV"
+};
+
+static const char asn1_methods[2][5] = {
+        [ASN1_UNIV]     = "PRIM",
+        [ASN1_APPL]     = "CONS"
+};
+
+static const char *const asn1_universal_tags[32] = {
+        "EOC",
+        "BOOL",
+        "INT",
+        "BTS",
+        "OTS",
+        "NULL",
+        "OID",
+        "ODE",
+        "EXT",
+        "REAL",
+        "ENUM",
+        "EPDV",
+        "UTF8STR",
+        "RELOID",
+        NULL,           /* 14 */
+        NULL,           /* 15 */
+        "SEQ",
+        "SET",
+        "NUMSTR",
+        "PRNSTR",
+        "TEXSTR",
+        "VIDSTR",
+        "IA5STR",
+        "UNITIM",
+        "GENTIM",
+        "GRASTR",
+        "VISSTR",
+        "GENSTR",
+        "UNISTR",
+        "CHRSTR",
+        "BMPSTR",
+        NULL            /* 31 */
+};
+
+static const char *filename;
+static const char *grammar_name;
+static const char *outputname;
+static const char *headername;
+
+static const char *const directives[NR__DIRECTIVES] = {
+#define _(X) [DIRECTIVE_##X] = #X
+        _(ABSENT),
+        _(ALL),
+        _(ANY),
+        _(APPLICATION),
+        _(AUTOMATIC),
+        _(BEGIN),
+        _(BIT),
+        _(BMPString),
+        _(BOOLEAN),
+        _(BY),
+        _(CHARACTER),
+        _(CHOICE),
+        _(CLASS),
+        _(COMPONENT),
+        _(COMPONENTS),
+        _(CONSTRAINED),
+        _(CONTAINING),
+        _(DEFAULT),
+        _(DEFINED),
+        _(DEFINITIONS),
+        _(EMBEDDED),
+        _(ENCODED),
+        [DIRECTIVE_ENCODING_CONTROL] = "ENCODING-CONTROL",
+        _(END),
+        _(ENUMERATED),
+        _(EXCEPT),
+        _(EXPLICIT),
+        _(EXPORTS),
+        _(EXTENSIBILITY),
+        _(EXTERNAL),
+        _(FALSE),
+        _(FROM),
+        _(GeneralString),
+        _(GeneralizedTime),
+        _(GraphicString),
+        _(IA5String),
+        _(IDENTIFIER),
+        _(IMPLICIT),
+        _(IMPLIED),
+        _(IMPORTS),
+        _(INCLUDES),
+        _(INSTANCE),
+        _(INSTRUCTIONS),
+        _(INTEGER),
+        _(INTERSECTION),
+        _(ISO646String),
+        _(MAX),
+        _(MIN),
+        [DIRECTIVE_MINUS_INFINITY] = "MINUS-INFINITY",
+        [DIRECTIVE_NULL] = "NULL",
+        _(NumericString),
+        _(OBJECT),
+        _(OCTET),
+        _(OF),
+        _(OPTIONAL),
+        _(ObjectDescriptor),
+        _(PATTERN),
+        _(PDV),
+        [DIRECTIVE_PLUS_INFINITY] = "PLUS-INFINITY",
+        _(PRESENT),
+        _(PRIVATE),
+        _(PrintableString),
+        _(REAL),
+        [DIRECTIVE_RELATIVE_OID] = "RELATIVE-OID",
+        _(SEQUENCE),
+        _(SET),
+        _(SIZE),
+        _(STRING),
+        _(SYNTAX),
+        _(T61String),
+        _(TAGS),
+        _(TRUE),
+        _(TeletexString),
+        _(UNION),
+        _(UNIQUE),
+        _(UNIVERSAL),
+        _(UTCTime),
+        _(UTF8String),
+        _(UniversalString),
+        _(VideotexString),
+        _(VisibleString),
+        _(WITH)
+};
+
+struct action {
+        struct action   *next;
+        unsigned char   index;
+        char            name[];
+};
+
+static struct action *action_list;
+static unsigned nr_actions;
+
+struct token {
+        unsigned short  line;
+        enum token_type token_type : 8;
+        unsigned char   size;
+        struct action   *action;
+        const char      *value;
+        struct type     *type;
+};
+
+static struct token *token_list;
+static unsigned nr_tokens;
+
+static int directive_compare(const void *_key, const void *_pdir)
+{
+        const struct token *token = _key;
+        const char *const *pdir = _pdir, *dir = *pdir;
+        size_t dlen, clen;
+        int val;
+
+        dlen = strlen(dir);
+        clen = (dlen < token->size) ? dlen : token->size;
+
+        //printf("cmp(%*.*s,%s) = ",
+        //       (int)token->size, (int)token->size, token->value,
+        //       dir);
+
+        val = memcmp(token->value, dir, clen);
+        if (val != 0) {
+                //printf("%d [cmp]\n", val);
+                return val;
+        }
+
+        if (dlen == token->size) {
+                //printf("0\n");
+                return 0;
+        }
+        //printf("%d\n", (int)dlen - (int)token->size);
+        return dlen - token->size; /* shorter -> negative */
+}
+
+/*
+ * Tokenise an ASN.1 grammar
+ */
+static void tokenise(char *buffer, char *end)
+{
+        struct token *tokens;
+        char *line, *nl, *p, *q;
+        unsigned tix, lineno;
+
+        /* Assume we're going to have half as many tokens as we have
+         * characters
+         */
+        token_list = tokens = calloc((end - buffer) / 2, sizeof(struct token));
+        if (!tokens) {
+                perror(NULL);
+                exit(1);
+        }
+        tix = 0;
+
+        lineno = 0;
+        while (buffer < end) {
+                /* First of all, break out a line */
+                lineno++;
+                line = buffer;
+                nl = memchr(line, '\n', end - buffer);
+                if (!nl) {
+                        buffer = nl = end;
+                } else {
+                        buffer = nl + 1;
+                        *nl = '\0';
+                }
+
+                /* Remove "--" comments */
+                p = line;
+        next_comment:
+                while ((p = memchr(p, '-', nl - p))) {
+                        if (p[1] == '-') {
+                                /* Found a comment; see if there's a terminator */
+                                q = p + 2;
+                                while ((q = memchr(q, '-', nl - q))) {
+                                        if (q[1] == '-') {
+                                                /* There is - excise the comment */
+                                                q += 2;
+                                                memmove(p, q, nl - q);
+                                                goto next_comment;
+                                        }
+                                        q++;
+                                }
+                                *p = '\0';
+                                nl = p;
+                                break;
+                        } else {
+                                p++;
+                        }
+                }
+
+                p = line;
+                while (p < nl) {
+                        /* Skip white space */
+                        while (p < nl && isspace(*p))
+                                *(p++) = 0;
+                        if (p >= nl)
+                                break;
+
+                        tokens[tix].line = lineno;
+                        tokens[tix].value = p;
+
+                        /* Handle string tokens */
+                        if (isalpha(*p)) {
+                                const char **dir;
+
+                                /* Can be a directive, type name or element
+                                 * name.  Find the end of the name.
+                                 */
+                                q = p + 1;
+                                while (q < nl && (isalnum(*q) || *q == '-' || *q == '_'))
+                                        q++;
+                                tokens[tix].size = q - p;
+                                p = q;
+
+                                /* If it begins with a lowercase letter then
+                                 * it's an element name
+                                 */
+                                if (islower(tokens[tix].value[0])) {
+                                        tokens[tix++].token_type = TOKEN_ELEMENT_NAME;
+                                        continue;
+                                }
+
+                                /* Otherwise we need to search the directive
+                                 * table
+                                 */
+                                dir = bsearch(&tokens[tix], directives,
+                                              sizeof(directives) / sizeof(directives[1]),
+                                              sizeof(directives[1]),
+                                              directive_compare);
+                                if (dir) {
+                                        tokens[tix++].token_type = dir - directives;
+                                        continue;
+                                }
+
+                                tokens[tix++].token_type = TOKEN_TYPE_NAME;
+                                continue;
+                        }
+
+                        /* Handle numbers */
+                        if (isdigit(*p)) {
+                                /* Find the end of the number */
+                                q = p + 1;
+                                while (q < nl && (isdigit(*q)))
+                                        q++;
+                                tokens[tix].size = q - p;
+                                p = q;
+                                tokens[tix++].token_type = TOKEN_NUMBER;
+                                continue;
+                        }
+
+                        if (nl - p >= 3) {
+                                if (memcmp(p, "::=", 3) == 0) {
+                                        p += 3;
+                                        tokens[tix].size = 3;
+                                        tokens[tix++].token_type = TOKEN_ASSIGNMENT;
+                                        continue;
+                                }
+                        }
+
+                        if (nl - p >= 2) {
+                                if (memcmp(p, "({", 2) == 0) {
+                                        p += 2;
+                                        tokens[tix].size = 2;
+                                        tokens[tix++].token_type = TOKEN_OPEN_ACTION;
+                                        continue;
+                                }
+                                if (memcmp(p, "})", 2) == 0) {
+                                        p += 2;
+                                        tokens[tix].size = 2;
+                                        tokens[tix++].token_type = TOKEN_CLOSE_ACTION;
+                                        continue;
+                                }
+                        }
+
+                        if (nl - p >= 1) {
+                                tokens[tix].size = 1;
+                                switch (*p) {
+                                case '{':
+                                        p += 1;
+                                        tokens[tix++].token_type = TOKEN_OPEN_CURLY;
+                                        continue;
+                                case '}':
+                                        p += 1;
+                                        tokens[tix++].token_type = TOKEN_CLOSE_CURLY;
+                                        continue;
+                                case '[':
+                                        p += 1;
+                                        tokens[tix++].token_type = TOKEN_OPEN_SQUARE;
+                                        continue;
+                                case ']':
+                                        p += 1;
+                                        tokens[tix++].token_type = TOKEN_CLOSE_SQUARE;
+                                        continue;
+                                case ',':
+                                        p += 1;
+                                        tokens[tix++].token_type = TOKEN_COMMA;
+                                        continue;
+                                default:
+                                        break;
+                                }
+                        }
+
+                        fprintf(stderr, "%s:%u: Unknown character in grammar: '%c'\n",
+                                filename, lineno, *p);
+                        exit(1);
+                }
+        }
+
+        nr_tokens = tix;
+        printf("Extracted %u tokens\n", nr_tokens);
+
+#if 0
+        {
+                int n;
+                for (n = 0; n < nr_tokens; n++)
+                        printf("Token %3u: '%*.*s'\n",
+                               n,
+                               (int)token_list[n].size, (int)token_list[n].size,
+                               token_list[n].value);
+        }
+#endif
+}
+
+static void build_type_list(void);
+static void parse(void);
+static void render(FILE *out, FILE *hdr);
+
+/*
+ *
+ */
+int main(int argc, char **argv)
+{
+        struct stat st;
+        ssize_t readlen;
+        FILE *out, *hdr;
+        char *buffer, *p;
+        int fd;
+
+        if (argc != 4) {
+                fprintf(stderr, "Format: %s <grammar-file> <c-file> <hdr-file>\n",
+                        argv[0]);
+                exit(2);
+        }
+
+        filename = argv[1];
+        outputname = argv[2];
+        headername = argv[3];
+
+        fd = open(filename, O_RDONLY);
+        if (fd < 0) {
+                perror(filename);
+                exit(1);
+        }
+
+        if (fstat(fd, &st) < 0) {
+                perror(filename);
+                exit(1);
+        }
+
+        if (!(buffer = malloc(st.st_size + 1))) {
+                perror(NULL);
+                exit(1);
+        }
+
+        if ((readlen = read(fd, buffer, st.st_size)) < 0) {
+                perror(filename);
+                exit(1);
+        }
+
+        if (close(fd) < 0) {
+                perror(filename);
+                exit(1);
+        }
+
+        if (readlen != st.st_size) {
+                fprintf(stderr, "%s: Short read\n", filename);
+                exit(1);
+        }
+
+        p = strrchr(argv[1], '/');
+        p = p ? p + 1 : argv[1];
+        grammar_name = strdup(p);
+        if (!p) {
+                perror(NULL);
+                exit(1);
+        }
+        p = strchr(grammar_name, '.');
+        if (p)
+                *p = '\0';
+
+        buffer[readlen] = 0;
+        tokenise(buffer, buffer + readlen);
+        build_type_list();
+        parse();
+
+        out = fopen(outputname, "w");
+        if (!out) {
+                perror(outputname);
+                exit(1);
+        }
+
+        hdr = fopen(headername, "w");
+        if (!out) {
+                perror(headername);
+                exit(1);
+        }
+
+        render(out, hdr);
+
+        if (fclose(out) < 0) {
+                perror(outputname);
+                exit(1);
+        }
+
+        if (fclose(hdr) < 0) {
+                perror(headername);
+                exit(1);
+        }
+
+        return 0;
+}
+
+enum compound {
+        NOT_COMPOUND,
+        SET,
+        SET_OF,
+        SEQUENCE,
+        SEQUENCE_OF,
+        CHOICE,
+        ANY,
+        TYPE_REF,
+        TAG_OVERRIDE
+};
+
+struct element {
+        struct type     *type_def;
+        struct token    *name;
+        struct token    *type;
+        struct action   *action;
+        struct element  *children;
+        struct element  *next;
+        struct element  *render_next;
+        struct element  *list_next;
+        uint8_t         n_elements;
+        enum compound   compound : 8;
+        enum asn1_class class : 8;
+        enum asn1_method method : 8;
+        uint8_t         tag;
+        unsigned        entry_index;
+        unsigned        flags;
+#define ELEMENT_IMPLICIT        0x0001
+#define ELEMENT_EXPLICIT        0x0002
+#define ELEMENT_MARKED          0x0004
+#define ELEMENT_RENDERED        0x0008
+#define ELEMENT_SKIPPABLE       0x0010
+#define ELEMENT_CONDITIONAL     0x0020
+};
+
+struct type {
+        struct token    *name;
+        struct token    *def;
+        struct element  *element;
+        unsigned        ref_count;
+        unsigned        flags;
+#define TYPE_STOP_MARKER        0x0001
+#define TYPE_BEGIN              0x0002
+};
+
+static struct type *type_list;
+static struct type **type_index;
+static unsigned nr_types;
+
+static int type_index_compare(const void *_a, const void *_b)
+{
+        const struct type *const *a = _a, *const *b = _b;
+
+        if ((*a)->name->size != (*b)->name->size)
+                return (*a)->name->size - (*b)->name->size;
+        else
+                return memcmp((*a)->name->value, (*b)->name->value,
+                              (*a)->name->size);
+}
+
+static int type_finder(const void *_key, const void *_ti)
+{
+        const struct token *token = _key;
+        const struct type *const *ti = _ti;
+        const struct type *type = *ti;
+
+        if (token->size != type->name->size)
+                return token->size - type->name->size;
+        else
+                return memcmp(token->value, type->name->value,
+                              token->size);
+}
+
+/*
+ * Build up a list of types and a sorted index to that list.
+ */
+static void build_type_list(void)
+{
+        struct type *types;
+        unsigned nr, t, n;
+
+        nr = 0;
+        for (n = 0; n < nr_tokens - 1; n++)
+                if (token_list[n + 0].token_type == TOKEN_TYPE_NAME &&
+                    token_list[n + 1].token_type == TOKEN_ASSIGNMENT)
+                        nr++;
+
+        if (nr == 0) {
+                fprintf(stderr, "%s: No defined types\n", filename);
+                exit(1);
+        }
+
+        nr_types = nr;
+        types = type_list = calloc(nr + 1, sizeof(type_list[0]));
+        if (!type_list) {
+                perror(NULL);
+                exit(1);
+        }
+        type_index = calloc(nr, sizeof(type_index[0]));
+        if (!type_index) {
+                perror(NULL);
+                exit(1);
+        }
+
+        t = 0;
+        types[t].flags |= TYPE_BEGIN;
+        for (n = 0; n < nr_tokens - 1; n++) {
+                if (token_list[n + 0].token_type == TOKEN_TYPE_NAME &&
+                    token_list[n + 1].token_type == TOKEN_ASSIGNMENT) {
+                        types[t].name = &token_list[n];
+                        type_index[t] = &types[t];
+                        t++;
+                }
+        }
+        types[t].name = &token_list[n + 1];
+        types[t].flags |= TYPE_STOP_MARKER;
+
+        qsort(type_index, nr, sizeof(type_index[0]), type_index_compare);
+
+        printf("Extracted %u types\n", nr_types);
+#if 0
+        for (n = 0; n < nr_types; n++) {
+                struct type *type = type_index[n];
+                printf("- %*.*s\n",
+                       (int)type->name->size,
+                       (int)type->name->size,
+                       type->name->value);
+        }
+#endif
+}
+
+static struct element *parse_type(struct token **_cursor, struct token *stop,
+                                  struct token *name);
+
+/*
+ * Parse the token stream
+ */
+static void parse(void)
+{
+        struct token *cursor;
+        struct type *type;
+
+        /* Parse one type definition statement at a time */
+        type = type_list;
+        do {
+                cursor = type->name;
+
+                if (cursor[0].token_type != TOKEN_TYPE_NAME ||
+                    cursor[1].token_type != TOKEN_ASSIGNMENT)
+                        abort();
+                cursor += 2;
+
+                type->element = parse_type(&cursor, type[1].name, NULL);
+                type->element->type_def = type;
+
+                if (cursor != type[1].name) {
+                        fprintf(stderr, "%s:%d: Parse error at token '%*.*s'\n",
+                                filename, cursor->line,
+                                (int)cursor->size, (int)cursor->size, cursor->value);
+                        exit(1);
+                }
+
+        } while (type++, !(type->flags & TYPE_STOP_MARKER));
+
+        printf("Extracted %u actions\n", nr_actions);
+}
+
+static struct element *element_list;
+
+static struct element *alloc_elem(struct token *type)
+{
+        struct element *e = calloc(1, sizeof(*e));
+        if (!e) {
+                perror(NULL);
+                exit(1);
+        }
+        e->list_next = element_list;
+        element_list = e;
+        return e;
+}
+
+static struct element *parse_compound(struct token **_cursor, struct token *end,
+                                      int alternates);
+
+/*
+ * Parse one type definition statement
+ */
+static struct element *parse_type(struct token **_cursor, struct token *end,
+                                  struct token *name)
+{
+        struct element *top, *element;
+        struct action *action, **ppaction;
+        struct token *cursor = *_cursor;
+        struct type **ref;
+        char *p;
+        int labelled = 0, implicit = 0;
+
+        top = element = alloc_elem(cursor);
+        element->class = ASN1_UNIV;
+        element->method = ASN1_PRIM;
+        element->tag = token_to_tag[cursor->token_type];
+        element->name = name;
+
+        /* Extract the tag value if one given */
+        if (cursor->token_type == TOKEN_OPEN_SQUARE) {
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+                switch (cursor->token_type) {
+                case DIRECTIVE_UNIVERSAL:
+                        element->class = ASN1_UNIV;
+                        cursor++;
+                        break;
+                case DIRECTIVE_APPLICATION:
+                        element->class = ASN1_APPL;
+                        cursor++;
+                        break;
+                case TOKEN_NUMBER:
+                        element->class = ASN1_CONT;
+                        break;
+                case DIRECTIVE_PRIVATE:
+                        element->class = ASN1_PRIV;
+                        cursor++;
+                        break;
+                default:
+                        fprintf(stderr, "%s:%d: Unrecognised tag class token '%*.*s'\n",
+                                filename, cursor->line,
+                                (int)cursor->size, (int)cursor->size, cursor->value);
+                        exit(1);
+                }
+
+                if (cursor >= end)
+                        goto overrun_error;
+                if (cursor->token_type != TOKEN_NUMBER) {
+                        fprintf(stderr, "%s:%d: Missing tag number '%*.*s'\n",
+                                filename, cursor->line,
+                                (int)cursor->size, (int)cursor->size, cursor->value);
+                        exit(1);
+                }
+
+                element->tag &= ~0x1f;
+                element->tag |= strtoul(cursor->value, &p, 10);
+                if (p - cursor->value != cursor->size)
+                        abort();
+                cursor++;
+
+                if (cursor >= end)
+                        goto overrun_error;
+                if (cursor->token_type != TOKEN_CLOSE_SQUARE) {
+                        fprintf(stderr, "%s:%d: Missing closing square bracket '%*.*s'\n",
+                                filename, cursor->line,
+                                (int)cursor->size, (int)cursor->size, cursor->value);
+                        exit(1);
+                }
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+                labelled = 1;
+        }
+
+        /* Handle implicit and explicit markers */
+        if (cursor->token_type == DIRECTIVE_IMPLICIT) {
+                element->flags |= ELEMENT_IMPLICIT;
+                implicit = 1;
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+        } else if (cursor->token_type == DIRECTIVE_EXPLICIT) {
+                element->flags |= ELEMENT_EXPLICIT;
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+        }
+
+        if (labelled) {
+                if (!implicit)
+                        element->method |= ASN1_CONS;
+                element->compound = implicit ? TAG_OVERRIDE : SEQUENCE;
+                element->children = alloc_elem(cursor);
+                element = element->children;
+                element->class = ASN1_UNIV;
+                element->method = ASN1_PRIM;
+                element->tag = token_to_tag[cursor->token_type];
+                element->name = name;
+        }
+
+        /* Extract the type we're expecting here */
+        element->type = cursor;
+        switch (cursor->token_type) {
+        case DIRECTIVE_ANY:
+                element->compound = ANY;
+                cursor++;
+                break;
+
+        case DIRECTIVE_NULL:
+        case DIRECTIVE_BOOLEAN:
+        case DIRECTIVE_ENUMERATED:
+        case DIRECTIVE_INTEGER:
+                element->compound = NOT_COMPOUND;
+                cursor++;
+                break;
+
+        case DIRECTIVE_EXTERNAL:
+                element->method = ASN1_CONS;
+
+        case DIRECTIVE_BMPString:
+        case DIRECTIVE_GeneralString:
+        case DIRECTIVE_GraphicString:
+        case DIRECTIVE_IA5String:
+        case DIRECTIVE_ISO646String:
+        case DIRECTIVE_NumericString:
+        case DIRECTIVE_PrintableString:
+        case DIRECTIVE_T61String:
+        case DIRECTIVE_TeletexString:
+        case DIRECTIVE_UniversalString:
+        case DIRECTIVE_UTF8String:
+        case DIRECTIVE_VideotexString:
+        case DIRECTIVE_VisibleString:
+        case DIRECTIVE_ObjectDescriptor:
+        case DIRECTIVE_GeneralizedTime:
+        case DIRECTIVE_UTCTime:
+                element->compound = NOT_COMPOUND;
+                cursor++;
+                break;
+
+        case DIRECTIVE_BIT:
+        case DIRECTIVE_OCTET:
+                element->compound = NOT_COMPOUND;
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+                if (cursor->token_type != DIRECTIVE_STRING)
+                        goto parse_error;
+                cursor++;
+                break;
+
+        case DIRECTIVE_OBJECT:
+                element->compound = NOT_COMPOUND;
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+                if (cursor->token_type != DIRECTIVE_IDENTIFIER)
+                        goto parse_error;
+                cursor++;
+                break;
+
+        case TOKEN_TYPE_NAME:
+                element->compound = TYPE_REF;
+                ref = bsearch(cursor, type_index, nr_types, sizeof(type_index[0]),
+                              type_finder);
+                if (!ref) {
+                        fprintf(stderr, "%s:%d: Type '%*.*s' undefined\n",
+                                filename, cursor->line,
+                                (int)cursor->size, (int)cursor->size, cursor->value);
+                        exit(1);
+                }
+                cursor->type = *ref;
+                (*ref)->ref_count++;
+                cursor++;
+                break;
+
+        case DIRECTIVE_CHOICE:
+                element->compound = CHOICE;
+                cursor++;
+                element->children = parse_compound(&cursor, end, 1);
+                break;
+
+        case DIRECTIVE_SEQUENCE:
+                element->compound = SEQUENCE;
+                element->method = ASN1_CONS;
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+                if (cursor->token_type == DIRECTIVE_OF) {
+                        element->compound = SEQUENCE_OF;
+                        cursor++;
+                        if (cursor >= end)
+                                goto overrun_error;
+                        element->children = parse_type(&cursor, end, NULL);
+                } else {
+                        element->children = parse_compound(&cursor, end, 0);
+                }
+                break;
+
+        case DIRECTIVE_SET:
+                element->compound = SET;
+                element->method = ASN1_CONS;
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+                if (cursor->token_type == DIRECTIVE_OF) {
+                        element->compound = SET_OF;
+                        cursor++;
+                        if (cursor >= end)
+                                goto parse_error;
+                        element->children = parse_type(&cursor, end, NULL);
+                } else {
+                        element->children = parse_compound(&cursor, end, 1);
+                }
+                break;
+
+        default:
+                fprintf(stderr, "%s:%d: Token '%*.*s' does not introduce a type\n",
+                        filename, cursor->line,
+                        (int)cursor->size, (int)cursor->size, cursor->value);
+                exit(1);
+        }
+
+        /* Handle elements that are optional */
+        if (cursor < end && (cursor->token_type == DIRECTIVE_OPTIONAL ||
+                             cursor->token_type == DIRECTIVE_DEFAULT)
+            ) {
+                cursor++;
+                top->flags |= ELEMENT_SKIPPABLE;
+        }
+
+        if (cursor < end && cursor->token_type == TOKEN_OPEN_ACTION) {
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+                if (cursor->token_type != TOKEN_ELEMENT_NAME) {
+                        fprintf(stderr, "%s:%d: Token '%*.*s' is not an action function name\n",
+                                filename, cursor->line,
+                                (int)cursor->size, (int)cursor->size, cursor->value);
+                        exit(1);
+                }
+
+                action = malloc(sizeof(struct action) + cursor->size + 1);
+                if (!action) {
+                        perror(NULL);
+                        exit(1);
+                }
+                action->index = 0;
+                memcpy(action->name, cursor->value, cursor->size);
+                action->name[cursor->size] = 0;
+
+                for (ppaction = &action_list;
+                     *ppaction;
+                     ppaction = &(*ppaction)->next
+                     ) {
+                        int cmp = strcmp(action->name, (*ppaction)->name);
+                        if (cmp == 0) {
+                                free(action);
+                                action = *ppaction;
+                                goto found;
+                        }
+                        if (cmp < 0) {
+                                action->next = *ppaction;
+                                *ppaction = action;
+                                nr_actions++;
+                                goto found;
+                        }
+                }
+                action->next = NULL;
+                *ppaction = action;
+                nr_actions++;
+        found:
+
+                element->action = action;
+                cursor->action = action;
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+                if (cursor->token_type != TOKEN_CLOSE_ACTION) {
+                        fprintf(stderr, "%s:%d: Missing close action, got '%*.*s'\n",
+                                filename, cursor->line,
+                                (int)cursor->size, (int)cursor->size, cursor->value);
+                        exit(1);
+                }
+                cursor++;
+        }
+
+        *_cursor = cursor;
+        return top;
+
+parse_error:
+        fprintf(stderr, "%s:%d: Unexpected token '%*.*s'\n",
+                filename, cursor->line,
+                (int)cursor->size, (int)cursor->size, cursor->value);
+        exit(1);
+
+overrun_error:
+        fprintf(stderr, "%s: Unexpectedly hit EOF\n", filename);
+        exit(1);
+}
+
+/*
+ * Parse a compound type list
+ */
+static struct element *parse_compound(struct token **_cursor, struct token *end,
+                                      int alternates)
+{
+        struct element *children, **child_p = &children, *element;
+        struct token *cursor = *_cursor, *name;
+
+        if (cursor->token_type != TOKEN_OPEN_CURLY) {
+                fprintf(stderr, "%s:%d: Expected compound to start with brace not '%*.*s'\n",
+                        filename, cursor->line,
+                        (int)cursor->size, (int)cursor->size, cursor->value);
+                exit(1);
+        }
+        cursor++;
+        if (cursor >= end)
+                goto overrun_error;
+
+        if (cursor->token_type == TOKEN_OPEN_CURLY) {
+                fprintf(stderr, "%s:%d: Empty compound\n",
+                        filename, cursor->line);
+                exit(1);
+        }
+
+        for (;;) {
+                name = NULL;
+                if (cursor->token_type == TOKEN_ELEMENT_NAME) {
+                        name = cursor;
+                        cursor++;
+                        if (cursor >= end)
+                                goto overrun_error;
+                }
+
+                element = parse_type(&cursor, end, name);
+                if (alternates)
+                        element->flags |= ELEMENT_SKIPPABLE | ELEMENT_CONDITIONAL;
+
+                *child_p = element;
+                child_p = &element->next;
+
+                if (cursor >= end)
+                        goto overrun_error;
+                if (cursor->token_type != TOKEN_COMMA)
+                        break;
+                cursor++;
+                if (cursor >= end)
+                        goto overrun_error;
+        }
+
+        children->flags &= ~ELEMENT_CONDITIONAL;
+
+        if (cursor->token_type != TOKEN_CLOSE_CURLY) {
+                fprintf(stderr, "%s:%d: Expected compound closure, got '%*.*s'\n",
+                        filename, cursor->line,
+                        (int)cursor->size, (int)cursor->size, cursor->value);
+                exit(1);
+        }
+        cursor++;
+
+        *_cursor = cursor;
+        return children;
+
+overrun_error:
+        fprintf(stderr, "%s: Unexpectedly hit EOF\n", filename);
+        exit(1);
+}
+
+static void render_element(FILE *out, struct element *e, struct element *tag);
+static void render_out_of_line_list(FILE *out);
+
+static int nr_entries;
+static int render_depth = 1;
+static struct element *render_list, **render_list_p = &render_list;
+
+__attribute__((format(printf, 2, 3)))
+static void render_opcode(FILE *out, const char *fmt, ...)
+{
+        va_list va;
+
+        if (out) {
+                fprintf(out, "\t[%4d] =%*s", nr_entries, render_depth, "");
+                va_start(va, fmt);
+                vfprintf(out, fmt, va);
+                va_end(va);
+        }
+        nr_entries++;
+}
+
+__attribute__((format(printf, 2, 3)))
+static void render_more(FILE *out, const char *fmt, ...)
+{
+        va_list va;
+
+        if (out) {
+                va_start(va, fmt);
+                vfprintf(out, fmt, va);
+                va_end(va);
+        }
+}
+
+/*
+ * Render the grammar into a state machine definition.
+ */
+static void render(FILE *out, FILE *hdr)
+{
+        struct element *e;
+        struct action *action;
+        struct type *root;
+        int index;
+
+        fprintf(hdr, "/*\n");
+        fprintf(hdr, " * Automatically generated by asn1_compiler.  Do not edit\n");
+        fprintf(hdr, " *\n");
+        fprintf(hdr, " * ASN.1 parser for %s\n", grammar_name);
+        fprintf(hdr, " */\n");
+        fprintf(hdr, "#include <linux/asn1_decoder.h>\n");
+        fprintf(hdr, "\n");
+        fprintf(hdr, "extern const struct asn1_decoder %s_decoder;\n", grammar_name);
+        if (ferror(hdr)) {
+                perror(headername);
+                exit(1);
+        }
+
+        fprintf(out, "/*\n");
+        fprintf(out, " * Automatically generated by asn1_compiler.  Do not edit\n");
+        fprintf(out, " *\n");
+        fprintf(out, " * ASN.1 parser for %s\n", grammar_name);
+        fprintf(out, " */\n");
+        fprintf(out, "#include <linux/asn1_ber_bytecode.h>\n");
+        fprintf(out, "#include \"%s-asn1.h\"\n", grammar_name);
+        fprintf(out, "\n");
+        if (ferror(out)) {
+                perror(outputname);
+                exit(1);
+        }
+
+        /* Tabulate the action functions we might have to call */
+        fprintf(hdr, "\n");
+        index = 0;
+        for (action = action_list; action; action = action->next) {
+                action->index = index++;
+                fprintf(hdr,
+                        "extern int %s(void *, size_t, unsigned char,"
+                        " const void *, size_t);\n",
+                        action->name);
+        }
+        fprintf(hdr, "\n");
+
+        fprintf(out, "enum %s_actions {\n", grammar_name);
+        for (action = action_list; action; action = action->next)
+                fprintf(out, "\tACT_%s = %u,\n",
+                        action->name, action->index);
+        fprintf(out, "\tNR__%s_actions = %u\n", grammar_name, nr_actions);
+        fprintf(out, "};\n");
+
+        fprintf(out, "\n");
+        fprintf(out, "static const asn1_action_t %s_action_table[NR__%s_actions] = {\n",
+                grammar_name, grammar_name);
+        for (action = action_list; action; action = action->next)
+                fprintf(out, "\t[%4u] = %s,\n", action->index, action->name);
+        fprintf(out, "};\n");
+
+        if (ferror(out)) {
+                perror(outputname);
+                exit(1);
+        }
+
+        /* We do two passes - the first one calculates all the offsets */
+        printf("Pass 1\n");
+        nr_entries = 0;
+        root = &type_list[0];
+        render_element(NULL, root->element, NULL);
+        render_opcode(NULL, "ASN1_OP_COMPLETE,\n");
+        render_out_of_line_list(NULL);
+
+        for (e = element_list; e; e = e->list_next)
+                e->flags &= ~ELEMENT_RENDERED;
+
+        /* And then we actually render */
+        printf("Pass 2\n");
+        fprintf(out, "\n");
+        fprintf(out, "static const unsigned char %s_machine[] = {\n",
+                grammar_name);
+
+        nr_entries = 0;
+        root = &type_list[0];
+        render_element(out, root->element, NULL);
+        render_opcode(out, "ASN1_OP_COMPLETE,\n");
+        render_out_of_line_list(out);
+
+        fprintf(out, "};\n");
+
+        fprintf(out, "\n");
+        fprintf(out, "const struct asn1_decoder %s_decoder = {\n", grammar_name);
+        fprintf(out, "\t.machine = %s_machine,\n", grammar_name);
+        fprintf(out, "\t.machlen = sizeof(%s_machine),\n", grammar_name);
+        fprintf(out, "\t.actions = %s_action_table,\n", grammar_name);
+        fprintf(out, "};\n");
+}
+
+/*
+ * Render the out-of-line elements
+ */
+static void render_out_of_line_list(FILE *out)
+{
+        struct element *e, *ce;
+        const char *act;
+        int entry;
+
+        while ((e = render_list)) {
+                render_list = e->render_next;
+                if (!render_list)
+                        render_list_p = &render_list;
+
+                render_more(out, "\n");
+                e->entry_index = entry = nr_entries;
+                render_depth++;
+                for (ce = e->children; ce; ce = ce->next)
+                        render_element(out, ce, NULL);
+                render_depth--;
+
+                act = e->action ? "_ACT" : "";
+                switch (e->compound) {
+                case SEQUENCE:
+                        render_opcode(out, "ASN1_OP_END_SEQ%s,\n", act);
+                        break;
+                case SEQUENCE_OF:
+                        render_opcode(out, "ASN1_OP_END_SEQ_OF%s,\n", act);
+                        render_opcode(out, "_jump_target(%u),\n", entry);
+                        break;
+                case SET:
+                        render_opcode(out, "ASN1_OP_END_SET%s,\n", act);
+                        break;
+                case SET_OF:
+                        render_opcode(out, "ASN1_OP_END_SET_OF%s,\n", act);
+                        render_opcode(out, "_jump_target(%u),\n", entry);
+                        break;
+                }
+                if (e->action)
+                        render_opcode(out, "_action(ACT_%s),\n",
+                                      e->action->name);
+                render_opcode(out, "ASN1_OP_RETURN,\n");
+        }
+}
+
+/*
+ * Render an element.
+ */
+static void render_element(FILE *out, struct element *e, struct element *tag)
+{
+        struct element *ec;
+        const char *cond, *act;
+        int entry, skippable = 0, outofline = 0;
+
+        if (e->flags & ELEMENT_SKIPPABLE ||
+            (tag && tag->flags & ELEMENT_SKIPPABLE))
+                skippable = 1;
+
+        if ((e->type_def && e->type_def->ref_count > 1) ||
+            skippable)
+                outofline = 1;
+
+        if (e->type_def && out) {
+                render_more(out, "\t// %*.*s\n",
+                            (int)e->type_def->name->size, (int)e->type_def->name->size,
+                            e->type_def->name->value);
+        }
+
+        /* Render the operation */
+        cond = (e->flags & ELEMENT_CONDITIONAL ||
+                (tag && tag->flags & ELEMENT_CONDITIONAL)) ? "COND_" : "";
+        act = e->action ? "_ACT" : "";
+        switch (e->compound) {
+        case ANY:
+                render_opcode(out, "ASN1_OP_%sMATCH_ANY%s,", cond, act);
+                if (e->name)
+                        render_more(out, "\t\t// %*.*s",
+                                    (int)e->name->size, (int)e->name->size,
+                                    e->name->value);
+                render_more(out, "\n");
+                goto dont_render_tag;
+
+        case TAG_OVERRIDE:
+                render_element(out, e->children, e);
+                return;
+
+        case SEQUENCE:
+        case SEQUENCE_OF:
+        case SET:
+        case SET_OF:
+                render_opcode(out, "ASN1_OP_%sMATCH%s%s,",
+                              cond,
+                              outofline ? "_JUMP" : "",
+                              skippable ? "_OR_SKIP" : "");
+                break;
+
+        case CHOICE:
+                goto dont_render_tag;
+
+        case TYPE_REF:
+                if (e->class == ASN1_UNIV && e->method == ASN1_PRIM && e->tag == 0)
+                        goto dont_render_tag;
+        default:
+                render_opcode(out, "ASN1_OP_%sMATCH%s%s,",
+                              cond, act,
+                              skippable ? "_OR_SKIP" : "");
+                break;
+        }
+
+        if (e->name)
+                render_more(out, "\t\t// %*.*s",
+                            (int)e->name->size, (int)e->name->size,
+                            e->name->value);
+        render_more(out, "\n");
+
+        /* Render the tag */
+        if (!tag)
+                tag = e;
+        if (tag->class == ASN1_UNIV &&
+            tag->tag != 14 &&
+            tag->tag != 15 &&
+            tag->tag != 31)
+                render_opcode(out, "_tag(%s, %s, %s),\n",
+                              asn1_classes[tag->class],
+                              asn1_methods[tag->method | e->method],
+                              asn1_universal_tags[tag->tag]);
+        else
+                render_opcode(out, "_tagn(%s, %s, %2u),\n",
+                              asn1_classes[tag->class],
+                              asn1_methods[tag->method | e->method],
+                              tag->tag);
+        tag = NULL;
+dont_render_tag:
+
+        /* Deal with compound types */
+        switch (e->compound) {
+        case TYPE_REF:
+                render_element(out, e->type->type->element, tag);
+                if (e->action)
+                        render_opcode(out, "ASN1_OP_ACT,\n");
+                break;
+
+        case SEQUENCE:
+                if (outofline) {
+                        /* Render out-of-line for multiple use or
+                         * skipability */
+                        render_opcode(out, "_jump_target(%u),", e->entry_index);
+                        if (e->type_def && e->type_def->name)
+                                render_more(out, "\t\t// --> %*.*s",
+                                            (int)e->type_def->name->size,
+                                            (int)e->type_def->name->size,
+                                            e->type_def->name->value);
+                        render_more(out, "\n");
+                        if (!(e->flags & ELEMENT_RENDERED)) {
+                                e->flags |= ELEMENT_RENDERED;
+                                *render_list_p = e;
+                                render_list_p = &e->render_next;
+                        }
+                        return;
+                } else {
+                        /* Render inline for single use */
+                        render_depth++;
+                        for (ec = e->children; ec; ec = ec->next)
+                                render_element(out, ec, NULL);
+                        render_depth--;
+                        render_opcode(out, "ASN1_OP_END_SEQ%s,\n", act);
+                }
+                break;
+
+        case SEQUENCE_OF:
+        case SET_OF:
+                if (outofline) {
+                        /* Render out-of-line for multiple use or
+                         * skipability */
+                        render_opcode(out, "_jump_target(%u),", e->entry_index);
+                        if (e->type_def && e->type_def->name)
+                                render_more(out, "\t\t// --> %*.*s",
+                                            (int)e->type_def->name->size,
+                                            (int)e->type_def->name->size,
+                                            e->type_def->name->value);
+                        render_more(out, "\n");
+                        if (!(e->flags & ELEMENT_RENDERED)) {
+                                e->flags |= ELEMENT_RENDERED;
+                                *render_list_p = e;
+                                render_list_p = &e->render_next;
+                        }
+                        return;
+                } else {
+                        /* Render inline for single use */
+                        entry = nr_entries;
+                        render_depth++;
+                        render_element(out, e->children, NULL);
+                        render_depth--;
+                        if (e->compound == SEQUENCE_OF)
+                                render_opcode(out, "ASN1_OP_END_SEQ_OF%s,\n", act);
+                        else
+                                render_opcode(out, "ASN1_OP_END_SET_OF%s,\n", act);
+                        render_opcode(out, "_jump_target(%u),\n", entry);
+                }
+                break;
+
+        case SET:
+                /* I can't think of a nice way to do SET support without having
+                 * a stack of bitmasks to make sure no element is repeated.
+                 * The bitmask has also to be checked that no non-optional
+                 * elements are left out whilst not preventing optional
+                 * elements from being left out.
+                 */
+                fprintf(stderr, "The ASN.1 SET type is not currently supported.\n");
+                exit(1);
+
+        case CHOICE:
+                for (ec = e->children; ec; ec = ec->next)
+                        render_element(out, ec, NULL);
+                if (!skippable)
+                        render_opcode(out, "ASN1_OP_COND_FAIL,\n");
+                if (e->action)
+                        render_opcode(out, "ASN1_OP_ACT,\n");
+                break;
+
+        default:
+                break;
+        }
+
+        if (e->action)
+                render_opcode(out, "_action(ACT_%s),\n", e->action->name);
+}
diff --git a/scripts/sign-file b/scripts/sign-file
new file mode 100644
index 000000000000..e58e34e50ac5
--- /dev/null
+++ b/scripts/sign-file
@@ -0,0 +1,115 @@
+#!/bin/sh
+#
+# Sign a module file using the given key.
+#
+# Format: sign-file <key> <x509> <src-file> <dst-file>
+#
+
+scripts=`dirname $0`
+
+CONFIG_MODULE_SIG_SHA512=y
+if [ -r .config ]
+then
+    . ./.config
+fi
+
+key="$1"
+x509="$2"
+src="$3"
+dst="$4"
+
+if [ ! -r "$key" ]
+then
+    echo "Can't read private key" >&2
+    exit 2
+fi
+
+if [ ! -r "$x509" ]
+then
+    echo "Can't read X.509 certificate" >&2
+    exit 2
+fi
+if [ ! -r "$x509.signer" ]
+then
+    echo "Can't read Signer name" >&2
+    exit 2;
+fi
+if [ ! -r "$x509.keyid" ]
+then
+    echo "Can't read Key identifier" >&2
+    exit 2;
+fi
+
+#
+# Signature parameters
+#
+algo=1          # Public-key crypto algorithm: RSA
+hash=           # Digest algorithm
+id_type=1       # Identifier type: X.509
+
+#
+# Digest the data
+#
+dgst=
+if [ "$CONFIG_MODULE_SIG_SHA1" = "y" ]
+then
+    prologue="0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2B, 0x0E, 0x03, 0x02, 0x1A, 0x05, 0x00, 0x04, 0x14"
+    dgst=-sha1
+    hash=2
+elif [ "$CONFIG_MODULE_SIG_SHA224" = "y" ]
+then
+    prologue="0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1C"
+    dgst=-sha224
+    hash=7
+elif [ "$CONFIG_MODULE_SIG_SHA256" = "y" ]
+then
+    prologue="0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20"
+    dgst=-sha256
+    hash=4
+elif [ "$CONFIG_MODULE_SIG_SHA384" = "y" ]
+then
+    prologue="0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30"
+    dgst=-sha384
+    hash=5
+elif [ "$CONFIG_MODULE_SIG_SHA512" = "y" ]
+then
+    prologue="0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40"
+    dgst=-sha512
+    hash=6
+else
+    echo "$0: Can't determine hash algorithm" >&2
+    exit 2
+fi
+
+(
+perl -e "binmode STDOUT; print pack(\"C*\", $prologue)" || exit $?
+openssl dgst $dgst -binary $src || exit $?
+) >$src.dig || exit $?
+
+#
+# Generate the binary signature, which will be just the integer that comprises
+# the signature with no metadata attached.
+#
+openssl rsautl -sign -inkey $key -keyform PEM -in $src.dig -out $src.sig || exit $?
+signerlen=`stat -c %s $x509.signer`
+keyidlen=`stat -c %s $x509.keyid`
+siglen=`stat -c %s $src.sig`
+
+#
+# Build the signed binary
+#
+(
+    cat $src || exit $?
+    echo '~Module signature appended~' || exit $?
+    cat $x509.signer $x509.keyid || exit $?
+
+    # Preface each signature integer with a 2-byte BE length
+    perl -e "binmode STDOUT; print pack(\"n\", $siglen)" || exit $?
+    cat $src.sig || exit $?
+
+    # Generate the information block
+    perl -e "binmode STDOUT; print pack(\"CCCCCxxxN\", $algo, $hash, $id_type, $signerlen, $keyidlen, $siglen + 2)" || exit $?
+) >$dst~ || exit $?
+
+# Permit in-place signing
+mv $dst~ $dst || exit $?
diff --git a/scripts/x509keyid b/scripts/x509keyid
new file mode 100755
index 000000000000..c8e91a4af385
--- /dev/null
+++ b/scripts/x509keyid
@@ -0,0 +1,268 @@
+#!/usr/bin/perl -w
+#
+# Generate an identifier from an X.509 certificate that can be placed in a
+# module signature to indentify the key to use.
+#
+# Format:
+#
+#       ./scripts/x509keyid <x509-cert> <signer's-name> <key-id>
+#
+# We read the DER-encoded X509 certificate and parse it to extract the Subject
+# name and Subject Key Identifier.  The provide the data we need to build the
+# certificate identifier.
+#
+# The signer's name part of the identifier is fabricated from the commonName,
+# the organizationName or the emailAddress components of the X.509 subject
+# name and written to the second named file.
+#
+# The subject key ID to select which of that signer's certificates we're
+# intending to use to sign the module is written to the third named file.
+#
+use strict;
+
+my $raw_data;
+
+die "Need three filenames\n" if ($#ARGV != 2);
+
+my $src = $ARGV[0];
+
+open(FD, "<$src") || die $src;
+binmode FD;
+my @st = stat(FD);
+die $src if (!@st);
+read(FD, $raw_data, $st[7]) || die $src;
+close(FD);
+
+my $UNIV = 0 << 6;
+my $APPL = 1 << 6;
+my $CONT = 2 << 6;
+my $PRIV = 3 << 6;
+
+my $CONS = 0x20;
+
+my $BOOLEAN     = 0x01;
+my $INTEGER     = 0x02;
+my $BIT_STRING  = 0x03;
+my $OCTET_STRING = 0x04;
+my $NULL        = 0x05;
+my $OBJ_ID      = 0x06;
+my $UTF8String  = 0x0c;
+my $SEQUENCE    = 0x10;
+my $SET         = 0x11;
+my $UTCTime     = 0x17;
+my $GeneralizedTime = 0x18;
+
+my %OIDs = (
+    pack("CCC", 85, 4, 3)       => "commonName",
+    pack("CCC", 85, 4, 6)       => "countryName",
+    pack("CCC", 85, 4, 10)      => "organizationName",
+    pack("CCC", 85, 4, 11)      => "organizationUnitName",
+    pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 1, 1) => "rsaEncryption",
+    pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 1, 5) => "sha1WithRSAEncryption",
+    pack("CCCCCCCCC", 42, 134, 72, 134, 247, 13, 1, 9, 1) => "emailAddress",
+    pack("CCC", 85, 29, 35)     => "authorityKeyIdentifier",
+    pack("CCC", 85, 29, 14)     => "subjectKeyIdentifier",
+    pack("CCC", 85, 29, 19)     => "basicConstraints"
+);
+
+###############################################################################
+#
+# Extract an ASN.1 element from a string and return information about it.
+#
+###############################################################################
+sub asn1_extract($$@)
+{
+    my ($cursor, $expected_tag, $optional) = @_;
+
+    return [ -1 ]
+        if ($cursor->[1] == 0 && $optional);
+
+    die $src, ": ", $cursor->[0], ": ASN.1 data underrun (elem ", $cursor->[1], ")\n"
+        if ($cursor->[1] < 2);
+
+    my ($tag, $len) = unpack("CC", substr(${$cursor->[2]}, $cursor->[0], 2));
+
+    if ($expected_tag != -1 && $tag != $expected_tag) {
+        return [ -1 ]
+            if ($optional);
+        die $src, ": ", $cursor->[0], ": ASN.1 unexpected tag (", $tag,
+        " not ", $expected_tag, ")\n";
+    }
+
+    $cursor->[0] += 2;
+    $cursor->[1] -= 2;
+
+    die $src, ": ", $cursor->[0], ": ASN.1 long tag\n"
+        if (($tag & 0x1f) == 0x1f);
+    die $src, ": ", $cursor->[0], ": ASN.1 indefinite length\n"
+        if ($len == 0x80);
+
+    if ($len > 0x80) {
+        my $l = $len - 0x80;
+        die $src, ": ", $cursor->[0], ": ASN.1 data underrun (len len $l)\n"
+            if ($cursor->[1] < $l);
+
+        if ($l == 0x1) {
+            $len = unpack("C", substr(${$cursor->[2]}, $cursor->[0], 1));
+        } elsif ($l = 0x2) {
+            $len = unpack("n", substr(${$cursor->[2]}, $cursor->[0], 2));
+        } elsif ($l = 0x3) {
+            $len = unpack("C", substr(${$cursor->[2]}, $cursor->[0], 1)) << 16;
+            $len = unpack("n", substr(${$cursor->[2]}, $cursor->[0] + 1, 2));
+        } elsif ($l = 0x4) {
+            $len = unpack("N", substr(${$cursor->[2]}, $cursor->[0], 4));
+        } else {
+            die $src, ": ", $cursor->[0], ": ASN.1 element too long (", $l, ")\n";
+        }
+
+        $cursor->[0] += $l;
+        $cursor->[1] -= $l;
+    }
+
+    die $src, ": ", $cursor->[0], ": ASN.1 data underrun (", $len, ")\n"
+        if ($cursor->[1] < $len);
+
+    my $ret = [ $tag, [ $cursor->[0], $len, $cursor->[2] ] ];
+    $cursor->[0] += $len;
+    $cursor->[1] -= $len;
+
+    return $ret;
+}
+
+###############################################################################
+#
+# Retrieve the data referred to by a cursor
+#
+###############################################################################
+sub asn1_retrieve($)
+{
+    my ($cursor) = @_;
+    my ($offset, $len, $data) = @$cursor;
+    return substr($$data, $offset, $len);
+}
+
+###############################################################################
+#
+# Roughly parse the X.509 certificate
+#
+###############################################################################
+my $cursor = [ 0, length($raw_data), \$raw_data ];
+
+my $cert = asn1_extract($cursor, $UNIV | $CONS | $SEQUENCE);
+my $tbs = asn1_extract($cert->[1], $UNIV | $CONS | $SEQUENCE);
+my $version = asn1_extract($tbs->[1], $CONT | $CONS | 0, 1);
+my $serial_number = asn1_extract($tbs->[1], $UNIV | $INTEGER);
+my $sig_type = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
+my $issuer = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
+my $validity = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
+my $subject = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
+my $key = asn1_extract($tbs->[1], $UNIV | $CONS | $SEQUENCE);
+my $issuer_uid = asn1_extract($tbs->[1], $CONT | $CONS | 1, 1);
+my $subject_uid = asn1_extract($tbs->[1], $CONT | $CONS | 2, 1);
+my $extension_list = asn1_extract($tbs->[1], $CONT | $CONS | 3, 1);
+
+my $subject_key_id = ();
+my $authority_key_id = ();
+
+#
+# Parse the extension list
+#
+if ($extension_list->[0] != -1) {
+    my $extensions = asn1_extract($extension_list->[1], $UNIV | $CONS | $SEQUENCE);
+
+    while ($extensions->[1]->[1] > 0) {
+        my $ext = asn1_extract($extensions->[1], $UNIV | $CONS | $SEQUENCE);
+        my $x_oid = asn1_extract($ext->[1], $UNIV | $OBJ_ID);
+        my $x_crit = asn1_extract($ext->[1], $UNIV | $BOOLEAN, 1);
+        my $x_val = asn1_extract($ext->[1], $UNIV | $OCTET_STRING);
+
+        my $raw_oid = asn1_retrieve($x_oid->[1]);
+        next if (!exists($OIDs{$raw_oid}));
+        my $x_type = $OIDs{$raw_oid};
+
+        my $raw_value = asn1_retrieve($x_val->[1]);
+
+        if ($x_type eq "subjectKeyIdentifier") {
+            my $vcursor = [ 0, length($raw_value), \$raw_value ];
+
+            $subject_key_id = asn1_extract($vcursor, $UNIV | $OCTET_STRING);
+        }
+    }
+}
+
+###############################################################################
+#
+# Determine what we're going to use as the signer's name.  In order of
+# preference, take one of: commonName, organizationName or emailAddress.
+#
+###############################################################################
+my $org = "";
+my $cn = "";
+my $email = "";
+
+while ($subject->[1]->[1] > 0) {
+    my $rdn = asn1_extract($subject->[1], $UNIV | $CONS | $SET);
+    my $attr = asn1_extract($rdn->[1], $UNIV | $CONS | $SEQUENCE);
+    my $n_oid = asn1_extract($attr->[1], $UNIV | $OBJ_ID);
+    my $n_val = asn1_extract($attr->[1], -1);
+
+    my $raw_oid = asn1_retrieve($n_oid->[1]);
+    next if (!exists($OIDs{$raw_oid}));
+    my $n_type = $OIDs{$raw_oid};
+
+    my $raw_value = asn1_retrieve($n_val->[1]);
+
+    if ($n_type eq "organizationName") {
+        $org = $raw_value;
+    } elsif ($n_type eq "commonName") {
+        $cn = $raw_value;
+    } elsif ($n_type eq "emailAddress") {
+        $email = $raw_value;
+    }
+}
+
+my $id_name = $email;
+
+if ($org && $cn) {
+    # Don't use the organizationName if the commonName repeats it
+    if (length($org) <= length($cn) &&
+        substr($cn, 0, length($org)) eq $org) {
+        $id_name = $cn;
+        goto got_id_name;
+    }
+
+    # Or a signifcant chunk of it
+    if (length($org) >= 7 &&
+        length($cn) >= 7 &&
+        substr($cn, 0, 7) eq substr($org, 0, 7)) {
+        $id_name = $cn;
+        goto got_id_name;
+    }
+
+    $id_name = $org . ": " . $cn;
+} elsif ($org) {
+    $id_name = $org;
+} elsif ($cn) {
+    $id_name = $cn;
+}
+
+got_id_name:
+
+###############################################################################
+#
+# Output the signer's name and the key identifier that we're going to include
+# in module signatures.
+#
+###############################################################################
+die $src, ": ", "X.509: Couldn't find the Subject Key Identifier extension\n"
+    if (!$subject_key_id);
+
+my $id_key_id = asn1_retrieve($subject_key_id->[1]);
+
+open(OUTFD, ">$ARGV[1]") || die $ARGV[1];
+print OUTFD $id_name;
+close OUTFD || die $ARGV[1];
+
+open(OUTFD, ">$ARGV[2]") || die $ARGV[2];
+print OUTFD $id_key_id;
+close OUTFD || die $ARGV[2];
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 2d1bb8af7696..9e1e005c7596 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -773,8 +773,8 @@ static int encrypted_init(struct encrypted_key_payload *epayload,
  *
  * On success, return 0. Otherwise return errno.
  */
-static int encrypted_instantiate(struct key *key, const void *data,
-                                 size_t datalen)
+static int encrypted_instantiate(struct key *key,
+                                 struct key_preparsed_payload *prep)
 {
         struct encrypted_key_payload *epayload = NULL;
         char *datablob = NULL;
@@ -782,16 +782,17 @@ static int encrypted_instantiate(struct key *key, const void *data,
         char *master_desc = NULL;
         char *decrypted_datalen = NULL;
         char *hex_encoded_iv = NULL;
+        size_t datalen = prep->datalen;
         int ret;
 
-        if (datalen <= 0 || datalen > 32767 || !data)
+        if (datalen <= 0 || datalen > 32767 || !prep->data)
                 return -EINVAL;
 
         datablob = kmalloc(datalen + 1, GFP_KERNEL);
         if (!datablob)
                 return -ENOMEM;
         datablob[datalen] = 0;
-        memcpy(datablob, data, datalen);
+        memcpy(datablob, prep->data, datalen);
         ret = datablob_parse(datablob, &format, &master_desc,
                              &decrypted_datalen, &hex_encoded_iv);
         if (ret < 0)
@@ -834,16 +835,17 @@ static void encrypted_rcu_free(struct rcu_head *rcu)
  *
  * On success, return 0. Otherwise return errno.
  */
-static int encrypted_update(struct key *key, const void *data, size_t datalen)
+static int encrypted_update(struct key *key, struct key_preparsed_payload *prep)
 {
         struct encrypted_key_payload *epayload = key->payload.data;
         struct encrypted_key_payload *new_epayload;
         char *buf;
         char *new_master_desc = NULL;
         const char *format = NULL;
+        size_t datalen = prep->datalen;
         int ret = 0;
 
-        if (datalen <= 0 || datalen > 32767 || !data)
+        if (datalen <= 0 || datalen > 32767 || !prep->data)
                 return -EINVAL;
 
         buf = kmalloc(datalen + 1, GFP_KERNEL);
@@ -851,7 +853,7 @@ static int encrypted_update(struct key *key, const void *data, size_t datalen)
                 return -ENOMEM;
 
         buf[datalen] = 0;
-        memcpy(buf, data, datalen);
+        memcpy(buf, prep->data, datalen);
         ret = datablob_parse(buf, &format, &new_master_desc, NULL, NULL);
         if (ret < 0)
                 goto out;
diff --git a/security/keys/key.c b/security/keys/key.c
index a30e92734905..a15c9da8f971 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -405,8 +405,7 @@ EXPORT_SYMBOL(key_payload_reserve);
  * key_construction_mutex.
  */
 static int __key_instantiate_and_link(struct key *key,
-                                      const void *data,
-                                      size_t datalen,
+                                      struct key_preparsed_payload *prep,
                                       struct key *keyring,
                                       struct key *authkey,
                                       unsigned long *_prealloc)
@@ -424,7 +423,7 @@ static int __key_instantiate_and_link(struct key *key,
         /* can't instantiate twice */
         if (!test_bit(KEY_FLAG_INSTANTIATED, &key->flags)) {
                 /* instantiate the key */
-                ret = key->type->instantiate(key, data, datalen);
+                ret = key->type->instantiate(key, prep);
 
                 if (ret == 0) {
                         /* mark the key as being instantiated */
@@ -475,22 +474,37 @@ int key_instantiate_and_link(struct key *key,
                              struct key *keyring,
                              struct key *authkey)
 {
+        struct key_preparsed_payload prep;
         unsigned long prealloc;
         int ret;
 
+        memset(&prep, 0, sizeof(prep));
+        prep.data = data;
+        prep.datalen = datalen;
+        prep.quotalen = key->type->def_datalen;
+        if (key->type->preparse) {
+                ret = key->type->preparse(&prep);
+                if (ret < 0)
+                        goto error;
+        }
+
         if (keyring) {
                 ret = __key_link_begin(keyring, key->type, key->description,
                                        &prealloc);
                 if (ret < 0)
-                        return ret;
+                        goto error_free_preparse;
         }
 
-        ret = __key_instantiate_and_link(key, data, datalen, keyring, authkey,
+        ret = __key_instantiate_and_link(key, &prep, keyring, authkey,
                                          &prealloc);
 
         if (keyring)
                 __key_link_end(keyring, key->type, prealloc);
 
+error_free_preparse:
+        if (key->type->preparse)
+                key->type->free_preparse(&prep);
+error:
         return ret;
 }
 
@@ -699,7 +713,7 @@ void key_type_put(struct key_type *ktype)
  * if we get an error.
  */
 static inline key_ref_t __key_update(key_ref_t key_ref,
-                                     const void *payload, size_t plen)
+                                     struct key_preparsed_payload *prep)
 {
         struct key *key = key_ref_to_ptr(key_ref);
         int ret;
@@ -715,7 +729,7 @@ static inline key_ref_t __key_update(key_ref_t key_ref,
 
         down_write(&key->sem);
 
-        ret = key->type->update(key, payload, plen);
+        ret = key->type->update(key, prep);
         if (ret == 0)
                 /* updating a negative key instantiates it */
                 clear_bit(KEY_FLAG_NEGATIVE, &key->flags);
@@ -767,6 +781,7 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
                                unsigned long flags)
 {
         unsigned long prealloc;
+        struct key_preparsed_payload prep;
         const struct cred *cred = current_cred();
         struct key_type *ktype;
         struct key *keyring, *key = NULL;
@@ -782,8 +797,9 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
         }
 
         key_ref = ERR_PTR(-EINVAL);
-        if (!ktype->match || !ktype->instantiate)
-                goto error_2;
+        if (!ktype->match || !ktype->instantiate ||
+            (!description && !ktype->preparse))
+                goto error_put_type;
 
         keyring = key_ref_to_ptr(keyring_ref);
 
@@ -791,18 +807,37 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
 
         key_ref = ERR_PTR(-ENOTDIR);
         if (keyring->type != &key_type_keyring)
-                goto error_2;
+                goto error_put_type;
+
+        memset(&prep, 0, sizeof(prep));
+        prep.data = payload;
+        prep.datalen = plen;
+        prep.quotalen = ktype->def_datalen;
+        if (ktype->preparse) {
+                ret = ktype->preparse(&prep);
+                if (ret < 0) {
+                        key_ref = ERR_PTR(ret);
+                        goto error_put_type;
+                }
+                if (!description)
+                        description = prep.description;
+                key_ref = ERR_PTR(-EINVAL);
+                if (!description)
+                        goto error_free_prep;
+        }
 
         ret = __key_link_begin(keyring, ktype, description, &prealloc);
-        if (ret < 0)
-                goto error_2;
+        if (ret < 0) {
+                key_ref = ERR_PTR(ret);
+                goto error_free_prep;
+        }
 
         /* if we're going to allocate a new key, we're going to have
          * to modify the keyring */
         ret = key_permission(keyring_ref, KEY_WRITE);
         if (ret < 0) {
                 key_ref = ERR_PTR(ret);
-                goto error_3;
+                goto error_link_end;
         }
 
         /* if it's possible to update this type of key, search for an existing
@@ -833,25 +868,27 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
                         perm, flags);
         if (IS_ERR(key)) {
                 key_ref = ERR_CAST(key);
-                goto error_3;
+                goto error_link_end;
         }
 
         /* instantiate it and link it into the target keyring */
-        ret = __key_instantiate_and_link(key, payload, plen, keyring, NULL,
-                                         &prealloc);
+        ret = __key_instantiate_and_link(key, &prep, keyring, NULL, &prealloc);
         if (ret < 0) {
                 key_put(key);
                 key_ref = ERR_PTR(ret);
-                goto error_3;
+                goto error_link_end;
         }
 
         key_ref = make_key_ref(key, is_key_possessed(keyring_ref));
 
- error_3:
+error_link_end:
         __key_link_end(keyring, ktype, prealloc);
- error_2:
+error_free_prep:
+        if (ktype->preparse)
+                ktype->free_preparse(&prep);
+error_put_type:
         key_type_put(ktype);
- error:
+error:
         return key_ref;
 
  found_matching_key:
@@ -859,10 +896,9 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
          * - we can drop the locks first as we have the key pinned
          */
         __key_link_end(keyring, ktype, prealloc);
-        key_type_put(ktype);
 
-        key_ref = __key_update(key_ref, payload, plen);
-        goto error;
+        key_ref = __key_update(key_ref, &prep);
+        goto error_free_prep;
 }
 EXPORT_SYMBOL(key_create_or_update);
 
@@ -881,6 +917,7 @@ EXPORT_SYMBOL(key_create_or_update);
  */
 int key_update(key_ref_t key_ref, const void *payload, size_t plen)
 {
+        struct key_preparsed_payload prep;
         struct key *key = key_ref_to_ptr(key_ref);
         int ret;
 
@@ -893,18 +930,31 @@ int key_update(key_ref_t key_ref, const void *payload, size_t plen)
 
         /* attempt to update it if supported */
         ret = -EOPNOTSUPP;
-        if (key->type->update) {
-                down_write(&key->sem);
-
-                ret = key->type->update(key, payload, plen);
-                if (ret == 0)
-                        /* updating a negative key instantiates it */
-                        clear_bit(KEY_FLAG_NEGATIVE, &key->flags);
+        if (!key->type->update)
+                goto error;
 
-                up_write(&key->sem);
+        memset(&prep, 0, sizeof(prep));
+        prep.data = payload;
+        prep.datalen = plen;
+        prep.quotalen = key->type->def_datalen;
+        if (key->type->preparse) {
+                ret = key->type->preparse(&prep);
+                if (ret < 0)
+                        goto error;
         }
 
- error:
+        down_write(&key->sem);
+
+        ret = key->type->update(key, &prep);
+        if (ret == 0)
+                /* updating a negative key instantiates it */
+                clear_bit(KEY_FLAG_NEGATIVE, &key->flags);
+
+        up_write(&key->sem);
+
+        if (key->type->preparse)
+                key->type->free_preparse(&prep);
+error:
         return ret;
 }
 EXPORT_SYMBOL(key_update);
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 305ecb76519c..5d34b4e827d6 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -46,6 +46,9 @@ static int key_get_type_from_user(char *type,
  * Extract the description of a new key from userspace and either add it as a
  * new key to the specified keyring or update a matching key in that keyring.
  *
+ * If the description is NULL or an empty string, the key type is asked to
+ * generate one from the payload.
+ *
  * The keyring must be writable so that we can attach the key to it.
  *
  * If successful, the new key's serial number is returned, otherwise an error
@@ -72,10 +75,17 @@ SYSCALL_DEFINE5(add_key, const char __user *, _type,
         if (ret < 0)
                 goto error;
 
-        description = strndup_user(_description, PAGE_SIZE);
-        if (IS_ERR(description)) {
-                ret = PTR_ERR(description);
-                goto error;
+        description = NULL;
+        if (_description) {
+                description = strndup_user(_description, PAGE_SIZE);
+                if (IS_ERR(description)) {
+                        ret = PTR_ERR(description);
+                        goto error;
+                }
+                if (!*description) {
+                        kfree(description);
+                        description = NULL;
+                }
         }
 
         /* pull the payload in if one was supplied */
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index a5f5c4b6edc5..6e42df15a24c 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -66,7 +66,7 @@ static inline unsigned keyring_hash(const char *desc)
  * operations.
  */
 static int keyring_instantiate(struct key *keyring,
-                               const void *data, size_t datalen);
+                               struct key_preparsed_payload *prep);
 static int keyring_match(const struct key *keyring, const void *criterion);
 static void keyring_revoke(struct key *keyring);
 static void keyring_destroy(struct key *keyring);
@@ -121,12 +121,12 @@ static void keyring_publish_name(struct key *keyring)
  * Returns 0 on success, -EINVAL if given any data.
  */
 static int keyring_instantiate(struct key *keyring,
-                               const void *data, size_t datalen)
+                               struct key_preparsed_payload *prep)
 {
         int ret;
 
         ret = -EINVAL;
-        if (datalen == 0) {
+        if (prep->datalen == 0) {
                 /* make the keyring available by name if it has one */
                 keyring_publish_name(keyring);
                 ret = 0;
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index 60d4e3f5e4bb..85730d5a5a59 100644
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -19,7 +19,8 @@
 #include <asm/uaccess.h>
 #include "internal.h"
 
-static int request_key_auth_instantiate(struct key *, const void *, size_t);
+static int request_key_auth_instantiate(struct key *,
+                                        struct key_preparsed_payload *);
 static void request_key_auth_describe(const struct key *, struct seq_file *);
 static void request_key_auth_revoke(struct key *);
 static void request_key_auth_destroy(struct key *);
@@ -42,10 +43,9 @@ struct key_type key_type_request_key_auth = {
  * Instantiate a request-key authorisation key.
  */
 static int request_key_auth_instantiate(struct key *key,
-                                        const void *data,
-                                        size_t datalen)
+                                        struct key_preparsed_payload *prep)
 {
-        key->payload.data = (struct request_key_auth *) data;
+        key->payload.data = (struct request_key_auth *)prep->data;
         return 0;
 }
 
diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index 3f163d0489ad..e13fcf7636f7 100644
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -895,23 +895,24 @@ static struct trusted_key_payload *trusted_payload_alloc(struct key *key)
  *
  * On success, return 0. Otherwise return errno.
  */
-static int trusted_instantiate(struct key *key, const void *data,
-                               size_t datalen)
+static int trusted_instantiate(struct key *key,
+                               struct key_preparsed_payload *prep)
 {
         struct trusted_key_payload *payload = NULL;
         struct trusted_key_options *options = NULL;
+        size_t datalen = prep->datalen;
         char *datablob;
         int ret = 0;
         int key_cmd;
         size_t key_len;
 
-        if (datalen <= 0 || datalen > 32767 || !data)
+        if (datalen <= 0 || datalen > 32767 || !prep->data)
                 return -EINVAL;
 
         datablob = kmalloc(datalen + 1, GFP_KERNEL);
         if (!datablob)
                 return -ENOMEM;
-        memcpy(datablob, data, datalen);
+        memcpy(datablob, prep->data, datalen);
         datablob[datalen] = '\0';
 
         options = trusted_options_alloc();
@@ -981,17 +982,18 @@ static void trusted_rcu_free(struct rcu_head *rcu)
 /*
  * trusted_update - reseal an existing key with new PCR values
  */
-static int trusted_update(struct key *key, const void *data, size_t datalen)
+static int trusted_update(struct key *key, struct key_preparsed_payload *prep)
 {
         struct trusted_key_payload *p = key->payload.data;
         struct trusted_key_payload *new_p;
         struct trusted_key_options *new_o;
+        size_t datalen = prep->datalen;
         char *datablob;
         int ret = 0;
 
         if (!p->migratable)
                 return -EPERM;
-        if (datalen <= 0 || datalen > 32767 || !data)
+        if (datalen <= 0 || datalen > 32767 || !prep->data)
                 return -EINVAL;
 
         datablob = kmalloc(datalen + 1, GFP_KERNEL);
@@ -1008,7 +1010,7 @@ static int trusted_update(struct key *key, const void *data, size_t datalen)
                 goto out;
         }
 
-        memcpy(datablob, data, datalen);
+        memcpy(datablob, prep->data, datalen);
         datablob[datalen] = '\0';
         ret = datablob_parse(datablob, new_p, new_o);
         if (ret != Opt_update) {
diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index c7660a25a3e4..55dc88939185 100644
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -58,13 +58,14 @@ EXPORT_SYMBOL_GPL(key_type_logon);
 /*
  * instantiate a user defined key
  */
-int user_instantiate(struct key *key, const void *data, size_t datalen)
+int user_instantiate(struct key *key, struct key_preparsed_payload *prep)
 {
         struct user_key_payload *upayload;
+        size_t datalen = prep->datalen;
         int ret;
 
         ret = -EINVAL;
-        if (datalen <= 0 || datalen > 32767 || !data)
+        if (datalen <= 0 || datalen > 32767 || !prep->data)
                 goto error;
 
         ret = key_payload_reserve(key, datalen);
@@ -78,7 +79,7 @@ int user_instantiate(struct key *key, const void *data, size_t datalen)
 
         /* attach the data */
         upayload->datalen = datalen;
-        memcpy(upayload->data, data, datalen);
+        memcpy(upayload->data, prep->data, datalen);
         rcu_assign_keypointer(key, upayload);
         ret = 0;
 
@@ -92,13 +93,14 @@ EXPORT_SYMBOL_GPL(user_instantiate);
  * update a user defined key
  * - the key's semaphore is write-locked
  */
-int user_update(struct key *key, const void *data, size_t datalen)
+int user_update(struct key *key, struct key_preparsed_payload *prep)
 {
         struct user_key_payload *upayload, *zap;
+        size_t datalen = prep->datalen;
         int ret;
 
         ret = -EINVAL;
-        if (datalen <= 0 || datalen > 32767 || !data)
+        if (datalen <= 0 || datalen > 32767 || !prep->data)
                 goto error;
 
         /* construct a replacement payload */
@@ -108,7 +110,7 @@ int user_update(struct key *key, const void *data, size_t datalen)
                 goto error;
 
         upayload->datalen = datalen;
-        memcpy(upayload->data, data, datalen);
+        memcpy(upayload->data, prep->data, datalen);
 
         /* check the quota and attach the new data */
         zap = upayload;
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 247264502fb7..f7c968ad5178 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -252,10 +252,10 @@ $(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c
 
 LIB_FILE=$(OUTPUT)libperf.a
 
-LIB_H += ../../include/linux/perf_event.h
+LIB_H += ../../include/uapi/linux/perf_event.h
 LIB_H += ../../include/linux/rbtree.h
 LIB_H += ../../include/linux/list.h
-LIB_H += ../../include/linux/const.h
+LIB_H += ../../include/uapi/linux/const.h
 LIB_H += ../../include/linux/hash.h
 LIB_H += ../../include/linux/stringify.h
 LIB_H += util/include/linux/bitmap.h
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index a89cbbb61801..276287783a03 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -112,7 +112,7 @@ void get_term_dimensions(struct winsize *ws);
 #include <sys/types.h>
 #include <sys/syscall.h>
 
-#include "../../include/linux/perf_event.h"
+#include "../../include/uapi/linux/perf_event.h"
 #include "util/types.h"
 #include <stdbool.h>
 
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index ffdd94e9c9c3..618d41140abd 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -19,7 +19,7 @@
 #include "thread_map.h"
 #include "target.h"
 #include "../../../include/linux/hw_breakpoint.h"
-#include "../../include/linux/perf_event.h"
+#include "../../../include/uapi/linux/perf_event.h"
 #include "perf_regs.h"
 
 #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 3ead0d59c03d..6f94d6dea00f 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -3,7 +3,7 @@
 
 #include <linux/list.h>
 #include <stdbool.h>
-#include "../../../include/linux/perf_event.h"
+#include "../../../include/uapi/linux/perf_event.h"
 #include "types.h"
 #include "xyarray.h"
 #include "cgroup.h"
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 99bdd3abce59..879d215cdac9 100644
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -1,7 +1,7 @@
 #ifndef __PERF_HEADER_H
 #define __PERF_HEADER_H
 
-#include "../../../include/linux/perf_event.h"
+#include "../../../include/uapi/linux/perf_event.h"
 #include <sys/types.h>
 #include <stdbool.h>
 #include "types.h"
diff --git a/tools/perf/util/include/asm/byteorder.h b/tools/perf/util/include/asm/byteorder.h
index b722abe3a626..2a9bdc066307 100644
--- a/tools/perf/util/include/asm/byteorder.h
+++ b/tools/perf/util/include/asm/byteorder.h
@@ -1,2 +1,2 @@
 #include <asm/types.h>
-#include "../../../../include/linux/swab.h"
+#include "../../../../include/uapi/linux/swab.h"
diff --git a/tools/perf/util/include/linux/const.h b/tools/perf/util/include/linux/const.h
index 1b476c9ae649..c10a35e1afb8 100644
--- a/tools/perf/util/include/linux/const.h
+++ b/tools/perf/util/include/linux/const.h
@@ -1 +1 @@
-#include "../../../../include/linux/const.h"
+#include "../../../../include/uapi/linux/const.h"
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index c356e443448d..839230ceb18b 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -7,7 +7,7 @@
 #include <linux/list.h>
 #include <stdbool.h>
 #include "types.h"
-#include "../../../include/linux/perf_event.h"
+#include "../../../include/uapi/linux/perf_event.h"
 #include "types.h"
 
 struct list_head;
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 53c7794fc4be..39f3abac7744 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -2,7 +2,7 @@
 #define __PMU_H
 
 #include <linux/bitops.h>
-#include "../../../include/linux/perf_event.h"
+#include "../../../include/uapi/linux/perf_event.h"
 
 enum {
         PERF_PMU_FORMAT_VALUE_CONFIG,
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index aab414fbb64b..dd6426163ba6 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -7,7 +7,7 @@
 #include "symbol.h"
 #include "thread.h"
 #include <linux/rbtree.h>
-#include "../../../include/linux/perf_event.h"
+#include "../../../include/uapi/linux/perf_event.h"
 
 struct sample_queue;
 struct ip_callchain;