target/linux/octeon/patches-2.6.30/013-compile_fixes.patch

   1 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
   2 +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
   3 @@ -272,6 +272,7 @@ fix_ipd_exit:
   4   *
   5   * Returns Zero on success, negative on failure
   6   */
   7 +#if 0
   8  int __cvmx_helper_errata_asx_pass1(int interface, int port, int cpu_clock_hz)
   9  {
  10         /* Set hi water mark as per errata GMX-4 */
  11 @@ -289,6 +290,7 @@ int __cvmx_helper_errata_asx_pass1(int i
  12                              cpu_clock_hz);
  13         return 0;
  14  }
  15 +#endif
  16
  17  /**
  18   * This function needs to be called on all Octeon chips with
  19 --- a/arch/mips/include/asm/octeon/cvmx-helper-errata.h
  20 +++ b/arch/mips/include/asm/octeon/cvmx-helper-errata.h
  21 @@ -60,8 +60,8 @@ extern int __cvmx_helper_errata_fix_ipd_
  22   *
  23   * Returns Zero on success, negative on failure
  24   */
  25 -extern int __cvmx_helper_errata_asx_pass1(int interface, int port,
  26 -                                         int cpu_clock_hz);
  27 +//extern int __cvmx_helper_errata_asx_pass1(int interface, int port,
  28 +//                                       int cpu_clock_hz);
  29
  30  /**
  31   * This function needs to be called on all Octeon chips with
  32 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
  33 +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
  34 @@ -356,6 +356,7 @@ int cvmx_helper_get_ipd_port(int interfa
  35   *
  36   * Returns Interface number
  37   */
  38 +#if 0
  39  int cvmx_helper_get_interface_num(int ipd_port)
  40  {
  41         if (ipd_port < 16)
  42 @@ -372,6 +373,7 @@ int cvmx_helper_get_interface_num(int ip
  43
  44         return -1;
  45  }
  46 +#endif
  47
  48  /**
  49   * Returns the interface index number for an IPD/PKO port
  50 @@ -381,6 +383,7 @@ int cvmx_helper_get_interface_num(int ip
  51   *
  52   * Returns Interface index number
  53   */
  54 +#if 0
  55  int cvmx_helper_get_interface_index_num(int ipd_port)
  56  {
  57         if (ipd_port < 32)
  58 @@ -395,6 +398,7 @@ int cvmx_helper_get_interface_index_num(
  59
  60         return -1;
  61  }
  62 +#endif
  63
  64  /**
  65   * Initialize the internal QLM JTAG logic to allow programming
  66 --- a/arch/mips/include/asm/octeon/cvmx-helper-util.h
  67 +++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h
  68 @@ -205,7 +205,7 @@ static inline void cvmx_helper_free_pack
  69   *
  70   * Returns Interface number
  71   */
  72 -extern int cvmx_helper_get_interface_num(int ipd_port);
  73 +//extern int cvmx_helper_get_interface_num(int ipd_port);
  74
  75  /**
  76   * Returns the interface index number for an IPD/PKO port
  77 @@ -215,7 +215,7 @@ extern int cvmx_helper_get_interface_num
  78   *
  79   * Returns Interface index number
  80   */
  81 -extern int cvmx_helper_get_interface_index_num(int ipd_port);
  82 +//extern int cvmx_helper_get_interface_index_num(int ipd_port);
  83
  84  /**
  85   * Initialize the internal QLM JTAG logic to allow programming