3 files changed, 21 insertions, 1 deletions

diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c
index c0750291b44a..d9980d47ab81 100644
--- a/arch/alpha/kernel/core_t2.c
+++ b/arch/alpha/kernel/core_t2.c
@@ -74,6 +74,8 @@
 # define DBG(args)
 #endif
 
+DEFINE_SPINLOCK(t2_hae_lock);
+
 static volatile unsigned int t2_mcheck_any_expected;
 static volatile unsigned int t2_mcheck_last_taken;
 
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 36ab22a7ea12..5cf45fc51343 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -71,6 +71,23 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_i
 static void __init
 quirk_cypress(struct pci_dev *dev)
 {
+        /* The Notorious Cy82C693 chip.  */
+
+        /* The generic legacy mode IDE fixup in drivers/pci/probe.c
+           doesn't work correctly with the Cypress IDE controller as
+           it has non-standard register layout.  Fix that.  */
+        if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE) {
+                dev->resource[2].start = dev->resource[3].start = 0;
+                dev->resource[2].end = dev->resource[3].end = 0;
+                dev->resource[2].flags = dev->resource[3].flags = 0;
+                if (PCI_FUNC(dev->devfn) == 2) {
+                        dev->resource[0].start = 0x170;
+                        dev->resource[0].end = 0x177;
+                        dev->resource[1].start = 0x376;
+                        dev->resource[1].end = 0x376;
+                }
+        }
+
         /* The Cypress bridge responds on the PCI bus in the address range
            0xffff0000-0xffffffff (conventional x86 BIOS ROM).  There is no
            way to turn this off.  The bridge also supports several extended
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index dc57790250d2..c778779007fc 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -447,7 +447,7 @@ struct unaligned_stat {
 
 
 /* Macro for exception fixup code to access integer registers.  */
-#define una_reg(r)  (regs->regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)])
+#define una_reg(r)  (_regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)])
 
 
 asmlinkage void
@@ -456,6 +456,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
 {
         long error, tmp1, tmp2, tmp3, tmp4;
         unsigned long pc = regs->pc - 4;
+        unsigned long *_regs = regs->regs;
         const struct exception_table_entry *fixup;
 
         unaligned[0].count++;