LU-1346 libcfs: cleanup macros in portals_compat25.h

[fs/lustre-release.git] / libcfs / libcfs / winnt / winnt-tracefile.c

diff --git a/libcfs/libcfs/winnt/winnt-tracefile.c b/libcfs/libcfs/winnt/winnt-tracefile.c
index 54c8783..4404e3a 100644 (file)
--- a/libcfs/libcfs/winnt/winnt-tracefile.c
+++ b/libcfs/libcfs/winnt/winnt-tracefile.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -44,7 +46,7 @@ static unsigned int pages_factor[CFS_TCD_TYPE_MAX] = {
         10   /* 10% pages for CFS_TCD_TYPE_DISPATCH */
 };
 
-char *cfs_trace_console_buffers[CFS_NR_CPUS][CFS_TCD_TYPE_MAX];
+char *cfs_trace_console_buffers[NR_CPUS][CFS_TCD_TYPE_MAX];
 
 struct rw_semaphore cfs_tracefile_sem;
 
@@ -60,8 +62,8 @@ int cfs_tracefile_init_arch()
        memset(cfs_trace_data, 0, sizeof(cfs_trace_data));
        for (i = 0; i < CFS_TCD_TYPE_MAX; i++) {
                cfs_trace_data[i] =
-                        cfs_alloc(sizeof(union cfs_trace_data_union) * \
-                                 CFS_NR_CPUS, CFS_ALLOC_KERNEL);
+                       kmalloc(sizeof(union cfs_trace_data_union) * \
+                                 NR_CPUS, GFP_KERNEL);
                if (cfs_trace_data[i] == NULL)
                        goto out;
        }
@@ -73,11 +75,11 @@ int cfs_tracefile_init_arch()
                tcd->tcd_cpu = (USHORT)j;
        }
 
-       for (i = 0; i < cfs_num_possible_cpus(); i++)
+       for (i = 0; i < num_possible_cpus(); i++)
                for (j = 0; j < CFS_TCD_TYPE_MAX; j++) {
                        cfs_trace_console_buffers[i][j] =
-                               cfs_alloc(CFS_TRACE_CONSOLE_BUFFER_SIZE,
-                                         CFS_ALLOC_KERNEL);
+                               kmalloc(CFS_TRACE_CONSOLE_BUFFER_SIZE,
+                                         GFP_KERNEL);
 
                        if (cfs_trace_console_buffers[i][j] == NULL)
                                goto out;
@@ -97,17 +99,17 @@ void cfs_tracefile_fini_arch()
        int    i;
        int    j;
 
-       for (i = 0; i < cfs_num_possible_cpus(); i++) {
+       for (i = 0; i < num_possible_cpus(); i++) {
                for (j = 0; j < CFS_TCD_TYPE_MAX; j++) {
                        if (cfs_trace_console_buffers[i][j] != NULL) {
-                               cfs_free(cfs_trace_console_buffers[i][j]);
+                               kfree(cfs_trace_console_buffers[i][j]);
                                cfs_trace_console_buffers[i][j] = NULL;
                        }
                }
        }
 
        for (i = 0; cfs_trace_data[i] != NULL; i++) {
-               cfs_free(cfs_trace_data[i]);
+               kfree(cfs_trace_data[i]);
                cfs_trace_data[i] = NULL;
        }
 
@@ -169,11 +171,11 @@ cfs_set_ptldebug_header(struct ptldebug_header *header, int subsys, int mask,
 {
        struct timeval tv;
 
-       cfs_gettimeofday(&tv);
+       do_gettimeofday(&tv);
 
        header->ph_subsys = subsys;
        header->ph_mask = mask;
-       header->ph_cpu_id = cfs_smp_processor_id();
+       header->ph_cpu_id = smp_processor_id();
        header->ph_type = cfs_trace_buf_idx_get();
        header->ph_sec = (__u32)tv.tv_sec;
        header->ph_usec = tv.tv_usec;
@@ -215,7 +217,7 @@ void cfs_print_to_console(struct ptldebug_header *hdr, int mask,
 
 int cfs_trace_max_debug_mb(void)
 {
-       int  total_mb = (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT));
+       int  total_mb = (num_physpages >> (20 - PAGE_CACHE_SHIFT));
        
        return MAX(512, (total_mb * 80)/100);
 }