From: Mikael Pettersson - Move tsc_on/nractrs/nrictrs control fields to new struct cpu_control_header. Signed-off-by: Mikael Pettersson Signed-off-by: Andrew Morton --- 25-akpm/drivers/perfctr/virtual.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/perfctr/virtual.c~perfctr-api-update-5-9-cpu_control_header-common drivers/perfctr/virtual.c --- 25/drivers/perfctr/virtual.c~perfctr-api-update-5-9-cpu_control_header-common 2005-03-13 13:23:22.000000000 -0800 +++ 25-akpm/drivers/perfctr/virtual.c 2005-03-13 13:23:22.000000000 -0800 @@ -594,7 +594,8 @@ static int vperfctr_enable_control(struc unsigned int next_cstatus; unsigned int nrctrs, i; - if (perfctr->cpu_state.control.nractrs || perfctr->cpu_state.control.nrictrs) { + if (perfctr->cpu_state.control.header.nractrs || + perfctr->cpu_state.control.header.nrictrs) { cpumask_t old_mask, new_mask; old_mask = tsk->cpus_allowed; _