X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Flu_time.c;h=8b1310aa3a4b2810dc3dbe2be3f58fba4d51f056;hp=66a8687262e7d5943b23a5c1c73c4cfba2e5591d;hb=b0f08a4e902411a8fbdb660e5b32c5821ca7159f;hpb=bcef68d99fdb09fe5b55b2f95507e18f63e849ab diff --git a/lustre/obdclass/lu_time.c b/lustre/obdclass/lu_time.c index 66a8687..8b1310a 100644 --- a/lustre/obdclass/lu_time.c +++ b/lustre/obdclass/lu_time.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,7 +24,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. */ /* @@ -43,9 +41,6 @@ */ #define DEBUG_SUBSYSTEM S_CLASS -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #include /* OBD_{ALLOC,FREE}_PTR() */ @@ -131,7 +126,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); @@ -161,7 +156,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 @@ -175,7 +170,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;