git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpumask into release branch
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
perfmon.c
diff --git
a/arch/ia64/kernel/perfmon.c
b/arch/ia64/kernel/perfmon.c
index
0e49975
..
8a06dc4
100644
(file)
--- a/
arch/ia64/kernel/perfmon.c
+++ b/
arch/ia64/kernel/perfmon.c
@@
-2196,7
+2196,7
@@
pfmfs_delete_dentry(struct dentry *dentry)
return 1;
}
return 1;
}
-static struct dentry_operations pfmfs_dentry_operations = {
+static
const
struct dentry_operations pfmfs_dentry_operations = {
.d_delete = pfmfs_delete_dentry,
};
.d_delete = pfmfs_delete_dentry,
};
@@
-5603,7
+5603,7
@@
pfm_interrupt_handler(int irq, void *arg)
* /proc/perfmon interface, for debug only
*/
* /proc/perfmon interface, for debug only
*/
-#define PFM_PROC_SHOW_HEADER ((void *)
NR_CPUS
+1)
+#define PFM_PROC_SHOW_HEADER ((void *)
nr_cpu_ids
+1)
static void *
pfm_proc_start(struct seq_file *m, loff_t *pos)
static void *
pfm_proc_start(struct seq_file *m, loff_t *pos)
@@
-5612,7
+5612,7
@@
pfm_proc_start(struct seq_file *m, loff_t *pos)
return PFM_PROC_SHOW_HEADER;
}
return PFM_PROC_SHOW_HEADER;
}
- while (*pos <=
NR_CPUS
) {
+ while (*pos <=
nr_cpu_ids
) {
if (cpu_online(*pos - 1)) {
return (void *)*pos;
}
if (cpu_online(*pos - 1)) {
return (void *)*pos;
}