X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Flu_time.c;h=0da2c1c7cdeddcd684e40220a9b0aaca9dae7cbe;hb=f4831ab428de8468d8ef25ddb72d3e34b69040b0;hp=3751812805bce13470a55bd151e77d38d33dbdb5;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/lu_time.c b/lustre/obdclass/lu_time.c index 3751812..0da2c1c 100644 --- a/lustre/obdclass/lu_time.c +++ b/lustre/obdclass/lu_time.c @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -47,6 +47,7 @@ # define EXPORT_SYMTAB #endif +#include /* OBD_{ALLOC,FREE}_PTR() */ #include #include @@ -130,7 +131,7 @@ EXPORT_SYMBOL(lu_time_named_init); int lu_time_init(struct lprocfs_stats **stats, cfs_proc_dir_entry_t *entry, const char **names, int nr) { - return lu_time_named_init(stats, "stats", entry, names, nr); + return lu_time_named_init(stats, "lu_stats", entry, names, nr); } EXPORT_SYMBOL(lu_time_init); @@ -160,7 +161,7 @@ unsigned long long lu_time_stamp_get(void) /* * Return timestamp with microsecond precision. This has to be cheap. */ -//#ifdef CONFIG_X86 +//#ifdef CONFIG_X86 #if defined(CONFIG_X86) && !defined(CONFIG_X86_64) /* * do_gettimeofday() goes backwards sometimes :(. Usethe TSC @@ -174,7 +175,7 @@ unsigned long long lu_time_stamp_get(void) struct timeval now; unsigned long long ret; - do_gettimeofday(&now); + cfs_gettimeofday(&now); ret = now.tv_sec; ret *= 1000000; ret += now.tv_usec;