* 'cpumask-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: cpumask: rename tsk_cpumask to tsk_cpus_allowed cpumask: don't recommend set_cpus_allowed hack in Documentation/cpu-hotplug.txt cpumask: avoid dereferencing struct cpumask cpumask: convert drivers/idle/i7300_idle.c to cpumask_var_t cpumask: use modern cpumask style in drivers/scsi/fcoe/fcoe.c cpumask: avoid deprecated function in mm/slab.c cpumask: use cpu_online in kernel/perf_event.c
Showing the changes to kernel (2 of 8 files). Show all
Unified · Split
| @@ -1614,7 +1614,7 @@ static struct perf_event_context *find_get_context(pid_t pid, int cpu) · 1613 unmodified lines | |||
| 1614 | * offline CPU and activate it when the CPU comes up, but | 1614 | * offline CPU and activate it when the CPU comes up, but |
| 1615 | * that's for later. | 1615 | * that's for later. |
| 1616 | */ | 1616 | */ |
| 1617 | if (!cpu_isset(cpu, cpu_online_map)) | 1617 | if (!cpu_online(cpu)) |
| 1618 | return ERR_PTR(-ENODEV); | 1618 | return ERR_PTR(-ENODEV); |
| 1619 | 1619 | ||
| 1620 | cpuctx = &per_cpu(perf_cpu_context, cpu); | 1620 | cpuctx = &per_cpu(perf_cpu_context, cpu); |
| @@ -237,10 +237,10 @@ static void timer_list_show_tickdevices(struct seq_file *m) · 236 unmodified lines | |||
| 237 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | 237 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST |
| 238 | print_tickdevice(m, tick_get_broadcast_device(), -1); | 238 | print_tickdevice(m, tick_get_broadcast_device(), -1); |
| 239 | SEQ_printf(m, "tick_broadcast_mask: %08lx\n", | 239 | SEQ_printf(m, "tick_broadcast_mask: %08lx\n", |
| 240 | tick_get_broadcast_mask()->bits[0]); | 240 | cpumask_bits(tick_get_broadcast_mask())[0]); |
| 241 | #ifdef CONFIG_TICK_ONESHOT | 241 | #ifdef CONFIG_TICK_ONESHOT |
| 242 | SEQ_printf(m, "tick_broadcast_oneshot_mask: %08lx\n", | 242 | SEQ_printf(m, "tick_broadcast_oneshot_mask: %08lx\n", |
| 243 | tick_get_broadcast_oneshot_mask()->bits[0]); | 243 | cpumask_bits(tick_get_broadcast_oneshot_mask())[0]); |
| 244 | #endif | 244 | #endif |
| 245 | SEQ_printf(m, "\n"); | 245 | SEQ_printf(m, "\n"); |
| 246 | #endif | 246 | #endif |