32 files changed, 204 insertions, 137 deletions

diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index fbe2932fa9e9..6251a4b10be7 100644
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -291,6 +291,28 @@ struct hvcall_mpp_data {
 };
 
 int h_get_mpp(struct hvcall_mpp_data *);
+
+#ifdef CONFIG_PPC_PSERIES
+extern int CMO_PrPSP;
+extern int CMO_SecPSP;
+extern unsigned long CMO_PageSize;
+
+static inline int cmo_get_primary_psp(void)
+{
+        return CMO_PrPSP;
+}
+
+static inline int cmo_get_secondary_psp(void)
+{
+        return CMO_SecPSP;
+}
+
+static inline unsigned long cmo_get_page_size(void)
+{
+        return CMO_PageSize;
+}
+#endif /* CONFIG_PPC_PSERIES */
+
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_HVCALL_H */
diff --git a/arch/powerpc/include/asm/irqflags.h b/arch/powerpc/include/asm/irqflags.h
index 17ba3a881bfd..5f68ecfdf516 100644
--- a/arch/powerpc/include/asm/irqflags.h
+++ b/arch/powerpc/include/asm/irqflags.h
@@ -20,7 +20,7 @@
 #define TRACE_ENABLE_INTS       bl .trace_hardirqs_on
 #define TRACE_DISABLE_INTS      bl .trace_hardirqs_off
 #define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip)  \
-        cmpdi   en, 0;                          \
+        cmpdi   en,0;                           \
         bne     95f;                            \
         stb     en,PACASOFTIRQEN(r13);          \
         bl      .trace_hardirqs_off;            \
@@ -29,7 +29,8 @@
         li      en,1;
 #define TRACE_AND_RESTORE_IRQ(en)               \
         TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f);  \
-96:     stb     en,PACASOFTIRQEN(r13)
+        stb     en,PACASOFTIRQEN(r13);          \
+96:
 #else
 #define TRACE_ENABLE_INTS
 #define TRACE_DISABLE_INTS
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
index 9102b8bf0ead..6b993ef452ff 100644
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@ -147,7 +147,6 @@ static inline void get_mmu_context(struct mm_struct *mm)
 static inline int init_new_context(struct task_struct *t, struct mm_struct *mm)
 {
         mm->context.id = NO_CONTEXT;
-        mm->context.vdso_base = 0;
         return 0;
 }
 
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
index e084272ed1c2..f6cc7a43b4fa 100644
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@ -92,7 +92,7 @@ COMPAT_SYS_SPU(readlink)
 SYSCALL(uselib)
 SYSCALL(swapon)
 SYSCALL(reboot)
-SYSX(sys_ni_syscall,old32_readdir,old_readdir)
+SYSX(sys_ni_syscall,compat_sys_old_readdir,old_readdir)
 SYSCALL_SPU(mmap)
 SYSCALL_SPU(munmap)
 SYSCALL_SPU(truncate)
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 99ee2f0f0f2b..8bb657519299 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -1155,7 +1155,7 @@ flush_tlbs:
         lis     r10, 0x40
 1:      addic.  r10, r10, -0x1000
         tlbie   r10
-        blt     1b
+        bgt     1b
         sync
         blr
 
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 1a09719c7628..b3eef30b5131 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -416,6 +416,8 @@ static void pseries_cmo_data(struct seq_file *m)
         unsigned long cmo_faults = 0;
         unsigned long cmo_fault_time = 0;
 
+        seq_printf(m, "cmo_enabled=%d\n", firmware_has_feature(FW_FEATURE_CMO));
+
         if (!firmware_has_feature(FW_FEATURE_CMO))
                 return;
 
@@ -427,6 +429,9 @@ static void pseries_cmo_data(struct seq_file *m)
         seq_printf(m, "cmo_faults=%lu\n", cmo_faults);
         seq_printf(m, "cmo_fault_time_usec=%lu\n",
                    cmo_fault_time / tb_ticks_per_usec);
+        seq_printf(m, "cmo_primary_psp=%d\n", cmo_get_primary_psp());
+        seq_printf(m, "cmo_secondary_psp=%d\n", cmo_get_secondary_psp());
+        seq_printf(m, "cmo_page_size=%lu\n", cmo_get_page_size());
 }
 
 static int pseries_lparcfg_data(struct seq_file *m, void *v)
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 6321ae36f729..7a6dfbca7682 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -899,7 +899,7 @@ relocate_new_kernel:
 
         /* set a new stack at the bottom of our page... */
         /* (not really needed now) */
-        addi    r1, r4, KEXEC_CONTROL_CODE_SIZE - 8 /* for LR Save+Back Chain */
+        addi    r1, r4, KEXEC_CONTROL_PAGE_SIZE - 8 /* for LR Save+Back Chain */
         stw     r0, 0(r1)
 
         /* Do the copies */
diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
index af07003573c4..7ff292475269 100644
--- a/arch/powerpc/kernel/module.c
+++ b/arch/powerpc/kernel/module.c
@@ -99,18 +99,3 @@ void module_arch_cleanup(struct module *mod)
 {
         module_bug_cleanup(mod);
 }
-
-struct bug_entry *module_find_bug(unsigned long bugaddr)
-{
-        struct mod_arch_specific *mod;
-        unsigned int i;
-        struct bug_entry *bug;
-
-        list_for_each_entry(mod, &module_bug_list, bug_list) {
-                bug = mod->bug_table;
-                for (i = 0; i < mod->num_bugs; ++i, ++bug)
-                        if (bugaddr == bug->bug_addr)
-                                return bug;
-        }
-        return NULL;
-}
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 709f8cb8bfca..d98634c76060 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -52,63 +52,6 @@
 #include <asm/ppc-pci.h>
 #include <asm/syscalls.h>
 
-struct old_linux_dirent32 {
-        u32             d_ino;
-        u32             d_offset;
-        unsigned short  d_namlen;
-        char            d_name[1];
-};
-
-struct readdir_callback32 {
-        struct old_linux_dirent32 __user * dirent;
-        int count;
-};
-
-static int fillonedir(void * __buf, const char * name, int namlen,
-                                  off_t offset, u64 ino, unsigned int d_type)
-{
-        struct readdir_callback32 * buf = (struct readdir_callback32 *) __buf;
-        struct old_linux_dirent32 __user * dirent;
-        ino_t d_ino;
-
-        if (buf->count)
-                return -EINVAL;
-        d_ino = ino;
-        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
-                return -EOVERFLOW;
-        buf->count++;
-        dirent = buf->dirent;
-        put_user(d_ino, &dirent->d_ino);
-        put_user(offset, &dirent->d_offset);
-        put_user(namlen, &dirent->d_namlen);
-        copy_to_user(dirent->d_name, name, namlen);
-        put_user(0, dirent->d_name + namlen);
-        return 0;
-}
-
-asmlinkage int old32_readdir(unsigned int fd, struct old_linux_dirent32 __user *dirent, unsigned int count)
-{
-        int error = -EBADF;
-        struct file * file;
-        struct readdir_callback32 buf;
-
-        file = fget(fd);
-        if (!file)
-                goto out;
-
-        buf.count = 0;
-        buf.dirent = dirent;
-
-        error = vfs_readdir(file, (filldir_t)fillonedir, &buf);
-        if (error < 0)
-                goto out_putf;
-        error = buf.count;
-
-out_putf:
-        fput(file);
-out:
-        return error;
-}
 
 asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp,
                 compat_ulong_t __user *outp, compat_ulong_t __user *exp,
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index a437267c6bf8..d967c1893ab5 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -2,6 +2,7 @@
 #define _PSERIES_PLPAR_WRAPPERS_H
 
 #include <asm/hvcall.h>
+#include <asm/page.h>
 
 static inline long poll_pending(void)
 {
@@ -44,12 +45,34 @@ static inline long register_slb_shadow(unsigned long cpu, unsigned long vpa)
 
 static inline long plpar_page_set_loaned(unsigned long vpa)
 {
-        return plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED, vpa, 0);
+        unsigned long cmo_page_sz = cmo_get_page_size();
+        long rc = 0;
+        int i;
+
+        for (i = 0; !rc && i < PAGE_SIZE; i += cmo_page_sz)
+                rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED, vpa + i, 0);
+
+        for (i -= cmo_page_sz; rc && i != 0; i -= cmo_page_sz)
+                plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE,
+                                   vpa + i - cmo_page_sz, 0);
+
+        return rc;
 }
 
 static inline long plpar_page_set_active(unsigned long vpa)
 {
-        return plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE, vpa, 0);
+        unsigned long cmo_page_sz = cmo_get_page_size();
+        long rc = 0;
+        int i;
+
+        for (i = 0; !rc && i < PAGE_SIZE; i += cmo_page_sz)
+                rc = plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_ACTIVE, vpa + i, 0);
+
+        for (i -= cmo_page_sz; rc && i != 0; i -= cmo_page_sz)
+                plpar_hcall_norets(H_PAGE_INIT, H_PAGE_SET_LOANED,
+                                   vpa + i - cmo_page_sz, 0);
+
+        return rc;
 }
 
 extern void vpa_init(int cpu);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 063a0d2fba30..3ce8a139b85d 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -68,6 +68,9 @@
 #include "plpar_wrappers.h"
 #include "pseries.h"
 
+int CMO_PrPSP = -1;
+int CMO_SecPSP = -1;
+unsigned long CMO_PageSize = (ASM_CONST(1) << IOMMU_PAGE_SHIFT);
 
 int fwnmi_active;  /* TRUE if an FWNMI handler is present */
 
@@ -325,8 +328,7 @@ void pSeries_cmo_feature_init(void)
 {
         char *ptr, *key, *value, *end;
         int call_status;
-        int PrPSP = -1;
-        int SecPSP = -1;
+        int page_order = IOMMU_PAGE_SHIFT;
 
         pr_debug(" -> fw_cmo_feature_init()\n");
         spin_lock(&rtas_data_buf_lock);
@@ -365,21 +367,31 @@ void pSeries_cmo_feature_init(void)
                                 break;
                         }
 
-                        if (0 == strcmp(key, "PrPSP"))
-                                PrPSP = simple_strtol(value, NULL, 10);
+                        if (0 == strcmp(key, "CMOPageSize"))
+                                page_order = simple_strtol(value, NULL, 10);
+                        else if (0 == strcmp(key, "PrPSP"))
+                                CMO_PrPSP = simple_strtol(value, NULL, 10);
                         else if (0 == strcmp(key, "SecPSP"))
-                                SecPSP = simple_strtol(value, NULL, 10);
+                                CMO_SecPSP = simple_strtol(value, NULL, 10);
                         value = key = ptr + 1;
                 }
                 ptr++;
         }
 
-        if (PrPSP != -1 || SecPSP != -1) {
+        /* Page size is returned as the power of 2 of the page size,
+         * convert to the page size in bytes before returning
+         */
+        CMO_PageSize = 1 << page_order;
+        pr_debug("CMO_PageSize = %lu\n", CMO_PageSize);
+
+        if (CMO_PrPSP != -1 || CMO_SecPSP != -1) {
                 pr_info("CMO enabled\n");
-                pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", PrPSP, SecPSP);
+                pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,
+                         CMO_SecPSP);
                 powerpc_firmware_features |= FW_FEATURE_CMO;
         } else
-                pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", PrPSP, SecPSP);
+                pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,
+                         CMO_SecPSP);
         spin_unlock(&rtas_data_buf_lock);
         pr_debug(" <- fw_cmo_feature_init()\n");
 }
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 217de3ea29e8..b4aeb0f696dc 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -796,6 +796,9 @@ static unsigned long nid_range(unsigned long start, unsigned long end,
                 start += PAGE_SIZE;
         }
 
+        if (start > end)
+                start = end;
+
         return start;
 }
 #else
@@ -1723,8 +1726,7 @@ void __init paging_init(void)
 
         find_ramdisk(phys_base);
 
-        if (cmdline_memory_size)
-                lmb_enforce_memory_limit(phys_base + cmdline_memory_size);
+        lmb_enforce_memory_limit(cmdline_memory_size);
 
         lmb_analyze();
         lmb_dump_all();
@@ -1961,6 +1963,15 @@ void __init mem_init(void)
 void free_initmem(void)
 {
         unsigned long addr, initend;
+        int do_free = 1;
+
+        /* If the physical memory maps were trimmed by kernel command
+         * line options, don't even try freeing this initmem stuff up.
+         * The kernel image could have been in the trimmed out region
+         * and if so the freeing below will free invalid page structs.
+         */
+        if (cmdline_memory_size)
+                do_free = 0;
 
         /*
          * The init section is aligned to 8k in vmlinux.lds. Page align for >8k pagesizes.
@@ -1975,13 +1986,16 @@ void free_initmem(void)
                         ((unsigned long) __va(kern_base)) -
                         ((unsigned long) KERNBASE));
                 memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-                p = virt_to_page(page);
 
-                ClearPageReserved(p);
-                init_page_count(p);
-                __free_page(p);
-                num_physpages++;
-                totalram_pages++;
+                if (do_free) {
+                        p = virt_to_page(page);
+
+                        ClearPageReserved(p);
+                        init_page_count(p);
+                        __free_page(p);
+                        num_physpages++;
+                        totalram_pages++;
+                }
         }
 }
 
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 616b804a2295..cc0ef13fba7a 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -30,6 +30,8 @@
 /* Useful macros */
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+
 extern struct setup_header hdr;
 extern struct boot_params boot_params;
 
diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index 53165c97336b..8c3c25f35578 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -13,7 +13,6 @@
  */
 
 #include "boot.h"
-#include <linux/kernel.h>
 
 #define SMAP    0x534d4150      /* ASCII "SMAP" */
 
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 81e5ab6542d8..426e5d91b63a 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -86,7 +86,7 @@ int acpi_save_state_mem(void)
 #endif /* !CONFIG_64BIT */
 
         header->pmode_cr0 = read_cr0();
-        header->pmode_cr4 = read_cr4();
+        header->pmode_cr4 = read_cr4_safe();
         header->realmode_flags = acpi_realmode_flags;
         header->real_magic = 0x12345678;
 
diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c
index 4b63c8e1f13b..5cab48ee61a4 100644
--- a/arch/x86/kernel/efi_32.c
+++ b/arch/x86/kernel/efi_32.c
@@ -53,7 +53,7 @@ void efi_call_phys_prelog(void)
          * directory. If I have PAE, I just need to duplicate one entry in
          * page directory.
          */
-        cr4 = read_cr4();
+        cr4 = read_cr4_safe();
 
         if (cr4 & X86_CR4_PAE) {
                 efi_bak_pg_dir_pointer[0].pgd =
@@ -91,7 +91,7 @@ void efi_call_phys_epilog(void)
         gdt_descr.size = GDT_SIZE - 1;
         load_gdt(&gdt_descr);
 
-        cr4 = read_cr4();
+        cr4 = read_cr4_safe();
 
         if (cr4 & X86_CR4_PAE) {
                 swapper_pg_dir[pgd_index(0)].pgd =
diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c
index fdfdc550b366..efc2f361fe85 100644
--- a/arch/x86/kernel/mmconf-fam10h_64.c
+++ b/arch/x86/kernel/mmconf-fam10h_64.c
@@ -238,7 +238,7 @@ static struct dmi_system_id __devinitdata mmconf_dmi_table[] = {
         {}
 };
 
-void __init check_enable_amd_mmconf_dmi(void)
+void __cpuinit check_enable_amd_mmconf_dmi(void)
 {
         dmi_check_system(mmconf_dmi_table);
 }
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 678090508a62..b3fb430725cb 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -49,7 +49,7 @@ static int __init mpf_checksum(unsigned char *mp, int len)
         return sum & 0xFF;
 }
 
-static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
+static void __init MP_processor_info(struct mpc_config_processor *m)
 {
         int apicid;
         char *bootup_cpu = "";
@@ -484,7 +484,7 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)
 }
 
 
-static void construct_ioapic_table(int mpc_default_type)
+static void __init construct_ioapic_table(int mpc_default_type)
 {
         struct mpc_config_ioapic ioapic;
         struct mpc_config_bus bus;
@@ -529,7 +529,7 @@ static void construct_ioapic_table(int mpc_default_type)
         construct_default_ioirq_mptable(mpc_default_type);
 }
 #else
-static inline void construct_ioapic_table(int mpc_default_type) { }
+static inline void __init construct_ioapic_table(int mpc_default_type) { }
 #endif
 
 static inline void __init construct_default_ISA_mptable(int mpc_default_type)
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 02d19328525d..218d783ed7a8 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -1350,7 +1350,7 @@ static void calgary_init_bitmap_from_tce_table(struct iommu_table *tbl)
  * Function for kdump case. Get the tce tables from first kernel
  * by reading the contents of the base adress register of calgary iommu
  */
-static void get_tce_space_from_tar(void)
+static void __init get_tce_space_from_tar(void)
 {
         int bus;
         void __iomem *target;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index a8fb8a980fae..e139e617f422 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -756,6 +756,14 @@ static void __cpuinit do_fork_idle(struct work_struct *work)
 }
 
 #ifdef CONFIG_X86_64
+
+/* __ref because it's safe to call free_bootmem when after_bootmem == 0. */
+static void __ref free_bootmem_pda(struct x8664_pda *oldpda)
+{
+        if (!after_bootmem)
+                free_bootmem((unsigned long)oldpda, sizeof(*oldpda));
+}
+
 /*
  * Allocate node local memory for the AP pda.
  *
@@ -784,8 +792,7 @@ int __cpuinit get_local_pda(int cpu)
 
         if (oldpda) {
                 memcpy(newpda, oldpda, size);
-                if (!after_bootmem)
-                        free_bootmem((unsigned long)oldpda, size);
+                free_bootmem_pda(oldpda);
         }
 
         newpda->in_bootmem = 0;
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 7603c0553909..46af71676738 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -104,7 +104,7 @@ __setup("notsc", notsc_setup);
 /*
  * Read TSC and the reference counters. Take care of SMI disturbance
  */
-static u64 __init tsc_read_refs(u64 *pm, u64 *hpet)
+static u64 tsc_read_refs(u64 *pm, u64 *hpet)
 {
         u64 t1, t2;
         int i;
diff --git a/arch/x86/power/cpu_32.c b/arch/x86/power/cpu_32.c
index 7dc5d5cf50a2..d3e083dea720 100644
--- a/arch/x86/power/cpu_32.c
+++ b/arch/x86/power/cpu_32.c
@@ -45,7 +45,7 @@ static void __save_processor_state(struct saved_context *ctxt)
         ctxt->cr0 = read_cr0();
         ctxt->cr2 = read_cr2();
         ctxt->cr3 = read_cr3();
-        ctxt->cr4 = read_cr4();
+        ctxt->cr4 = read_cr4_safe();
 }
 
 /* Needed by apm.c */
@@ -98,7 +98,9 @@ static void __restore_processor_state(struct saved_context *ctxt)
         /*
          * control registers
          */
-        write_cr4(ctxt->cr4);
+        /* cr4 was introduced in the Pentium CPU */
+        if (ctxt->cr4)
+                write_cr4(ctxt->cr4);
         write_cr3(ctxt->cr3);
         write_cr2(ctxt->cr2);
         write_cr0(ctxt->cr0);
diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S
index b95aa6cfe3cb..4fc7e872c85e 100644
--- a/arch/x86/power/hibernate_asm_32.S
+++ b/arch/x86/power/hibernate_asm_32.S
@@ -28,9 +28,9 @@ ENTRY(swsusp_arch_suspend)
         ret
 
 ENTRY(restore_image)
-        movl    resume_pg_dir, %ecx
-        subl    $__PAGE_OFFSET, %ecx
-        movl    %ecx, %cr3
+        movl    resume_pg_dir, %eax
+        subl    $__PAGE_OFFSET, %eax
+        movl    %eax, %cr3
 
         movl    restore_pblist, %edx
         .p2align 4,,7
@@ -52,17 +52,21 @@ copy_loop:
 
 done:
         /* go back to the original page tables */
-        movl    $swapper_pg_dir, %ecx
-        subl    $__PAGE_OFFSET, %ecx
-        movl    %ecx, %cr3
+        movl    $swapper_pg_dir, %eax
+        subl    $__PAGE_OFFSET, %eax
+        movl    %eax, %cr3
         /* Flush TLB, including "global" things (vmalloc) */
-        movl    mmu_cr4_features, %eax
-        movl    %eax, %edx
+        movl    mmu_cr4_features, %ecx
+        jecxz   1f      # cr4 Pentium and higher, skip if zero
+        movl    %ecx, %edx
         andl    $~(1<<7), %edx;  # PGE
         movl    %edx, %cr4;  # turn off PGE
-        movl    %cr3, %ecx;  # flush TLB
-        movl    %ecx, %cr3
-        movl    %eax, %cr4;  # turn PGE back on
+1:
+        movl    %cr3, %eax;  # flush TLB
+        movl    %eax, %cr3
+        jecxz   1f      # cr4 Pentium and higher, skip if zero
+        movl    %ecx, %cr4;  # turn PGE back on
+1:
 
         movl saved_context_esp, %esp
         movl saved_context_ebp, %ebp
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 7c994e1ae276..ae16d845d746 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -595,8 +595,9 @@ static irqreturn_t s3cmci_irq_cd(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, void *buf_id,
-                              int size, enum s3c2410_dma_buffresult result)
+static void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch,
+                                     void *buf_id, int size,
+                                     enum s3c2410_dma_buffresult result)
 {
         struct s3cmci_host *host = buf_id;
         unsigned long iflags;
@@ -740,8 +741,8 @@ request_done:
         mmc_request_done(host->mmc, mrq);
 }
 
-
-void s3cmci_dma_setup(struct s3cmci_host *host, enum s3c2410_dmasrc source)
+static void s3cmci_dma_setup(struct s3cmci_host *host,
+                             enum s3c2410_dmasrc source)
 {
         static enum s3c2410_dmasrc last_source = -1;
         static int setup_ok;
@@ -1003,8 +1004,9 @@ static void s3cmci_send_request(struct mmc_host *mmc)
         enable_irq(host->irq);
 }
 
-static int s3cmci_card_present(struct s3cmci_host *host)
+static int s3cmci_card_present(struct mmc_host *mmc)
 {
+        struct s3cmci_host *host = mmc_priv(mmc);
         struct s3c24xx_mci_pdata *pdata = host->pdata;
         int ret;
 
@@ -1023,7 +1025,7 @@ static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
         host->cmd_is_stop = 0;
         host->mrq = mrq;
 
-        if (s3cmci_card_present(host) == 0) {
+        if (s3cmci_card_present(mmc) == 0) {
                 dbg(host, dbg_err, "%s: no medium present\n", __func__);
                 host->mrq->cmd->error = -ENOMEDIUM;
                 mmc_request_done(mmc, mrq);
@@ -1138,6 +1140,7 @@ static struct mmc_host_ops s3cmci_ops = {
         .request        = s3cmci_request,
         .set_ios        = s3cmci_set_ios,
         .get_ro         = s3cmci_get_ro,
+        .get_cd         = s3cmci_card_present,
 };
 
 static struct s3c24xx_mci_pdata s3cmci_def_pdata = {
@@ -1206,7 +1209,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev, int is2440)
         }
 
         host->base = ioremap(host->mem->start, RESSIZE(host->mem));
-        if (host->base == 0) {
+        if (!host->base) {
                 dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
                 ret = -EINVAL;
                 goto probe_free_mem_region;
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c
index f99e9f721629..1df44d966bdb 100644
--- a/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@ -29,7 +29,6 @@
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/scatterlist.h>
-#include <linux/version.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
diff --git a/include/asm-x86/atomic_64.h b/include/asm-x86/atomic_64.h
index a0095191c02e..91c7d03e65bc 100644
--- a/include/asm-x86/atomic_64.h
+++ b/include/asm-x86/atomic_64.h
@@ -228,7 +228,7 @@ static inline void atomic64_add(long i, atomic64_t *v)
 {
         asm volatile(LOCK_PREFIX "addq %1,%0"
                      : "=m" (v->counter)
-                     : "ir" (i), "m" (v->counter));
+                     : "er" (i), "m" (v->counter));
 }
 
 /**
@@ -242,7 +242,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
 {
         asm volatile(LOCK_PREFIX "subq %1,%0"
                      : "=m" (v->counter)
-                     : "ir" (i), "m" (v->counter));
+                     : "er" (i), "m" (v->counter));
 }
 
 /**
@@ -260,7 +260,7 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
 
         asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
                      : "=m" (v->counter), "=qm" (c)
-                     : "ir" (i), "m" (v->counter) : "memory");
+                     : "er" (i), "m" (v->counter) : "memory");
         return c;
 }
 
@@ -341,7 +341,7 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
 
         asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
                      : "=m" (v->counter), "=qm" (c)
-                     : "ir" (i), "m" (v->counter) : "memory");
+                     : "er" (i), "m" (v->counter) : "memory");
         return c;
 }
 
diff --git a/include/asm-x86/mmconfig.h b/include/asm-x86/mmconfig.h
index 95beda07c6fa..e293ab81e850 100644
--- a/include/asm-x86/mmconfig.h
+++ b/include/asm-x86/mmconfig.h
@@ -3,7 +3,7 @@
 
 #ifdef CONFIG_PCI_MMCONFIG
 extern void __cpuinit fam10h_check_enable_mmcfg(void);
-extern void __init check_enable_amd_mmconf_dmi(void);
+extern void __cpuinit check_enable_amd_mmconf_dmi(void);
 #else
 static inline void fam10h_check_enable_mmcfg(void) { }
 static inline void check_enable_amd_mmconf_dmi(void) { }
diff --git a/include/asm-x86/percpu.h b/include/asm-x86/percpu.h
index 4e91ee1e37aa..f643a3a92da0 100644
--- a/include/asm-x86/percpu.h
+++ b/include/asm-x86/percpu.h
@@ -182,7 +182,7 @@ do {							\
         DEFINE_PER_CPU(_type, _name) = _initvalue;                      \
         __typeof__(_type) _name##_early_map[NR_CPUS] __initdata =       \
                                 { [0 ... NR_CPUS-1] = _initvalue };     \
-        __typeof__(_type) *_name##_early_ptr = _name##_early_map
+        __typeof__(_type) *_name##_early_ptr __refdata = _name##_early_map
 
 #define EXPORT_EARLY_PER_CPU_SYMBOL(_name)                      \
         EXPORT_PER_CPU_SYMBOL(_name)
diff --git a/include/linux/security.h b/include/linux/security.h
index 2ee5ecfb2393..80c4d002864c 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1755,7 +1755,7 @@ static inline int security_ptrace_may_access(struct task_struct *child,
         return cap_ptrace_may_access(child, mode);
 }
 
-static inline int security_ptrace_traceme(struct task_struct *child)
+static inline int security_ptrace_traceme(struct task_struct *parent)
 {
         return cap_ptrace_traceme(parent);
 }
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 77fa776a2da8..3bfb1877a003 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2582,7 +2582,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
         hlock->trylock = trylock;
         hlock->read = read;
         hlock->check = check;
-        hlock->hardirqs_off = hardirqs_off;
+        hlock->hardirqs_off = !!hardirqs_off;
 #ifdef CONFIG_LOCK_STAT
         hlock->waittime_stamp = 0;
         hlock->holdtime_stamp = sched_clock();
diff --git a/lib/lmb.c b/lib/lmb.c
index 5d7b9286503e..97e547037084 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -462,6 +462,8 @@ void __init lmb_enforce_memory_limit(u64 memory_limit)
         if (lmb.memory.region[0].size < lmb.rmo_size)
                 lmb.rmo_size = lmb.memory.region[0].size;
 
+        memory_limit = lmb_end_of_DRAM();
+
         /* And truncate any reserves above the limit also. */
         for (i = 0; i < lmb.reserved.cnt; i++) {
                 p = &lmb.reserved.region[i];
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index add4e87e0b20..b80e725432f0 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6437,6 +6437,39 @@ static void alc882_auto_init_analog_input(struct hda_codec *codec)
         }
 }
 
+static void alc882_auto_init_input_src(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        const struct hda_input_mux *imux = spec->input_mux;
+        int c;
+
+        for (c = 0; c < spec->num_adc_nids; c++) {
+                hda_nid_t conn_list[HDA_MAX_NUM_INPUTS];
+                hda_nid_t nid = spec->capsrc_nids[c];
+                int conns, mute, idx, item;
+
+                conns = snd_hda_get_connections(codec, nid, conn_list,
+                                                ARRAY_SIZE(conn_list));
+                if (conns < 0)
+                        continue;
+                for (idx = 0; idx < conns; idx++) {
+                        /* if the current connection is the selected one,
+                         * unmute it as default - otherwise mute it
+                         */
+                        mute = AMP_IN_MUTE(idx);
+                        for (item = 0; item < imux->num_items; item++) {
+                                if (imux->items[item].index == idx) {
+                                        if (spec->cur_mux[c] == item)
+                                                mute = AMP_IN_UNMUTE(idx);
+                                        break;
+                                }
+                        }
+                        snd_hda_codec_write(codec, nid, 0,
+                                            AC_VERB_SET_AMP_GAIN_MUTE, mute);
+                }
+        }
+}
+
 /* add mic boosts if needed */
 static int alc_auto_add_mic_boost(struct hda_codec *codec)
 {
@@ -6491,6 +6524,7 @@ static void alc882_auto_init(struct hda_codec *codec)
         alc882_auto_init_multi_out(codec);
         alc882_auto_init_hp_out(codec);
         alc882_auto_init_analog_input(codec);
+        alc882_auto_init_input_src(codec);
         if (spec->unsol_event)
                 alc_sku_automute(codec);
 }
@@ -8285,6 +8319,8 @@ static void alc883_auto_init_analog_input(struct hda_codec *codec)
         }
 }
 
+#define alc883_auto_init_input_src      alc882_auto_init_input_src
+
 /* almost identical with ALC880 parser... */
 static int alc883_parse_auto_config(struct hda_codec *codec)
 {
@@ -8315,6 +8351,7 @@ static void alc883_auto_init(struct hda_codec *codec)
         alc883_auto_init_multi_out(codec);
         alc883_auto_init_hp_out(codec);
         alc883_auto_init_analog_input(codec);
+        alc883_auto_init_input_src(codec);
         if (spec->unsol_event)
                 alc_sku_automute(codec);
 }
@@ -9663,6 +9700,7 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
 #define alc262_auto_init_multi_out      alc882_auto_init_multi_out
 #define alc262_auto_init_hp_out         alc882_auto_init_hp_out
 #define alc262_auto_init_analog_input   alc882_auto_init_analog_input
+#define alc262_auto_init_input_src      alc882_auto_init_input_src
 
 
 /* init callback for auto-configuration model -- overriding the default init */
@@ -9672,6 +9710,7 @@ static void alc262_auto_init(struct hda_codec *codec)
         alc262_auto_init_multi_out(codec);
         alc262_auto_init_hp_out(codec);
         alc262_auto_init_analog_input(codec);
+        alc262_auto_init_input_src(codec);
         if (spec->unsol_event)
                 alc_sku_automute(codec);
 }
@@ -13330,6 +13369,8 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
         }
 }
 
+#define alc861vd_auto_init_input_src    alc882_auto_init_input_src
+
 #define alc861vd_idx_to_mixer_vol(nid)          ((nid) + 0x02)
 #define alc861vd_idx_to_mixer_switch(nid)       ((nid) + 0x0c)
 
@@ -13512,6 +13553,7 @@ static void alc861vd_auto_init(struct hda_codec *codec)
         alc861vd_auto_init_multi_out(codec);
         alc861vd_auto_init_hp_out(codec);
         alc861vd_auto_init_analog_input(codec);
+        alc861vd_auto_init_input_src(codec);
         if (spec->unsol_event)
                 alc_sku_automute(codec);
 }
@@ -14677,6 +14719,8 @@ static void alc662_auto_init_analog_input(struct hda_codec *codec)
         }
 }
 
+#define alc662_auto_init_input_src      alc882_auto_init_input_src
+
 static int alc662_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -14733,6 +14777,7 @@ static void alc662_auto_init(struct hda_codec *codec)
         alc662_auto_init_multi_out(codec);
         alc662_auto_init_hp_out(codec);
         alc662_auto_init_analog_input(codec);
+        alc662_auto_init_input_src(codec);
         if (spec->unsol_event)
                 alc_sku_automute(codec);
 }