Commit ede65f39 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] hangcheck: remove monotomic_clock on x86

John's about to nuke x86's monotonic clock without grepping for it first.  The
patch lamely borrows the ppc64 code for x86.

hangcheck-timer shouldn't be doing it this way

a) HAVE_MONOTONIC should be CONFIG_MONOTONIC_CLOCK and it should be defined
   in arch/xxx/Kconfig.

b) That ifdef tangle shouldn't be in hangcheck-timer.c.  It should be using
   arch-provided helper functions, which CONFIG_MONOTONIC_CLOCK-enabling
   architectures implement in arch/something.c

Cc: john stultz <johnstul@us.ibm.com>
Acked-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cf3c769b
...@@ -117,12 +117,12 @@ __setup("hcheck_reboot", hangcheck_parse_reboot); ...@@ -117,12 +117,12 @@ __setup("hcheck_reboot", hangcheck_parse_reboot);
__setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks); __setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks);
#endif /* not MODULE */ #endif /* not MODULE */
#if defined(CONFIG_X86) || defined(CONFIG_S390) #if defined(CONFIG_X86_64) || defined(CONFIG_S390)
# define HAVE_MONOTONIC # define HAVE_MONOTONIC
# define TIMER_FREQ 1000000000ULL # define TIMER_FREQ 1000000000ULL
#elif defined(CONFIG_IA64) #elif defined(CONFIG_IA64)
# define TIMER_FREQ ((unsigned long long)local_cpu_data->itc_freq) # define TIMER_FREQ ((unsigned long long)local_cpu_data->itc_freq)
#elif defined(CONFIG_PPC64) #else
# define TIMER_FREQ (HZ*loops_per_jiffy) # define TIMER_FREQ (HZ*loops_per_jiffy)
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment