ar71xx: merge dev-ar9{13,34}x-wmac into dev-ar9xxx-wmac

[openwrt.git] / target / linux / lantiq / patches / 010-mips_clocksource_init_war.patch

diff --git a/target/linux/lantiq/patches/010-mips_clocksource_init_war.patch b/target/linux/lantiq/patches/010-mips_clocksource_init_war.patch
index 81eabc6..1670ccb 100644 (file)
--- a/target/linux/lantiq/patches/010-mips_clocksource_init_war.patch
+++ b/target/linux/lantiq/patches/010-mips_clocksource_init_war.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/kernel/cevt-r4k.c
 +++ b/arch/mips/kernel/cevt-r4k.c
 --- a/arch/mips/kernel/cevt-r4k.c
 +++ b/arch/mips/kernel/cevt-r4k.c

-@@ -22,6 +22,22 @@
+@@ -23,6 +23,22 @@

  
  #ifndef CONFIG_MIPS_MT_SMTC
  
  
  #ifndef CONFIG_MIPS_MT_SMTC
  


@@ -23,11 +23,11 @@
  static int mips_next_event(unsigned long delta,
                             struct clock_event_device *evt)
  {
  static int mips_next_event(unsigned long delta,
                             struct clock_event_device *evt)
  {

-@@ -31,6 +47,7 @@ static int mips_next_event(unsigned long
+@@ -32,6 +48,7 @@

        cnt = read_c0_count();
        cnt += delta;
        write_c0_compare(cnt);
 +      compare_change_hazard();
        cnt = read_c0_count();
        cnt += delta;
        write_c0_compare(cnt);
 +      compare_change_hazard();

-       res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
+       res = ((int)(read_c0_count() - cnt) >= 0) ? -ETIME : 0;

        return res;
  }
        return res;
  }