Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: video drivers: add facility level
  sparc: tcx.c make tcx_init and tcx_exit static
  sparc: ffb.c make ffb_init and ffb_exit static
  sparc: cg14.c make cg14_init and cg15_exit static
  sparc: bw2.c fix bw2_exit
  sparc64: Fix accidental syscall restart on child return from clone/fork/vfork.
  sparc64: Clean up handling of pt_regs trap type encoding.
  sparc: Remove old style signal frame support.
  sparc64: Kill bogus RT_ALIGNEDSZ macro from signal.c
  sparc: sunzilog.c remove unused argument
  sparc: fix drivers/video/tcx.c warning
  sparc64: Kill unused local ISA bus layer.
  input: Rewrite sparcspkr device probing.
  sparc64: Do not ignore 'pmu' device ranges.
  sparc64: Kill ISA_FLOPPY_WORKS code.
  sparc64: Kill CONFIG_SPARC32_COMPAT
  sparc64: Cleanups and corrections for arch/sparc64/Kconfig
  sparc64: Fix wedged irq regression.

4 files changed, 25 insertions, 135 deletions

diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h
index c47f58d6c15c..ca19f80a9b7d 100644
--- a/include/asm-sparc64/floppy.h
+++ b/include/asm-sparc64/floppy.h
@@ -293,7 +293,6 @@ static int sun_fd_eject(int drive)
 
 #ifdef CONFIG_PCI
 #include <asm/ebus.h>
-#include <asm/isa.h>
 #include <asm/ns87303.h>
 
 static struct ebus_dma_info sun_pci_fd_ebus_dma;
@@ -558,82 +557,6 @@ static int __init ebus_fdthree_p(struct linux_ebus_device *edev)
 }
 #endif
 
-#ifdef CONFIG_PCI
-#undef ISA_FLOPPY_WORKS
-
-#ifdef ISA_FLOPPY_WORKS
-static unsigned long __init isa_floppy_init(void)
-{
-        struct sparc_isa_bridge *isa_br;
-        struct sparc_isa_device *isa_dev = NULL;
-
-        for_each_isa(isa_br) {
-                for_each_isadev(isa_dev, isa_br) {
-                        if (!strcmp(isa_dev->prom_node->name, "dma")) {
-                                struct sparc_isa_device *child =
-                                        isa_dev->child;
-
-                                while (child) {
-                                        if (!strcmp(child->prom_node->name,
-                                                    "floppy")) {
-                                                isa_dev = child;
-                                                goto isa_done;
-                                        }
-                                        child = child->next;
-                                }
-                        }
-                }
-        }
-isa_done:
-        if (!isa_dev)
-                return 0;
-
-        /* We could use DMA on devices behind the ISA bridge, but...
-         *
-         * There is a slight problem.  Normally on x86 kit the x86 processor
-         * delays I/O port instructions when the ISA bus "dma in progress"
-         * signal is active.  Well, sparc64 systems do not monitor this
-         * signal thus we would need to block all I/O port accesses in software
-         * when a dma transfer is active for some device.
-         */
-
-        sun_fdc = (struct sun_flpy_controller *)isa_dev->resource.start;
-        FLOPPY_IRQ = isa_dev->irq;
-
-        sun_fdops.fd_inb = sun_pci_fd_inb;
-        sun_fdops.fd_outb = sun_pci_fd_outb;
-
-        can_use_virtual_dma = use_virtual_dma = 1;
-        sun_fdops.fd_enable_dma = sun_fd_enable_dma;
-        sun_fdops.fd_disable_dma = sun_fd_disable_dma;
-        sun_fdops.fd_set_dma_mode = sun_fd_set_dma_mode;
-        sun_fdops.fd_set_dma_addr = sun_fd_set_dma_addr;
-        sun_fdops.fd_set_dma_count = sun_fd_set_dma_count;
-        sun_fdops.get_dma_residue = sun_get_dma_residue;
-
-        sun_fdops.fd_request_irq = sun_fd_request_irq;
-        sun_fdops.fd_free_irq = sun_fd_free_irq;
-
-        /* Floppy eject is manual.   Actually, could determine this
-         * via presence of 'manual' property in OBP node.
-         */
-        sun_fdops.fd_eject = sun_pci_fd_eject;
-
-        fdc_status = (unsigned long) &sun_fdc->status_82077;
-
-        allowed_drive_mask = 0;
-        sun_floppy_types[0] = 0;
-        sun_floppy_types[1] = 4;
-
-        sun_pci_broken_drive = 1;
-        sun_fdops.fd_outb = sun_pci_fd_broken_outb;
-
-        return sun_floppy_types[0];
-}
-#endif /* ISA_FLOPPY_WORKS */
-
-#endif
-
 static unsigned long __init sun_floppy_init(void)
 {
         char state[128];
@@ -667,13 +590,8 @@ static unsigned long __init sun_floppy_init(void)
                         }
                 }
         ebus_done:
-                if (!edev) {
-#ifdef ISA_FLOPPY_WORKS
-                        return isa_floppy_init();
-#else
+                if (!edev)
                         return 0;
-#endif
-                }
 
                 state_prop = of_get_property(edev->prom_node, "status", NULL);
                 if (state_prop && !strncmp(state_prop, "disabled", 8))
diff --git a/include/asm-sparc64/isa.h b/include/asm-sparc64/isa.h
deleted file mode 100644
index ecd9290f78d4..000000000000
--- a/include/asm-sparc64/isa.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $Id: isa.h,v 1.1 2001/05/11 04:31:55 davem Exp $
- * isa.h: Sparc64 layer for PCI to ISA bridge devices.
- *
- * Copyright (C) 2001 David S. Miller (davem@redhat.com)
- */
-
-#ifndef __SPARC64_ISA_H
-#define __SPARC64_ISA_H
-
-#include <asm/oplib.h>
-#include <asm/prom.h>
-#include <asm/of_device.h>
-
-struct sparc_isa_bridge;
-
-struct sparc_isa_device {
-        struct of_device        ofdev;
-        struct sparc_isa_device *next;
-        struct sparc_isa_device *child;
-        struct sparc_isa_bridge *bus;
-        struct device_node      *prom_node;
-        struct resource         resource;
-        unsigned int            irq;
-};
-#define to_isa_device(d) container_of(d, struct sparc_isa_device, ofdev.dev)
-
-struct sparc_isa_bridge {
-        struct of_device        ofdev;
-        struct sparc_isa_bridge *next;
-        struct sparc_isa_device *devices;
-        struct pci_dev          *self;
-        int                     index;
-        struct device_node      *prom_node;
-};
-#define to_isa_bridge(d) container_of(d, struct sparc_isa_bridge, ofdev.dev)
-
-extern struct sparc_isa_bridge  *isa_chain;
-
-extern void isa_init(void);
-
-#define for_each_isa(bus)                                               \
-        for((bus) = isa_chain; (bus); (bus) = (bus)->next)
-
-#define for_each_isadev(dev, bus)                                       \
-        for((dev) = (bus)->devices; (dev); (dev) = (dev)->next)
-
-#endif /* !(__SPARC64_ISA_H) */
diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h
index b4b951d570bb..714b81956f32 100644
--- a/include/asm-sparc64/ptrace.h
+++ b/include/asm-sparc64/ptrace.h
@@ -1,4 +1,3 @@
-/* $Id: ptrace.h,v 1.14 2002/02/09 19:49:32 davem Exp $ */
 #ifndef _SPARC64_PTRACE_H
 #define _SPARC64_PTRACE_H
 
@@ -8,10 +7,15 @@
  * stack during a system call and basically all traps.
  */
 
+/* This magic value must have the low 9 bits clear,
+ * as that is where we encode the %tt value, see below.
+ */
 #define PT_REGS_MAGIC 0x57ac6c00
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
+
 struct pt_regs {
         unsigned long u_regs[16]; /* globals and ins */
         unsigned long tstate;
@@ -33,6 +37,23 @@ struct pt_regs {
         unsigned int magic;
 };
 
+static inline int pt_regs_trap_type(struct pt_regs *regs)
+{
+        return regs->magic & 0x1ff;
+}
+
+static inline int pt_regs_clear_trap_type(struct pt_regs *regs)
+{
+        return regs->magic &= ~0x1ff;
+}
+
+static inline bool pt_regs_is_syscall(struct pt_regs *regs)
+{
+        int tt = pt_regs_trap_type(regs);
+
+        return (tt == 0x110 || tt == 0x111 || tt == 0x16d);
+}
+
 struct pt_regs32 {
         unsigned int psr;
         unsigned int pc;
diff --git a/include/asm-sparc64/thread_info.h b/include/asm-sparc64/thread_info.h
index 98252cd44dd6..71e42d1a80d9 100644
--- a/include/asm-sparc64/thread_info.h
+++ b/include/asm-sparc64/thread_info.h
@@ -1,5 +1,4 @@
-/* $Id: thread_info.h,v 1.1 2002/02/10 00:00:58 davem Exp $
- * thread_info.h: sparc64 low-level thread information
+/* thread_info.h: sparc64 low-level thread information
  *
  * Copyright (C) 2002  David S. Miller (davem@redhat.com)
  */
@@ -223,7 +222,7 @@ register struct thread_info *current_thread_info_reg asm("g6");
 #define TIF_NEED_RESCHED        3       /* rescheduling necessary */
 #define TIF_PERFCTR             4       /* performance counters active */
 #define TIF_UNALIGNED           5       /* allowed to do unaligned accesses */
-#define TIF_NEWSIGNALS          6       /* wants new-style signals */
+/* flag bit 6 is available */
 #define TIF_32BIT               7       /* 32-bit binary */
 /* flag bit 8 is available */
 #define TIF_SECCOMP             9       /* secure computing */
@@ -242,7 +241,6 @@ register struct thread_info *current_thread_info_reg asm("g6");
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_PERFCTR            (1<<TIF_PERFCTR)
 #define _TIF_UNALIGNED          (1<<TIF_UNALIGNED)
-#define _TIF_NEWSIGNALS         (1<<TIF_NEWSIGNALS)
 #define _TIF_32BIT              (1<<TIF_32BIT)
 #define _TIF_SECCOMP            (1<<TIF_SECCOMP)
 #define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)