33 files changed, 149 insertions, 152 deletions

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 076c35cd6cde..98a1525fa164 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -285,8 +285,12 @@ pcibios_claim_one_bus(struct pci_bus *b)
                         if (r->parent || !r->start || !r->flags)
                                 continue;
                         if (pci_has_flag(PCI_PROBE_ONLY) ||
-                            (r->flags & IORESOURCE_PCI_FIXED))
-                                pci_claim_resource(dev, i);
+                            (r->flags & IORESOURCE_PCI_FIXED)) {
+                                if (pci_claim_resource(dev, i) == 0)
+                                        continue;
+
+                                pci_claim_bridge_resource(dev, i);
+                        }
                 }
         }
 
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index ea282c7c0ca5..e2fed2712249 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -406,7 +406,7 @@
                 clock-frequency = <400000>;
 
                 magnetometer@c {
-                        compatible = "ak,ak8975";
+                        compatible = "asahi-kasei,ak8975";
                         reg = <0xc>;
                         interrupt-parent = <&gpio>;
                         interrupts = <TEGRA_GPIO(N, 5) IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 4176df721bf0..1a0045abead7 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -253,21 +253,22 @@
         .endm
 
         .macro  restore_user_regs, fast = 0, offset = 0
-        ldr     r1, [sp, #\offset + S_PSR]      @ get calling cpsr
-        ldr     lr, [sp, #\offset + S_PC]!      @ get pc
+        mov     r2, sp
+        ldr     r1, [r2, #\offset + S_PSR]      @ get calling cpsr
+        ldr     lr, [r2, #\offset + S_PC]!      @ get pc
         msr     spsr_cxsf, r1                   @ save in spsr_svc
 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
         @ We must avoid clrex due to Cortex-A15 erratum #830321
-        strex   r1, r2, [sp]                    @ clear the exclusive monitor
+        strex   r1, r2, [r2]                    @ clear the exclusive monitor
 #endif
         .if     \fast
-        ldmdb   sp, {r1 - lr}^                  @ get calling r1 - lr
+        ldmdb   r2, {r1 - lr}^                  @ get calling r1 - lr
         .else
-        ldmdb   sp, {r0 - lr}^                  @ get calling r0 - lr
+        ldmdb   r2, {r0 - lr}^                  @ get calling r0 - lr
         .endif
         mov     r0, r0                          @ ARMv5T and earlier require a nop
                                                 @ after ldm {}^
-        add     sp, sp, #S_FRAME_SIZE - S_PC
+        add     sp, sp, #\offset + S_FRAME_SIZE
         movs    pc, lr                          @ return & move spsr_svc into cpsr
         .endm
 
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index f7c65adaa428..557e128e4df0 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -116,8 +116,14 @@ int armpmu_event_set_period(struct perf_event *event)
                 ret = 1;
         }
 
-        if (left > (s64)armpmu->max_period)
-                left = armpmu->max_period;
+        /*
+         * Limit the maximum period to prevent the counter value
+         * from overtaking the one we are about to program. In
+         * effect we are reducing max_period to account for
+         * interrupt latency (and we are being very conservative).
+         */
+        if (left > (armpmu->max_period >> 1))
+                left = armpmu->max_period >> 1;
 
         local64_set(&hwc->prev_count, (u64)-left);
 
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 715ae19bc7c8..e55408e96559 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -657,10 +657,13 @@ int __init arm_add_memory(u64 start, u64 size)
 
         /*
          * Ensure that start/size are aligned to a page boundary.
-         * Size is appropriately rounded down, start is rounded up.
+         * Size is rounded down, start is rounded up.
          */
-        size -= start & ~PAGE_MASK;
         aligned_start = PAGE_ALIGN(start);
+        if (aligned_start > start + size)
+                size = 0;
+        else
+                size -= aligned_start - start;
 
 #ifndef CONFIG_ARCH_PHYS_ADDR_T_64BIT
         if (aligned_start > ULONG_MAX) {
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 1c43cec971b5..066688863920 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -85,6 +85,7 @@ vdso_install:
 # We use MRPROPER_FILES and CLEAN_FILES now
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
+        $(Q)$(MAKE) $(clean)=$(boot)/dts
 
 define archhelp
   echo  '* Image.gz      - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 3b8d427c3985..c62b0f4d9ef6 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -3,6 +3,4 @@ dts-dirs += apm
 dts-dirs += arm
 dts-dirs += cavium
 
-always          := $(dtb-y)
 subdir-y        := $(dts-dirs)
-clean-files     := *.dtb
diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c
index cf33f33333cc..d54dc9ac4b70 100644
--- a/arch/arm64/mm/dump.c
+++ b/arch/arm64/mm/dump.c
@@ -15,6 +15,7 @@
  */
 #include <linux/debugfs.h>
 #include <linux/fs.h>
+#include <linux/io.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/seq_file.h>
diff --git a/arch/avr32/kernel/module.c b/arch/avr32/kernel/module.c
index 2c9412908024..164efa009e5b 100644
--- a/arch/avr32/kernel/module.c
+++ b/arch/avr32/kernel/module.c
@@ -19,12 +19,10 @@
 #include <linux/moduleloader.h>
 #include <linux/vmalloc.h>
 
-void module_free(struct module *mod, void *module_region)
+void module_arch_freeing_init(struct module *mod)
 {
         vfree(mod->arch.syminfo);
         mod->arch.syminfo = NULL;
-
-        vfree(module_region);
 }
 
 static inline int check_rela(Elf32_Rela *rela, struct module *module,
@@ -291,12 +289,3 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
 
         return ret;
 }
-
-int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-                    struct module *module)
-{
-        vfree(module->arch.syminfo);
-        module->arch.syminfo = NULL;
-
-        return 0;
-}
diff --git a/arch/cris/kernel/module.c b/arch/cris/kernel/module.c
index 51123f985eb5..af04cb6b6dc9 100644
--- a/arch/cris/kernel/module.c
+++ b/arch/cris/kernel/module.c
@@ -36,7 +36,7 @@ void *module_alloc(unsigned long size)
 }
 
 /* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
+void module_memfree(void *module_region)
 {
         kfree(module_region);
 }
diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c
index 67b1d1685759..0635bd6c2af3 100644
--- a/arch/frv/mb93090-mb00/pci-frv.c
+++ b/arch/frv/mb93090-mb00/pci-frv.c
@@ -94,7 +94,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
                                 r = &dev->resource[idx];
                                 if (!r->start)
                                         continue;
-                                pci_claim_resource(dev, idx);
+                                pci_claim_bridge_resource(dev, idx);
                         }
                 }
                 pcibios_allocate_bus_resources(&bus->children);
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index 24603be24c14..29754aae5177 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -305,14 +305,12 @@ plt_target (struct plt_entry *plt)
 #endif /* !USE_BRL */
 
 void
-module_free (struct module *mod, void *module_region)
+module_arch_freeing_init (struct module *mod)
 {
-        if (mod && mod->arch.init_unw_table &&
-            module_region == mod->module_init) {
+        if (mod->arch.init_unw_table) {
                 unw_remove_unwind_table(mod->arch.init_unw_table);
                 mod->arch.init_unw_table = NULL;
         }
-        vfree(module_region);
 }
 
 /* Have we already seen one of these relocations? */
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 291a582777cf..900cc93e5409 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -487,45 +487,39 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
         return 0;
 }
 
-static int is_valid_resource(struct pci_dev *dev, int idx)
+void pcibios_fixup_device_resources(struct pci_dev *dev)
 {
-        unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
-        struct resource *devr = &dev->resource[idx], *busr;
+        int idx;
 
         if (!dev->bus)
-                return 0;
-
-        pci_bus_for_each_resource(dev->bus, busr, i) {
-                if (!busr || ((busr->flags ^ devr->flags) & type_mask))
-                        continue;
-                if ((devr->start) && (devr->start >= busr->start) &&
-                                (devr->end <= busr->end))
-                        return 1;
-        }
-        return 0;
-}
+                return;
 
-static void pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)
-{
-        int i;
+        for (idx = 0; idx < PCI_BRIDGE_RESOURCES; idx++) {
+                struct resource *r = &dev->resource[idx];
 
-        for (i = start; i < limit; i++) {
-                if (!dev->resource[i].flags)
+                if (!r->flags || r->parent || !r->start)
                         continue;
-                if ((is_valid_resource(dev, i)))
-                        pci_claim_resource(dev, i);
-        }
-}
 
-void pcibios_fixup_device_resources(struct pci_dev *dev)
-{
-        pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES);
+                pci_claim_resource(dev, idx);
+        }
 }
 EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources);
 
 static void pcibios_fixup_bridge_resources(struct pci_dev *dev)
 {
-        pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES);
+        int idx;
+
+        if (!dev->bus)
+                return;
+
+        for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
+                struct resource *r = &dev->resource[idx];
+
+                if (!r->flags || r->parent || !r->start)
+                        continue;
+
+                pci_claim_bridge_resource(dev, idx);
+        }
 }
 
 /*
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index b30e41c0c033..48528fb81eff 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -1026,6 +1026,8 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
                          pr, (pr && pr->name) ? pr->name : "nil");
 
                 if (pr && !(pr->flags & IORESOURCE_UNSET)) {
+                        struct pci_dev *dev = bus->self;
+
                         if (request_resource(pr, res) == 0)
                                 continue;
                         /*
@@ -1035,6 +1037,12 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
                          */
                         if (reparent_resources(pr, res) == 0)
                                 continue;
+
+                        if (dev && i < PCI_BRIDGE_RESOURCE_NUM &&
+                            pci_claim_bridge_resource(dev,
+                                                 i + PCI_BRIDGE_RESOURCES) == 0)
+                                continue;
+
                 }
                 pr_warn("PCI: Cannot allocate resource region ");
                 pr_cont("%d of PCI bridge %d, will remap\n", i, bus->number);
@@ -1227,7 +1235,10 @@ void pcibios_claim_one_bus(struct pci_bus *bus)
                                  (unsigned long long)r->end,
                                  (unsigned int)r->flags);
 
-                        pci_claim_resource(dev, i);
+                        if (pci_claim_resource(dev, i) == 0)
+                                continue;
+
+                        pci_claim_bridge_resource(dev, i);
                 }
         }
 
diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 9fd6834a2172..5d6139390bf8 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -1388,7 +1388,7 @@ out:
 void bpf_jit_free(struct bpf_prog *fp)
 {
         if (fp->jited)
-                module_free(NULL, fp->bpf_func);
+                module_memfree(fp->bpf_func);
 
         bpf_prog_unlock_free(fp);
 }
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.c b/arch/mn10300/unit-asb2305/pci-asb2305.c
index febb9cd83177..b5b036f64275 100644
--- a/arch/mn10300/unit-asb2305/pci-asb2305.c
+++ b/arch/mn10300/unit-asb2305/pci-asb2305.c
@@ -106,7 +106,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
                                 if (!r->flags)
                                         continue;
                                 if (!r->start ||
-                                    pci_claim_resource(dev, idx) < 0) {
+                                    pci_claim_bridge_resource(dev, idx) < 0) {
                                         printk(KERN_ERR "PCI:"
                                                " Cannot allocate resource"
                                                " region %d of bridge %s\n",
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c
index 6b4339f8c9c2..471ff398090c 100644
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
@@ -281,42 +281,37 @@ static int __init pci_check_direct(void)
         return -ENODEV;
 }
 
-static int is_valid_resource(struct pci_dev *dev, int idx)
+static void pcibios_fixup_device_resources(struct pci_dev *dev)
 {
-        unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
-        struct resource *devr = &dev->resource[idx], *busr;
-
-        if (dev->bus) {
-                pci_bus_for_each_resource(dev->bus, busr, i) {
-                        if (!busr || (busr->flags ^ devr->flags) & type_mask)
-                                continue;
-
-                        if (devr->start &&
-                            devr->start >= busr->start &&
-                            devr->end <= busr->end)
-                                return 1;
-                }
-        }
+        int idx;
 
-        return 0;
+        if (!dev->bus)
+                return;
+
+        for (idx = 0; idx < PCI_BRIDGE_RESOURCES; idx++) {
+                struct resource *r = &dev->resource[idx];
+
+                if (!r->flags || r->parent || !r->start)
+                        continue;
+
+                pci_claim_resource(dev, idx);
+        }
 }
 
-static void pcibios_fixup_device_resources(struct pci_dev *dev)
+static void pcibios_fixup_bridge_resources(struct pci_dev *dev)
 {
-        int limit, i;
+        int idx;
 
-        if (dev->bus->number != 0)
+        if (!dev->bus)
                 return;
 
-        limit = (dev->hdr_type == PCI_HEADER_TYPE_NORMAL) ?
-                PCI_BRIDGE_RESOURCES : PCI_NUM_RESOURCES;
+        for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
+                struct resource *r = &dev->resource[idx];
 
-        for (i = 0; i < limit; i++) {
-                if (!dev->resource[i].flags)
+                if (!r->flags || r->parent || !r->start)
                         continue;
 
-                if (is_valid_resource(dev, i))
-                        pci_claim_resource(dev, i);
+                pci_claim_bridge_resource(dev, idx);
         }
 }
 
@@ -330,7 +325,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
 
         if (bus->self) {
                 pci_read_bridge_bases(bus);
-                pcibios_fixup_device_resources(bus->self);
+                pcibios_fixup_bridge_resources(bus->self);
         }
 
         list_for_each_entry(dev, &bus->devices, bus_list)
diff --git a/arch/nios2/kernel/module.c b/arch/nios2/kernel/module.c
index cc924a38f22a..e2e3f13f98d5 100644
--- a/arch/nios2/kernel/module.c
+++ b/arch/nios2/kernel/module.c
@@ -36,7 +36,7 @@ void *module_alloc(unsigned long size)
 }
 
 /* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
+void module_memfree(void *module_region)
 {
         kfree(module_region);
 }
diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c
index f9d27883a714..2d0ea25be171 100644
--- a/arch/nios2/kernel/signal.c
+++ b/arch/nios2/kernel/signal.c
@@ -200,7 +200,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
 
         /* Set up to return from userspace; jump to fixed address sigreturn
            trampoline on kuser page.  */
-        regs->ra = (unsigned long) (0x1040);
+        regs->ra = (unsigned long) (0x1044);
 
         /* Set up registers for signal handler */
         regs->sp = (unsigned long) frame;
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
index 50dfafc3f2c1..5822e8e200e6 100644
--- a/arch/parisc/kernel/module.c
+++ b/arch/parisc/kernel/module.c
@@ -298,14 +298,10 @@ static inline unsigned long count_stubs(const Elf_Rela *rela, unsigned long n)
 }
 #endif
 
-
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
+void module_arch_freeing_init(struct module *mod)
 {
         kfree(mod->arch.section);
         mod->arch.section = NULL;
-
-        vfree(module_region);
 }
 
 /* Additional bytes needed in front of individual sections */
diff --git a/arch/powerpc/crypto/sha1.c b/arch/powerpc/crypto/sha1.c
index d3feba5a275f..c154cebc1041 100644
--- a/arch/powerpc/crypto/sha1.c
+++ b/arch/powerpc/crypto/sha1.c
@@ -154,4 +154,5 @@ module_exit(sha1_powerpc_mod_fini);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
 
+MODULE_ALIAS_CRYPTO("sha1");
 MODULE_ALIAS_CRYPTO("sha1-powerpc");
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 37d512d35943..2a525c938158 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1184,6 +1184,8 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
                          pr, (pr && pr->name) ? pr->name : "nil");
 
                 if (pr && !(pr->flags & IORESOURCE_UNSET)) {
+                        struct pci_dev *dev = bus->self;
+
                         if (request_resource(pr, res) == 0)
                                 continue;
                         /*
@@ -1193,6 +1195,11 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
                          */
                         if (reparent_resources(pr, res) == 0)
                                 continue;
+
+                        if (dev && i < PCI_BRIDGE_RESOURCE_NUM &&
+                            pci_claim_bridge_resource(dev,
+                                                i + PCI_BRIDGE_RESOURCES) == 0)
+                                continue;
                 }
                 pr_warning("PCI: Cannot allocate resource region "
                            "%d of PCI bridge %d, will remap\n", i, bus->number);
@@ -1401,7 +1408,10 @@ void pcibios_claim_one_bus(struct pci_bus *bus)
                                  (unsigned long long)r->end,
                                  (unsigned int)r->flags);
 
-                        pci_claim_resource(dev, i);
+                        if (pci_claim_resource(dev, i) == 0)
+                                continue;
+
+                        pci_claim_bridge_resource(dev, i);
                 }
         }
 
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index 1ca125b9c226..d1916b577f2c 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -699,7 +699,7 @@ out:
 void bpf_jit_free(struct bpf_prog *fp)
 {
         if (fp->jited)
-                module_free(NULL, fp->bpf_func);
+                module_memfree(fp->bpf_func);
 
         bpf_prog_unlock_free(fp);
 }
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index b89b59158b95..409d152585be 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -55,14 +55,10 @@ void *module_alloc(unsigned long size)
 }
 #endif
 
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
+void module_arch_freeing_init(struct module *mod)
 {
-        if (mod) {
-                vfree(mod->arch.syminfo);
-                mod->arch.syminfo = NULL;
-        }
-        vfree(module_region);
+        vfree(mod->arch.syminfo);
+        mod->arch.syminfo = NULL;
 }
 
 static void check_rela(Elf_Rela *rela, struct module *me)
diff --git a/arch/s390/net/bpf_jit.S b/arch/s390/net/bpf_jit.S
index 7e45d13816c1..ba44c9f55346 100644
--- a/arch/s390/net/bpf_jit.S
+++ b/arch/s390/net/bpf_jit.S
@@ -22,8 +22,8 @@
  * skb_copy_bits takes 4 parameters:
  *   %r2 = skb pointer
  *   %r3 = offset into skb data
- *   %r4 = length to copy
- *   %r5 = pointer to temp buffer
+ *   %r4 = pointer to temp buffer
+ *   %r5 = length to copy
  */
 #define SKBDATA %r8
 
@@ -44,8 +44,9 @@ ENTRY(sk_load_word)
 
 sk_load_word_slow:
         lgr     %r9,%r2                 # save %r2
-        lhi     %r4,4                   # 4 bytes
-        la      %r5,160(%r15)           # pointer to temp buffer
+        lgr     %r3,%r1                 # offset
+        la      %r4,160(%r15)           # pointer to temp buffer
+        lghi    %r5,4                   # 4 bytes
         brasl   %r14,skb_copy_bits      # get data from skb
         l       %r5,160(%r15)           # load result from temp buffer
         ltgr    %r2,%r2                 # set cc to (%r2 != 0)
@@ -69,8 +70,9 @@ ENTRY(sk_load_half)
 
 sk_load_half_slow:
         lgr     %r9,%r2                 # save %r2
-        lhi     %r4,2                   # 2 bytes
-        la      %r5,162(%r15)           # pointer to temp buffer
+        lgr     %r3,%r1                 # offset
+        la      %r4,162(%r15)           # pointer to temp buffer
+        lghi    %r5,2                   # 2 bytes
         brasl   %r14,skb_copy_bits      # get data from skb
         xc      160(2,%r15),160(%r15)
         l       %r5,160(%r15)           # load result from temp buffer
@@ -95,8 +97,9 @@ ENTRY(sk_load_byte)
 
 sk_load_byte_slow:
         lgr     %r9,%r2                 # save %r2
-        lhi     %r4,1                   # 1 bytes
-        la      %r5,163(%r15)           # pointer to temp buffer
+        lgr     %r3,%r1                 # offset
+        la      %r4,163(%r15)           # pointer to temp buffer
+        lghi    %r5,1                   # 1 byte
         brasl   %r14,skb_copy_bits      # get data from skb
         xc      160(3,%r15),160(%r15)
         l       %r5,160(%r15)           # load result from temp buffer
@@ -104,11 +107,11 @@ sk_load_byte_slow:
         lgr     %r2,%r9                 # restore %r2
         br      %r8
 
-        /* A = (*(u8 *)(skb->data+K) & 0xf) << 2 */
+        /* X = (*(u8 *)(skb->data+K) & 0xf) << 2 */
 ENTRY(sk_load_byte_msh)
         llgfr   %r1,%r3                 # extend offset
         clr     %r11,%r3                # hlen < offset ?
-        jle     sk_load_byte_slow
+        jle     sk_load_byte_msh_slow
         lhi     %r12,0
         ic      %r12,0(%r1,%r10)        # get byte from skb
         nill    %r12,0x0f
@@ -118,8 +121,9 @@ ENTRY(sk_load_byte_msh)
 
 sk_load_byte_msh_slow:
         lgr     %r9,%r2                 # save %r2
-        lhi     %r4,2                   # 2 bytes
-        la      %r5,162(%r15)           # pointer to temp buffer
+        lgr     %r3,%r1                 # offset
+        la      %r4,163(%r15)           # pointer to temp buffer
+        lghi    %r5,1                   # 1 byte
         brasl   %r14,skb_copy_bits      # get data from skb
         xc      160(3,%r15),160(%r15)
         l       %r12,160(%r15)          # load result from temp buffer
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 524496d47ef5..bbd1981cc150 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -448,15 +448,12 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter,
                 mask = 0x800000; /* je */
 kbranch:        /* Emit compare if the branch targets are different */
                 if (filter->jt != filter->jf) {
-                        if (K <= 16383)
-                                /* chi %r5,<K> */
-                                EMIT4_IMM(0xa75e0000, K);
-                        else if (test_facility(21))
+                        if (test_facility(21))
                                 /* clfi %r5,<K> */
                                 EMIT6_IMM(0xc25f0000, K);
                         else
-                                /* c %r5,<d(K)>(%r13) */
-                                EMIT4_DISP(0x5950d000, EMIT_CONST(K));
+                                /* cl %r5,<d(K)>(%r13) */
+                                EMIT4_DISP(0x5550d000, EMIT_CONST(K));
                 }
 branch:         if (filter->jt == filter->jf) {
                         if (filter->jt == 0)
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index b36365f49478..9ce5afe167ff 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -639,7 +639,10 @@ static void pci_claim_bus_resources(struct pci_bus *bus)
                                        (unsigned long long)r->end,
                                        (unsigned int)r->flags);
 
-                        pci_claim_resource(dev, i);
+                        if (pci_claim_resource(dev, i) == 0)
+                                continue;
+
+                        pci_claim_bridge_resource(dev, i);
                 }
         }
 
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index f33e7c7a3bf7..7931eeeb649a 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -776,7 +776,7 @@ cond_branch:			f_offset = addrs[i + filter[i].jf];
                                 if (unlikely(proglen + ilen > oldproglen)) {
                                         pr_err("bpb_jit_compile fatal error\n");
                                         kfree(addrs);
-                                        module_free(NULL, image);
+                                        module_memfree(image);
                                         return;
                                 }
                                 memcpy(image + proglen, temp, ilen);
@@ -822,7 +822,7 @@ out:
 void bpf_jit_free(struct bpf_prog *fp)
 {
         if (fp->jited)
-                module_free(NULL, fp->bpf_func);
+                module_memfree(fp->bpf_func);
 
         bpf_prog_unlock_free(fp);
 }
diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c
index 96447c9160a0..2305084c9b93 100644
--- a/arch/tile/kernel/module.c
+++ b/arch/tile/kernel/module.c
@@ -74,7 +74,7 @@ error:
 
 
 /* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
+void module_memfree(void *module_region)
 {
         vfree(module_region);
 
@@ -83,7 +83,7 @@ void module_free(struct module *mod, void *module_region)
                      0, 0, 0, NULL, NULL, 0);
 
         /*
-         * FIXME: If module_region == mod->module_init, trim exception
+         * FIXME: Add module_arch_freeing_init to trim exception
          * table entries.
          */
 }
diff --git a/arch/x86/crypto/sha-mb/sha1_mb.c b/arch/x86/crypto/sha-mb/sha1_mb.c
index a225a5ca1037..fd9f6b035b16 100644
--- a/arch/x86/crypto/sha-mb/sha1_mb.c
+++ b/arch/x86/crypto/sha-mb/sha1_mb.c
@@ -931,4 +931,4 @@ module_exit(sha1_mb_mod_fini);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, multi buffer accelerated");
 
-MODULE_ALIAS("sha1");
+MODULE_ALIAS_CRYPTO("sha1");
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 2142376dc8c6..8b7b0a51e742 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -674,7 +674,7 @@ static inline void *alloc_tramp(unsigned long size)
 }
 static inline void tramp_free(void *tramp)
 {
-        module_free(NULL, tramp);
+        module_memfree(tramp);
 }
 #else
 /* Trampolines can only be created if modules are supported */
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 169b09d76ddd..de12c1d379f1 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2348,7 +2348,7 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt)
          * Not recognized on AMD in compat mode (but is recognized in legacy
          * mode).
          */
-        if ((ctxt->mode == X86EMUL_MODE_PROT32) && (efer & EFER_LMA)
+        if ((ctxt->mode != X86EMUL_MODE_PROT64) && (efer & EFER_LMA)
             && !vendor_intel(ctxt))
                 return emulate_ud(ctxt);
 
@@ -2359,25 +2359,13 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt)
         setup_syscalls_segments(ctxt, &cs, &ss);
 
         ops->get_msr(ctxt, MSR_IA32_SYSENTER_CS, &msr_data);
-        switch (ctxt->mode) {
-        case X86EMUL_MODE_PROT32:
-                if ((msr_data & 0xfffc) == 0x0)
-                        return emulate_gp(ctxt, 0);
-                break;
-        case X86EMUL_MODE_PROT64:
-                if (msr_data == 0x0)
-                        return emulate_gp(ctxt, 0);
-                break;
-        default:
-                break;
-        }
+        if ((msr_data & 0xfffc) == 0x0)
+                return emulate_gp(ctxt, 0);
 
         ctxt->eflags &= ~(EFLG_VM | EFLG_IF);
-        cs_sel = (u16)msr_data;
-        cs_sel &= ~SELECTOR_RPL_MASK;
+        cs_sel = (u16)msr_data & ~SELECTOR_RPL_MASK;
         ss_sel = cs_sel + 8;
-        ss_sel &= ~SELECTOR_RPL_MASK;
-        if (ctxt->mode == X86EMUL_MODE_PROT64 || (efer & EFER_LMA)) {
+        if (efer & EFER_LMA) {
                 cs.d = 0;
                 cs.l = 1;
         }
@@ -2386,10 +2374,11 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt)
         ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);
 
         ops->get_msr(ctxt, MSR_IA32_SYSENTER_EIP, &msr_data);
-        ctxt->_eip = msr_data;
+        ctxt->_eip = (efer & EFER_LMA) ? msr_data : (u32)msr_data;
 
         ops->get_msr(ctxt, MSR_IA32_SYSENTER_ESP, &msr_data);
-        *reg_write(ctxt, VCPU_REGS_RSP) = msr_data;
+        *reg_write(ctxt, VCPU_REGS_RSP) = (efer & EFER_LMA) ? msr_data :
+                                                              (u32)msr_data;
 
         return X86EMUL_CONTINUE;
 }
@@ -3791,8 +3780,8 @@ static const struct opcode group5[] = {
 };
 
 static const struct opcode group6[] = {
-        DI(Prot,        sldt),
-        DI(Prot,        str),
+        DI(Prot | DstMem,       sldt),
+        DI(Prot | DstMem,       str),
         II(Prot | Priv | SrcMem16, em_lldt, lldt),
         II(Prot | Priv | SrcMem16, em_ltr, ltr),
         N, N, N, N,
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 9b18ef315a55..349c0d32cc0b 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -216,7 +216,7 @@ static void pcibios_allocate_bridge_resources(struct pci_dev *dev)
                         continue;
                 if (r->parent)  /* Already allocated */
                         continue;
-                if (!r->start || pci_claim_resource(dev, idx) < 0) {
+                if (!r->start || pci_claim_bridge_resource(dev, idx) < 0) {
                         /*
                          * Something is wrong with the region.
                          * Invalidate the resource to prevent