Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3188cac authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

ARM: cpu: Switch to arch_cpu_finalize_init() 



commit ee31bb0524a2e7c99b03f50249a411cc1eaa411f upstream

check_bugs() is about to be phased out. Switch over to the new
arch_cpu_finalize_init() implementation.

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230613224545.078124882@linutronix.de


Signed-off-by: default avatarDaniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 047ac82a

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ config ARM 
	default y

	default y

	select ARCH_CLOCKSOURCE_DATA

	select ARCH_CLOCKSOURCE_DATA

	select ARCH_DISCARD_MEMBLOCK if !HAVE_ARCH_PFN_VALID && !KEXEC

	select ARCH_DISCARD_MEMBLOCK if !HAVE_ARCH_PFN_VALID && !KEXEC

	select ARCH_HAS_CPU_FINALIZE_INIT if MMU

	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_ELF_RANDOMIZE

arch/arm/include/asm/bugs.h

+0 −4
Original line number Original line Diff line number Diff line 
/*

/*

 *  arch/arm/include/asm/bugs.h

 *

 *  Copyright (C) 1995-2003 Russell King

 *  Copyright (C) 1995-2003 Russell King

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify
@@ -13,10 +11,8 @@ 
extern void check_writebuffer_bugs(void);

extern void check_writebuffer_bugs(void);





#ifdef CONFIG_MMU

#ifdef CONFIG_MMU

extern void check_bugs(void);

extern void check_other_bugs(void);

extern void check_other_bugs(void);

#else

#else

#define check_bugs() do { } while (0)

#define check_other_bugs() do { } while (0)

#define check_other_bugs() do { } while (0)

#endif

#endif

arch/arm/kernel/bugs.c

+2 −1
Original line number Original line Diff line number Diff line 
// SPDX-Identifier: GPL-2.0

// SPDX-Identifier: GPL-2.0

#include <linux/init.h>

#include <linux/init.h>

#include <linux/cpu.h>

#include <asm/bugs.h>

#include <asm/bugs.h>

#include <asm/proc-fns.h>

#include <asm/proc-fns.h>
@@ -11,7 +12,7 @@ void check_other_bugs(void) 
#endif

#endif

}

}





void __init check_bugs(void)

void __init arch_cpu_finalize_init(void)

{

{

	check_writebuffer_bugs();

	check_writebuffer_bugs();

	check_other_bugs();

	check_other_bugs();