From 26b60b2ec8e4ee70f6586e42b09eac38fd50de14 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 26 Jun 2006 00:25:09 -0700 Subject: [PATCH] --- yaml --- r: 30209 b: refs/heads/master c: ede65f3926a284f07765b94d6d9fd10d63791174 h: refs/heads/master i: 30207: 589ad079c10345de9d684b9e90fc5c2d801c6fff v: v3 --- [refs] | 2 +- trunk/drivers/char/hangcheck-timer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 210a4ab4339e..127fbf080e1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf3c769b4b0dd1146da84d5cf045dcfe53bd0f13 +refs/heads/master: ede65f3926a284f07765b94d6d9fd10d63791174 diff --git a/trunk/drivers/char/hangcheck-timer.c b/trunk/drivers/char/hangcheck-timer.c index ac626418b329..d69f2ad9a67d 100644 --- a/trunk/drivers/char/hangcheck-timer.c +++ b/trunk/drivers/char/hangcheck-timer.c @@ -117,12 +117,12 @@ __setup("hcheck_reboot", hangcheck_parse_reboot); __setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks); #endif /* not MODULE */ -#if defined(CONFIG_X86) || defined(CONFIG_S390) +#if defined(CONFIG_X86_64) || defined(CONFIG_S390) # define HAVE_MONOTONIC # define TIMER_FREQ 1000000000ULL #elif defined(CONFIG_IA64) # define TIMER_FREQ ((unsigned long long)local_cpu_data->itc_freq) -#elif defined(CONFIG_PPC64) +#else # define TIMER_FREQ (HZ*loops_per_jiffy) #endif