Changeset 2499


Ignore:
Timestamp:
2005-11-15T15:48:10+01:00 (11 years ago)
Author:
nbd
Message:

clean up tsc sched patch

Location:
trunk/openwrt/target/linux/linux-2.4/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/linux-2.4/patches/ar7/006-sched_use_tsc.patch

    r2483 r2499  
    11diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c 
    22--- linux.old/arch/mips/kernel/time.c   2005-11-14 11:06:38.661262000 +0100 
    3 +++ linux.dev/arch/mips/kernel/time.c   2005-11-14 11:10:42.856523250 +0100 
    4 @@ -151,6 +151,16 @@ 
     3+++ linux.dev/arch/mips/kernel/time.c   2005-11-15 15:21:17.890005500 +0100 
     4@@ -151,6 +151,20 @@ 
    55 unsigned int (*mips_hpt_read)(void); 
    66 void (*mips_hpt_init)(unsigned int); 
     
    1414+{ 
    1515+       __u32 c = read_c0_count(); 
    16 +       return ((((__u64) timerhi) + (c < timerlo)) << 32) | ((__u64) ((__u32) c)); 
     16+       __u64 h = (__u64) timerhi; 
     17+       h += (c < timerlo); 
     18+       h <<= 32; 
     19+       h += c; 
     20+       return h;        
    1721+} 
    1822  
    1923 /* 
    2024  * timeofday services, for syscalls. 
    21 @@ -761,3 +771,5 @@ 
     25@@ -761,3 +775,5 @@ 
    2226 EXPORT_SYMBOL(to_tm); 
    2327 EXPORT_SYMBOL(rtc_set_time); 
  • trunk/openwrt/target/linux/linux-2.4/patches/brcm/007-sched_use_tsc.patch

    r2483 r2499  
    11diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c 
    22--- linux.old/arch/mips/kernel/time.c   2005-11-14 11:06:38.661262000 +0100 
    3 +++ linux.dev/arch/mips/kernel/time.c   2005-11-14 11:10:42.856523250 +0100 
    4 @@ -151,6 +151,16 @@ 
     3+++ linux.dev/arch/mips/kernel/time.c   2005-11-15 15:21:17.890005500 +0100 
     4@@ -151,6 +151,20 @@ 
    55 unsigned int (*mips_hpt_read)(void); 
    66 void (*mips_hpt_init)(unsigned int); 
     
    1414+{ 
    1515+       __u32 c = read_c0_count(); 
    16 +       return ((((__u64) timerhi) + (c < timerlo)) << 32) | ((__u64) ((__u32) c)); 
     16+       __u64 h = (__u64) timerhi; 
     17+       h += (c < timerlo); 
     18+       h <<= 32; 
     19+       h += c; 
     20+       return h;        
    1721+} 
    1822  
    1923 /* 
    2024  * timeofday services, for syscalls. 
    21 @@ -761,3 +771,5 @@ 
     25@@ -761,3 +775,5 @@ 
    2226 EXPORT_SYMBOL(to_tm); 
    2327 EXPORT_SYMBOL(rtc_set_time); 
Note: See TracChangeset for help on using the changeset viewer.