# HG changeset patch # User Mikael Berthe # Date 1289511765 -3600 # Node ID 6524d7d3061b2f7310acf2ee89cecbf82493445d # Parent 55944382d88b80b98ad07d4079f244d6b960b633 Remove option uptime_hz Shouldn't be necessary anymore. diff -r 55944382d88b -r 6524d7d3061b uptime.c --- a/uptime.c Thu Nov 11 22:31:41 2010 +0100 +++ b/uptime.c Thu Nov 11 22:42:45 2010 +0100 @@ -30,7 +30,7 @@ #include "config.h" -#define DESCRIPTION ( "Shows mcabber uptime\nRecognizes option uptime_hz (at load time)." ) +#define DESCRIPTION ( "Shows mcabber uptime." ) module_info_t info_uptime_experimental = { .branch = "experimental", @@ -186,9 +186,7 @@ g_string_free (line, TRUE); - guint hz = settings_opt_get_int ("uptime_hz"); - if (!hz) - hz = sysconf(_SC_CLK_TCK); + guint hz = sysconf(_SC_CLK_TCK); starttime = kbtime + (mstime / hz); } else starttime = time (NULL); diff -r 55944382d88b -r 6524d7d3061b uptime.rc --- a/uptime.rc Thu Nov 11 22:31:41 2010 +0100 +++ b/uptime.rc Thu Nov 11 22:42:45 2010 +0100 @@ -4,12 +4,5 @@ # point for uptime calculations. set uptime_use_proc = 1 -# For correct proc-based calculations, set system timer -# frequency. Note, that this still may differ from value, -# that you're compled your kernel with (eg on my system -# kernel uses timer at frequency 250, but values in /proc -# are still calculated as if HZ were 100). -#set uptime_hz = 100 - module load uptime