diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /security/selinux/selinuxfs.c | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'security/selinux/selinuxfs.c')
| -rw-r--r-- | security/selinux/selinuxfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index c86303638235..e5520996a75b 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
| @@ -1211,7 +1211,7 @@ static struct avc_cache_stats *sel_avc_get_stat_idx(loff_t *idx) | |||
| 1211 | { | 1211 | { |
| 1212 | int cpu; | 1212 | int cpu; |
| 1213 | 1213 | ||
| 1214 | for (cpu = *idx; cpu < NR_CPUS; ++cpu) { | 1214 | for (cpu = *idx; cpu < nr_cpu_ids; ++cpu) { |
| 1215 | if (!cpu_possible(cpu)) | 1215 | if (!cpu_possible(cpu)) |
| 1216 | continue; | 1216 | continue; |
| 1217 | *idx = cpu + 1; | 1217 | *idx = cpu + 1; |