lkml.org 
[lkml]   [2004]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] fix get_jiffies_64 to work on voyager
James Bottomley <James.Bottomley@SteelEye.com> wrote:
>
> This patch
>
>
> ChangeSet@1.1534.5.2, 2003-12-30 15:40:23-08:00, akpm@osdl.org
> [PATCH] ia32 jiffy wrapping fixes
>
> Causes the voyager boot to hang. The problem is this change:
>
> --- a/arch/i386/kernel/timers/timer_tsc.c Tue Jan 6 09:57:34 2004
> +++ b/arch/i386/kernel/timers/timer_tsc.c Tue Jan 6 09:57:34 2004
> @@ -141,7 +140,7 @@
> #ifndef CONFIG_NUMA
> if (!use_tsc)
> #endif
> - return (unsigned long long)jiffies * (1000000000 / HZ);
> + return (unsigned long long)get_jiffies_64() *
> (1000000000 / HZ);

Hm, OK. I hit the same deadlock when running with the "don't require TSCs
to be synchronised in sched_clock()" patch from -mm. The fix for that is
below. I shall accelerate it.

--- 25/arch/i386/kernel/timers/timer_tsc.c~sched_clock-2.6.0-A1-deadlock-fix 2003-12-30 00:45:09.000000000 -0800
+++ 25-akpm/arch/i386/kernel/timers/timer_tsc.c 2003-12-30 00:45:09.000000000 -0800
@@ -140,7 +140,8 @@ unsigned long long sched_clock(void)
#ifndef CONFIG_NUMA
if (!use_tsc)
#endif
- return (unsigned long long)get_jiffies_64() * (1000000000 / HZ);
+ /* jiffies might overflow but this is not a big deal here */
+ return (unsigned long long)jiffies * (1000000000 / HZ);

/* Read the Time Stamp Counter */
rdtscll(this_offset);
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:59    [W:0.653 / U:0.520 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site