--- zzzz-none-000/linux-2.6.19.2/arch/powerpc/oprofile/common.c 2007-01-10 19:10:37.000000000 +0000 +++ davinci-8020-5504/linux-2.6.19.2/arch/powerpc/oprofile/common.c 2007-01-11 07:38:19.000000000 +0000 @@ -34,11 +34,6 @@ model->handle_interrupt(regs, ctr); } -static void op_powerpc_cpu_setup(void *dummy) -{ - model->cpu_setup(ctr); -} - static int op_powerpc_setup(void) { int err; @@ -52,7 +47,7 @@ model->reg_setup(ctr, &sys, model->num_counters); /* Configure the registers on all cpus. */ - on_each_cpu(op_powerpc_cpu_setup, NULL, 0, 1); + on_each_cpu(model->cpu_setup, NULL, 0, 1); return 0; } @@ -147,8 +142,7 @@ case PPC_OPROFILE_POWER4: model = &op_model_power4; break; -#endif -#ifdef CONFIG_6xx +#else case PPC_OPROFILE_G4: model = &op_model_7450; break;