1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 03:13:20 +02:00

clean up tsc sched patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2499 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2005-11-15 14:48:10 +00:00
parent d277a09238
commit 5d78fad8c4
2 changed files with 16 additions and 8 deletions

View File

@ -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-14 11:10:42.856523250 +0100
@@ -151,6 +151,16 @@
+++ linux.dev/arch/mips/kernel/time.c 2005-11-15 15:21:17.890005500 +0100
@@ -151,6 +151,20 @@
unsigned int (*mips_hpt_read)(void);
void (*mips_hpt_init)(unsigned int);
@ -13,12 +13,16 @@ diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
+extern __u64 get_tscll(void)
+{
+ __u32 c = read_c0_count();
+ return ((((__u64) timerhi) + (c < timerlo)) << 32) | ((__u64) ((__u32) c));
+ __u64 h = (__u64) timerhi;
+ h += (c < timerlo);
+ h <<= 32;
+ h += c;
+ return h;
+}
/*
* timeofday services, for syscalls.
@@ -761,3 +771,5 @@
@@ -761,3 +775,5 @@
EXPORT_SYMBOL(to_tm);
EXPORT_SYMBOL(rtc_set_time);
EXPORT_SYMBOL(rtc_get_time);

View File

@ -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-14 11:10:42.856523250 +0100
@@ -151,6 +151,16 @@
+++ linux.dev/arch/mips/kernel/time.c 2005-11-15 15:21:17.890005500 +0100
@@ -151,6 +151,20 @@
unsigned int (*mips_hpt_read)(void);
void (*mips_hpt_init)(unsigned int);
@ -13,12 +13,16 @@ diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
+extern __u64 get_tscll(void)
+{
+ __u32 c = read_c0_count();
+ return ((((__u64) timerhi) + (c < timerlo)) << 32) | ((__u64) ((__u32) c));
+ __u64 h = (__u64) timerhi;
+ h += (c < timerlo);
+ h <<= 32;
+ h += c;
+ return h;
+}
/*
* timeofday services, for syscalls.
@@ -761,3 +771,5 @@
@@ -761,3 +775,5 @@
EXPORT_SYMBOL(to_tm);
EXPORT_SYMBOL(rtc_set_time);
EXPORT_SYMBOL(rtc_get_time);