On Fri, 10 Jan 2014 10:00:50 -0500
Paul Gortmaker <paul.gortma...@windriver.com> wrote:
> Commit 8c069ff4bd6063a3f15e606c882e03f75c7e7711 ("s390/perf: add
> support for the CPU-Measurement Sampling Facility") added a new
> instance of the __cpuinit macro usage.
>
> We removed this a couple versions ago; we now want to remove
> the compat no-op stubs. Introducing new users is not what
> we want to see at this point in time, as it will break once
> the stubs are gone.
>
> Cc: Hendrik Brueckner <brueck...@linux.vnet.ibm.com>
> Cc: Martin Schwidefsky <schwidef...@de.ibm.com>
> Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com>
> ---
>
> [Patch based on today's linux-next tree, so if s390 next content
> gets rebased, then the above commit ID will be invalidated; if it
> _does_ get rebased, then feel free to squash this fix into the orig.]
>
> arch/s390/kernel/perf_cpum_sf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
> index 3c3bc8d7b220..ce3a1d9c521b 100644
> --- a/arch/s390/kernel/perf_cpum_sf.c
> +++ b/arch/s390/kernel/perf_cpum_sf.c
> @@ -1512,7 +1512,7 @@ static void cpumf_measurement_alert(struct ext_code
> ext_code,
> }
> }
>
> -static int __cpuinit cpumf_pmu_notifier(struct notifier_block *self,
> +static int cpumf_pmu_notifier(struct notifier_block *self,
> unsigned long action, void *hcpu)
> {
> unsigned int cpu = (long) hcpu;
Applied to linux-s390 for the next merge window. Thanks.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
