target/linux/rdc/patches-2.6.25/005-fix_amit_breakage.patch

   1 diff -ru linux-2.6.24.7.orig/arch/x86/boot/boot.h linux-2.6.24.7/arch/x86/boot/boot.h
   2 --- linux-2.6.24.7.orig/arch/x86/boot/boot.h    2008-10-26 20:18:14.000000000 -0700
   3 +++ linux-2.6.24.7/arch/x86/boot/boot.h 2008-10-26 20:18:36.000000000 -0700
   4 @@ -60,7 +60,7 @@
   5  {
   6         asm volatile("outl %0,%1" : : "a" (v), "dN" (port));
   7  }
   8 -static inline u32 inl(u32 port)
   9 +static inline u32 inl(u16 port)
  10  {
  11         u32 v;
  12         asm volatile("inl %1,%0" : "=a" (v) : "dN" (port));
  13 diff -ru linux-2.6.24.7.orig/arch/x86/boot/pm.c linux-2.6.24.7/arch/x86/boot/pm.c
  14 --- linux-2.6.24.7.orig/arch/x86/boot/pm.c      2008-10-26 19:55:50.000000000 -0700
  15 +++ linux-2.6.24.7/arch/x86/boot/pm.c   2008-10-26 21:38:12.000000000 -0700
  16 @@ -16,6 +16,9 @@
  17
  18  #include "boot.h"
  19  #include <asm/segment.h>
  20 +#ifdef CONFIG_X86_RDC
  21 +#include <asm/mach-rdc/rdc321x_defs.h>
  22 +#endif
  23
  24  /*
  25   * Invoke the realmode switch hook if present; otherwise
  26 @@ -160,6 +163,16 @@
  27                 die();
  28         }
  29
  30 +#ifdef CONFIG_X86_RDC
  31 +       {
  32 +               u32 bootctl;
  33 +
  34 +               outl(0x80003840, RDC3210_CFGREG_ADDR);
  35 +               bootctl = inl(RDC3210_CFGREG_DATA) | 0x07ff0000;
  36 +               outl(bootctl, RDC3210_CFGREG_DATA);
  37 +       }
  38 +#endif
  39 +
  40         /* Reset coprocessor (IGNNE#) */
  41         reset_coprocessor();
  42