summaryrefslogtreecommitdiff
path: root/target/linux/linux-2.4
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-15 19:24:51 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-15 19:24:51 +0000
commit05c925b56497090ca0739dc3f6422f855b330348 (patch)
tree8ccbf9d1eb67e66ca2c090b4c09b02ccd5c07ae8 /target/linux/linux-2.4
parent5d78fad8c4ce7bb29041565bf25633a0f59f738b (diff)
work around the remaining race condition in the tsc sched stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2503 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/linux-2.4')
-rw-r--r--target/linux/linux-2.4/patches/ar7/006-sched_use_tsc.patch17
-rw-r--r--target/linux/linux-2.4/patches/brcm/007-sched_use_tsc.patch17
2 files changed, 24 insertions, 10 deletions
diff --git a/target/linux/linux-2.4/patches/ar7/006-sched_use_tsc.patch b/target/linux/linux-2.4/patches/ar7/006-sched_use_tsc.patch
index 69bf01a768..5b64310738 100644
--- a/target/linux/linux-2.4/patches/ar7/006-sched_use_tsc.patch
+++ b/target/linux/linux-2.4/patches/ar7/006-sched_use_tsc.patch
@@ -1,7 +1,7 @@
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 15:21:17.890005500 +0100
-@@ -151,6 +151,20 @@
++++ linux.dev/arch/mips/kernel/time.c 2005-11-15 20:02:50.059676750 +0100
+@@ -151,6 +151,27 @@
unsigned int (*mips_hpt_read)(void);
void (*mips_hpt_init)(unsigned int);
@@ -10,19 +10,26 @@ diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
+ return timerhi;
+}
+
++static __u64 tscll_last = 0;
++
+extern __u64 get_tscll(void)
+{
-+ __u32 c = read_c0_count();
+ __u64 h = (__u64) timerhi;
-+ h += (c < timerlo);
++ __u32 c = read_c0_count();
++
+ h <<= 32;
+ h += c;
++
++ while (h < tscll_last)
++ h += (((__u64) 1) << 32);
++
++ tscll_last = h;
+ return h;
+}
/*
* timeofday services, for syscalls.
-@@ -761,3 +775,5 @@
+@@ -761,3 +782,5 @@
EXPORT_SYMBOL(to_tm);
EXPORT_SYMBOL(rtc_set_time);
EXPORT_SYMBOL(rtc_get_time);
diff --git a/target/linux/linux-2.4/patches/brcm/007-sched_use_tsc.patch b/target/linux/linux-2.4/patches/brcm/007-sched_use_tsc.patch
index 69bf01a768..5b64310738 100644
--- a/target/linux/linux-2.4/patches/brcm/007-sched_use_tsc.patch
+++ b/target/linux/linux-2.4/patches/brcm/007-sched_use_tsc.patch
@@ -1,7 +1,7 @@
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 15:21:17.890005500 +0100
-@@ -151,6 +151,20 @@
++++ linux.dev/arch/mips/kernel/time.c 2005-11-15 20:02:50.059676750 +0100
+@@ -151,6 +151,27 @@
unsigned int (*mips_hpt_read)(void);
void (*mips_hpt_init)(unsigned int);
@@ -10,19 +10,26 @@ diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
+ return timerhi;
+}
+
++static __u64 tscll_last = 0;
++
+extern __u64 get_tscll(void)
+{
-+ __u32 c = read_c0_count();
+ __u64 h = (__u64) timerhi;
-+ h += (c < timerlo);
++ __u32 c = read_c0_count();
++
+ h <<= 32;
+ h += c;
++
++ while (h < tscll_last)
++ h += (((__u64) 1) << 32);
++
++ tscll_last = h;
+ return h;
+}
/*
* timeofday services, for syscalls.
-@@ -761,3 +775,5 @@
+@@ -761,3 +782,5 @@
EXPORT_SYMBOL(to_tm);
EXPORT_SYMBOL(rtc_set_time);
EXPORT_SYMBOL(rtc_get_time);