From f977c0c23fe6a0ed76cf5ebeba96438bd3c726f0 Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Mon, 8 Oct 2007 03:05:52 +0000
Subject: [PATCH] Branch b1_6 b=12744 i=johann, adilger
NR_CPUS/smp_num_cpus -> num_possible_cpus().
---
lnet/libcfs/linux/linux-tracefile.c | 6 +++---
lnet/libcfs/tracefile.c | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lnet/libcfs/linux/linux-tracefile.c b/lnet/libcfs/linux/linux-tracefile.c
index a3a3aad2b2..7d6643b342 100644
--- a/lnet/libcfs/linux/linux-tracefile.c
+++ b/lnet/libcfs/linux/linux-tracefile.c
@@ -23,7 +23,7 @@ int tracefile_init_arch()
init_rwsem(&tracefile_sem);
- for (i = 0; i < NR_CPUS; i++)
+ for (i = 0; i < num_possible_cpus(); i++)
for (j = 0; j < 3; j++) {
trace_console_buffers[i][j] =
kmalloc(TRACE_CONSOLE_BUFFER_SIZE,
@@ -46,7 +46,7 @@ void tracefile_fini_arch()
int i;
int j;
- for (i = 0; i < NR_CPUS; i++)
+ for (i = 0; i < num_possible_cpus(); i++)
for (j = 0; j < 3; j++)
if (trace_console_buffers[i][j] != NULL) {
kfree(trace_console_buffers[i][j]);
@@ -195,7 +195,7 @@ trace_call_on_all_cpus(void (*fn)(void *arg), void *arg)
int cpu;
/* Run the given routine on every CPU in thread context */
- for (cpu = 0; cpu < NR_CPUS; cpu++) {
+ for (cpu = 0; cpu < num_possible_cpus(); cpu++) {
if (!cpu_online(cpu))
continue;
diff --git a/lnet/libcfs/tracefile.c b/lnet/libcfs/tracefile.c
index f892d69a55..f40958f2f4 100644
--- a/lnet/libcfs/tracefile.c
+++ b/lnet/libcfs/tracefile.c
@@ -465,7 +465,7 @@ panic_collect_pages(struct page_collection *pc)
CFS_INIT_LIST_HEAD(&pc->pc_pages);
- for (i = 0; i < NR_CPUS; i++) {
+ for (i = 0; i < num_possible_cpus(); i++) {
tcd = &trace_data[i].tcd;
list_splice(&tcd->tcd_pages, &pc->pc_pages);
@@ -881,11 +881,11 @@ int trace_set_debug_mb(int mb)
return -EINVAL;
}
- mb /= smp_num_cpus;
+ mb /= num_possible_cpus();
tracefile_write_lock();
- for (i = 0; i < NR_CPUS; i++) {
+ for (i = 0; i < num_possible_cpus(); i++) {
struct trace_cpu_data *tcd = &trace_data[i].tcd;
tcd->tcd_max_pages = mb << (20 - CFS_PAGE_SHIFT);
@@ -915,7 +915,7 @@ int trace_get_debug_mb(void)
tracefile_read_lock();
- for (i = 0; i < NR_CPUS; i++) {
+ for (i = 0; i < num_possible_cpus(); i++) {
struct trace_cpu_data *tcd = &trace_data[i].tcd;
total_pages += tcd->tcd_max_pages;
@@ -1068,7 +1068,7 @@ int tracefile_init(void)
if (rc != 0)
return rc;
- for (i = 0; i < NR_CPUS; i++) {
+ for (i = 0; i < num_possible_cpus(); i++) {
tcd = &trace_data[i].tcd;
CFS_INIT_LIST_HEAD(&tcd->tcd_pages);
CFS_INIT_LIST_HEAD(&tcd->tcd_stock_pages);
--
GitLab