target/linux/cavium-octeon/patches/014-clocksource_fixes.patch

   1 From: Coly Li <coly.li@suse.de>
   2 Date: Wed, 22 Apr 2009 19:06:06 +0000 (+0800)
   3 Subject: MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read()
   4 X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=06a4801f5f580bb98dd813466668592943f7baea;hp=bb13f16bff55ce7ffb67d0d600bab72b9cab773b
   5
   6 MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read()
   7
   8 This patch modifies parameter of octeon_cvmcount_read() from 'void' to
   9 'struct clocksource *cs', which fixes compile warning for incompatible
  10 parameter type.
  11
  12 Signed-off-by: Coly Li <coly.li@suse.de>
  13 Cc: David Daney <ddaney@caviumnetworks.com>
  14 Cc: Ingo Molnar <mingo@elte.hu>
  15 Reviewed-by: David Daney <ddaney@caviumnetworks.com>
  16 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  17 ---
  18
  19 diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c
  20 index 70fd92c..96110f2 100644
  21 --- a/arch/mips/cavium-octeon/csrc-octeon.c
  22 +++ b/arch/mips/cavium-octeon/csrc-octeon.c
  23 @@ -38,7 +38,7 @@ void octeon_init_cvmcount(void)
  24         local_irq_restore(flags);
  25  }
  26
  27 -static cycle_t octeon_cvmcount_read(void)
  28 +static cycle_t octeon_cvmcount_read(struct clocksource *cs)
  29  {
  30         return read_c0_cvmcount();
  31  }