11 files changed, 142 insertions, 33 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f16a46e8849c..97b64d7d6bf6 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -614,10 +614,14 @@ config X86_PAE
 
 # Common NUMA Features
 config NUMA
-        bool "Numa Memory Allocation and Scheduler Support"
-        depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI)
+        bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
+        depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL
         default n if X86_PC
         default y if (X86_NUMAQ || X86_SUMMIT)
+        help
+          NUMA support for i386. This is currently high experimental
+          and should be only used for kernel development. It might also
+          cause boot failures.
 
 comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
         depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
index 01ffdd4964f0..fcb38e7f3543 100644
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
@@ -249,9 +249,10 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)
         pmd_k = pmd_offset(pud_k, address);
         if (!pmd_present(*pmd_k))
                 return NULL;
-        if (!pmd_present(*pmd))
+        if (!pmd_present(*pmd)) {
                 set_pmd(pmd, *pmd_k);
-        else
+                arch_flush_lazy_mmu_mode();
+        } else
                 BUG_ON(pmd_page(*pmd) != pmd_page(*pmd_k));
         return pmd_k;
 }
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 9fb0ce5c7176..114c90f8f560 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -251,6 +251,8 @@ DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8568E, quirk_fsl_pcie_transpare
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8568, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8567E, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8567, quirk_fsl_pcie_transparent);
+DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533E, quirk_fsl_pcie_transparent);
+DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_transparent);
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index ad4ca75c0f04..5245717295b8 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -60,17 +60,28 @@ static void hypfs_add_dentry(struct dentry *dentry)
         hypfs_last_dentry = dentry;
 }
 
+static inline int hypfs_positive(struct dentry *dentry)
+{
+        return dentry->d_inode && !d_unhashed(dentry);
+}
+
 static void hypfs_remove(struct dentry *dentry)
 {
         struct dentry *parent;
 
         parent = dentry->d_parent;
-        if (S_ISDIR(dentry->d_inode->i_mode))
-                simple_rmdir(parent->d_inode, dentry);
-        else
-                simple_unlink(parent->d_inode, dentry);
+        if (!parent || !parent->d_inode)
+                return;
+        mutex_lock(&parent->d_inode->i_mutex);
+        if (hypfs_positive(dentry)) {
+                if (S_ISDIR(dentry->d_inode->i_mode))
+                        simple_rmdir(parent->d_inode, dentry);
+                else
+                        simple_unlink(parent->d_inode, dentry);
+        }
         d_delete(dentry);
         dput(dentry);
+        mutex_unlock(&parent->d_inode->i_mutex);
 }
 
 static void hypfs_delete_tree(struct dentry *root)
@@ -315,6 +326,7 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent)
         }
         hypfs_update_update(sb);
         sb->s_root = root_dentry;
+        printk(KERN_INFO "hypfs: Hypervisor filesystem mounted\n");
         return 0;
 
 err_tree:
@@ -356,13 +368,17 @@ static struct dentry *hypfs_create_file(struct super_block *sb,
         qname.name = name;
         qname.len = strlen(name);
         qname.hash = full_name_hash(name, qname.len);
+        mutex_lock(&parent->d_inode->i_mutex);
         dentry = lookup_one_len(name, parent, strlen(name));
-        if (IS_ERR(dentry))
-                return ERR_PTR(-ENOMEM);
+        if (IS_ERR(dentry)) {
+                dentry = ERR_PTR(-ENOMEM);
+                goto fail;
+        }
         inode = hypfs_make_inode(sb, mode);
         if (!inode) {
                 dput(dentry);
-                return ERR_PTR(-ENOMEM);
+                dentry = ERR_PTR(-ENOMEM);
+                goto fail;
         }
         if (mode & S_IFREG) {
                 inode->i_fop = &hypfs_file_ops;
@@ -379,6 +395,8 @@ static struct dentry *hypfs_create_file(struct super_block *sb,
         inode->i_private = data;
         d_instantiate(dentry, inode);
         dget(dentry);
+fail:
+        mutex_unlock(&parent->d_inode->i_mutex);
         return dentry;
 }
 
@@ -391,7 +409,6 @@ struct dentry *hypfs_mkdir(struct super_block *sb, struct dentry *parent,
         if (IS_ERR(dentry))
                 return dentry;
         hypfs_add_dentry(dentry);
-        parent->d_inode->i_nlink++;
         return dentry;
 }
 
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 3195d375bd51..56cb71007cd9 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -6,7 +6,7 @@ EXTRA_AFLAGS	:= -traditional
 
 obj-y   :=  bitmap.o traps.o time.o process.o base.o early.o \
             setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
-            semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o
+            semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o diag.o
 
 obj-y   += $(if $(CONFIG_64BIT),entry64.o,entry.o)
 obj-y   += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
new file mode 100644
index 000000000000..c032d11da8a1
--- /dev/null
+++ b/arch/s390/kernel/diag.c
@@ -0,0 +1,102 @@
+/*
+ * Implementation of s390 diagnose codes
+ *
+ * Copyright IBM Corp. 2007
+ * Author(s): Michael Holzheu <holzheu@de.ibm.com>
+ */
+
+#include <linux/module.h>
+#include <asm/diag.h>
+
+/*
+ * Diagnose 10: Release pages
+ */
+void diag10(unsigned long addr)
+{
+        if (addr >= 0x7ff00000)
+                return;
+        asm volatile(
+#ifdef CONFIG_64BIT
+                "       sam31\n"
+                "       diag    %0,%0,0x10\n"
+                "0:     sam64\n"
+#else
+                "       diag    %0,%0,0x10\n"
+                "0:\n"
+#endif
+                EX_TABLE(0b, 0b)
+                : : "a" (addr));
+}
+EXPORT_SYMBOL(diag10);
+
+/*
+ * Diagnose 14: Input spool file manipulation
+ */
+int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode)
+{
+        register unsigned long _ry1 asm("2") = ry1;
+        register unsigned long _ry2 asm("3") = subcode;
+        int rc = 0;
+
+        asm volatile(
+#ifdef CONFIG_64BIT
+                "   sam31\n"
+                "   diag    %2,2,0x14\n"
+                "   sam64\n"
+#else
+                "   diag    %2,2,0x14\n"
+#endif
+                "   ipm     %0\n"
+                "   srl     %0,28\n"
+                : "=d" (rc), "+d" (_ry2)
+                : "d" (rx), "d" (_ry1)
+                : "cc");
+
+        return rc;
+}
+EXPORT_SYMBOL(diag14);
+
+/*
+ * Diagnose 210: Get information about a virtual device
+ */
+int diag210(struct diag210 *addr)
+{
+        /*
+         * diag 210 needs its data below the 2GB border, so we
+         * use a static data area to be sure
+         */
+        static struct diag210 diag210_tmp;
+        static DEFINE_SPINLOCK(diag210_lock);
+        unsigned long flags;
+        int ccode;
+
+        spin_lock_irqsave(&diag210_lock, flags);
+        diag210_tmp = *addr;
+
+#ifdef CONFIG_64BIT
+        asm volatile(
+                "       lhi     %0,-1\n"
+                "       sam31\n"
+                "       diag    %1,0,0x210\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "1:     sam64\n"
+                EX_TABLE(0b, 1b)
+                : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");
+#else
+        asm volatile(
+                "       lhi     %0,-1\n"
+                "       diag    %1,0,0x210\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "1:\n"
+                EX_TABLE(0b, 1b)
+                : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");
+#endif
+
+        *addr = diag210_tmp;
+        spin_unlock_irqrestore(&diag210_lock, flags);
+
+        return ccode;
+}
+EXPORT_SYMBOL(diag210);
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index d3057318f2bf..50d2235df732 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -577,7 +577,7 @@ static struct insn opcode_b2[] = {
         { "esta", 0x4a, INSTR_RRE_RR },
         { "lura", 0x4b, INSTR_RRE_RR },
         { "tar", 0x4c, INSTR_RRE_AR },
-        { "cpya", INSTR_RRE_AA },
+        { "cpya", 0x4d, INSTR_RRE_AA },
         { "sar", 0x4e, INSTR_RRE_AR },
         { "ear", 0x4f, INSTR_RRE_RA },
         { "csp", 0x50, INSTR_RRE_RR },
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 358d2bbbc481..e40373d9fbce 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -85,7 +85,7 @@ void __kprobes get_instruction_type(struct arch_specific_insn *ainsn)
         ainsn->reg = (*ainsn->insn & 0xf0) >> 4;
 
         /* save the instruction length (pop 5-5) in bytes */
-        switch (*(__u8 *) (ainsn->insn) >> 4) {
+        switch (*(__u8 *) (ainsn->insn) >> 6) {
         case 0:
                 ainsn->ilen = 2;
                 break;
diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c
index 90b5ef529eb7..7234c737f825 100644
--- a/arch/s390/kernel/s390_ksyms.c
+++ b/arch/s390/kernel/s390_ksyms.c
@@ -25,7 +25,6 @@ EXPORT_SYMBOL(_oi_bitmap);
 EXPORT_SYMBOL(_ni_bitmap);
 EXPORT_SYMBOL(_zb_findmap);
 EXPORT_SYMBOL(_sb_findmap);
-EXPORT_SYMBOL(diag10);
 
 /*
  * semaphore ops
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index c5b2f4f078bc..fabc50adc46a 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -20,6 +20,7 @@
 
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>
+#include <asm/diag.h>
 
 static char *sender = "VMRMSVM";
 module_param(sender, charp, 0400);
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 9098531a2671..3a25bbf2eb0a 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -42,23 +42,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE)));
 char  empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));
 
-void diag10(unsigned long addr)
-{
-        if (addr >= 0x7ff00000)
-                return;
-        asm volatile(
-#ifdef CONFIG_64BIT
-                "       sam31\n"
-                "       diag    %0,%0,0x10\n"
-                "0:     sam64\n"
-#else
-                "       diag    %0,%0,0x10\n"
-                "0:\n"
-#endif
-                EX_TABLE(0b,0b)
-                : : "a" (addr));
-}
-
 void show_mem(void)
 {
         int i, total = 0, reserved = 0;