From 90fba37c49479ed4e5233dc0d348cdf7d24c9ee1 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 6 Jan 2008 19:28:07 +0000 Subject: update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom-wl to a contributed version (v4.150.10.5) - no bcm57xx support yet, will follow shortly git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10137 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic-2.4/patches/114-sched_use_tsc.patch | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to '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 5b6431073..30f984476 100644 --- 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,6 +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 20:02:50.059676750 +0100 +Index: linux-2.4.35.4/arch/mips/kernel/time.c +=================================================================== +--- linux-2.4.35.4.orig/arch/mips/kernel/time.c 2007-12-15 05:19:41.138765402 +0100 ++++ linux-2.4.35.4/arch/mips/kernel/time.c 2007-12-15 05:19:55.011555967 +0100 @@ -151,6 +151,27 @@ unsigned int (*mips_hpt_read)(void); void (*mips_hpt_init)(unsigned int); @@ -35,9 +36,10 @@ diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c 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 +Index: linux-2.4.35.4/include/asm-mips/timex.h +=================================================================== +--- linux-2.4.35.4.orig/include/asm-mips/timex.h 2007-12-15 05:19:41.146765860 +0100 ++++ linux-2.4.35.4/include/asm-mips/timex.h 2007-12-15 05:19:55.015556197 +0100 @@ -31,6 +31,19 @@ return read_c0_count(); } @@ -58,9 +60,10 @@ 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 +Index: linux-2.4.35.4/include/net/pkt_sched.h +=================================================================== +--- linux-2.4.35.4.orig/include/net/pkt_sched.h 2007-12-15 05:19:41.154766315 +0100 ++++ linux-2.4.35.4/include/net/pkt_sched.h 2007-12-15 05:19:55.023556652 +0100 @@ -5,7 +5,11 @@ #define PSCHED_JIFFIES 2 #define PSCHED_CPU 3 @@ -73,7 +76,7 @@ diff -urN linux.old/include/net/pkt_sched.h linux.dev/include/net/pkt_sched.h #include #include -@@ -271,7 +275,7 @@ +@@ -261,7 +265,7 @@ #define PSCHED_US2JIFFIE(delay) (((delay)+psched_clock_per_hz-1)/psched_clock_per_hz) #define PSCHED_JIFFIE2US(delay) ((delay)*psched_clock_per_hz) -- cgit v1.2.3