X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-tracefile.c;h=c67103bb955322da10d5ec92bced0ad499b16b62;hb=b6332b5c0dfe28d6b574e206ae651262337a8309;hp=da33e016455fca3fa89bedc9e5f4f7413996210e;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/linux/linux-tracefile.c b/libcfs/libcfs/linux/linux-tracefile.c
index da33e01..c67103b 100644
--- a/libcfs/libcfs/linux/linux-tracefile.c
+++ b/libcfs/libcfs/linux/linux-tracefile.c
@@ -64,7 +64,7 @@ int cfs_tracefile_init_arch()
 	for (i = 0; i < CFS_TCD_TYPE_MAX; i++) {
 		cfs_trace_data[i] =
 			kmalloc(sizeof(union cfs_trace_data_union) *
-				cfs_num_possible_cpus(), GFP_KERNEL);
+				num_possible_cpus(), GFP_KERNEL);
 		if (cfs_trace_data[i] == NULL)
 			goto out;
 
@@ -78,7 +78,7 @@ int cfs_tracefile_init_arch()
 		tcd->tcd_cpu = j;
 	}
 
-	for (i = 0; i < cfs_num_possible_cpus(); i++)
+	for (i = 0; i < num_possible_cpus(); i++)
 		for (j = 0; j < 3; j++) {
 			cfs_trace_console_buffers[i][j] =
 				kmalloc(CFS_TRACE_CONSOLE_BUFFER_SIZE,
@@ -101,7 +101,7 @@ 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 < 3; j++)
 			if (cfs_trace_console_buffers[i][j] != NULL) {
 				kfree(cfs_trace_console_buffers[i][j]);
@@ -200,7 +200,7 @@ cfs_set_ptldebug_header(struct ptldebug_header *header,
 
 	header->ph_subsys = msgdata->msg_subsys;
 	header->ph_mask = msgdata->msg_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;
@@ -269,7 +269,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 - PAGE_SHIFT));
+	int  total_mb = (totalram_pages >> (20 - PAGE_SHIFT));
 
 	return MAX(512, (total_mb * 80)/100);
 }