git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kernel
/
salinfo.c
diff --git
a/arch/ia64/kernel/salinfo.c
b/arch/ia64/kernel/salinfo.c
index b11bb50a197a68ff8aa5f8661ef7552618940c56..7053c55b7649337c19f5495c205a0d1584f33caa 100644
(file)
--- a/
arch/ia64/kernel/salinfo.c
+++ b/
arch/ia64/kernel/salinfo.c
@@
-317,7
+317,7
@@
retry:
}
n = data->cpu_check;
}
n = data->cpu_check;
- for (i = 0; i <
NR_CPUS
; i++) {
+ for (i = 0; i <
nr_cpu_ids
; i++) {
if (cpu_isset(n, data->cpu_event)) {
if (!cpu_online(n)) {
cpu_clear(n, data->cpu_event);
if (cpu_isset(n, data->cpu_event)) {
if (!cpu_online(n)) {
cpu_clear(n, data->cpu_event);
@@
-326,7
+326,7
@@
retry:
cpu = n;
break;
}
cpu = n;
break;
}
- if (++n ==
NR_CPUS
)
+ if (++n ==
nr_cpu_ids
)
n = 0;
}
n = 0;
}
@@
-337,7
+337,7
@@
retry:
/* for next read, start checking at next CPU */
data->cpu_check = cpu;
/* for next read, start checking at next CPU */
data->cpu_check = cpu;
- if (++data->cpu_check ==
NR_CPUS
)
+ if (++data->cpu_check ==
nr_cpu_ids
)
data->cpu_check = 0;
snprintf(cmd, sizeof(cmd), "read %d\n", cpu);
data->cpu_check = 0;
snprintf(cmd, sizeof(cmd), "read %d\n", cpu);
@@
-648,18
+648,16
@@
salinfo_init(void)
if (!dir)
continue;
if (!dir)
continue;
- entry = create_proc_entry("event", S_IRUSR, dir);
+ entry = proc_create_data("event", S_IRUSR, dir,
+ &salinfo_event_fops, data);
if (!entry)
continue;
if (!entry)
continue;
- entry->data = data;
- entry->proc_fops = &salinfo_event_fops;
*sdir++ = entry;
*sdir++ = entry;
- entry = create_proc_entry("data", S_IRUSR | S_IWUSR, dir);
+ entry = proc_create_data("data", S_IRUSR | S_IWUSR, dir,
+ &salinfo_data_fops, data);
if (!entry)
continue;
if (!entry)
continue;
- entry->data = data;
- entry->proc_fops = &salinfo_data_fops;
*sdir++ = entry;
/* we missed any events before now */
*sdir++ = entry;
/* we missed any events before now */