[kernel] backport r21373 to 2.4 kernel

[openwrt.git] / target / linux / generic-2.4 / patches / 114-sched_use_tsc.patch

diff --git a/target/linux/generic-2.4/patches/114-sched_use_tsc.patch b/target/linux/generic-2.4/patches/114-sched_use_tsc.patch
index 5b64310..211b30b 100644 (file)
--- a/target/linux/generic-2.4/patches/114-sched_use_tsc.patch
+++ b/target/linux/generic-2.4/patches/114-sched_use_tsc.patch
@@ -1,7 +1,6 @@
-diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
---- linux.old/arch/mips/kernel/time.c  2005-11-14 11:06:38.661262000 +0100
-+++ linux.dev/arch/mips/kernel/time.c  2005-11-15 20:02:50.059676750 +0100
-@@ -151,6 +151,27 @@
+--- a/arch/mips/kernel/time.c
++++ b/arch/mips/kernel/time.c
+@@ -151,6 +151,27 @@ void (*mips_timer_ack)(void);
  unsigned int (*mips_hpt_read)(void);
  void (*mips_hpt_init)(unsigned int);
  
@@ -29,16 +28,15 @@ diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
  
  /*
   * timeofday services, for syscalls.
-@@ -761,3 +782,5 @@
+@@ -761,3 +782,5 @@ EXPORT_SYMBOL(rtc_lock);
  EXPORT_SYMBOL(to_tm);
  EXPORT_SYMBOL(rtc_set_time);
  EXPORT_SYMBOL(rtc_get_time);
 +EXPORT_SYMBOL(get_htscl);
 +EXPORT_SYMBOL(get_tscll);
-diff -urN linux.old/include/asm-mips/timex.h linux.dev/include/asm-mips/timex.h
---- linux.old/include/asm-mips/timex.h 2005-11-14 11:06:38.685263500 +0100
-+++ linux.dev/include/asm-mips/timex.h 2005-11-14 11:02:21.069163500 +0100
-@@ -31,6 +31,19 @@
+--- a/include/asm-mips/timex.h
++++ b/include/asm-mips/timex.h
+@@ -31,6 +31,19 @@ static inline cycles_t get_cycles (void)
        return read_c0_count();
  }
  
@@ -58,9 +56,8 @@ diff -urN linux.old/include/asm-mips/timex.h linux.dev/include/asm-mips/timex.h
  #define vxtime_lock()         do {} while (0)
  #define vxtime_unlock()               do {} while (0)
  
-diff -urN linux.old/include/net/pkt_sched.h linux.dev/include/net/pkt_sched.h
---- linux.old/include/net/pkt_sched.h  2005-11-14 11:06:38.709265000 +0100
-+++ linux.dev/include/net/pkt_sched.h  2005-11-14 11:02:21.069163500 +0100
+--- a/include/net/pkt_sched.h
++++ b/include/net/pkt_sched.h
 @@ -5,7 +5,11 @@
  #define PSCHED_JIFFIES                2
  #define PSCHED_CPU            3
@@ -73,7 +70,7 @@ diff -urN linux.old/include/net/pkt_sched.h linux.dev/include/net/pkt_sched.h
  
  #include <linux/config.h>
  #include <linux/types.h>
-@@ -271,7 +275,7 @@
+@@ -261,7 +265,7 @@ extern int psched_clock_scale;
  #define PSCHED_US2JIFFIE(delay) (((delay)+psched_clock_per_hz-1)/psched_clock_per_hz)
  #define PSCHED_JIFFIE2US(delay) ((delay)*psched_clock_per_hz)