Commit b614fce3 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by sanglipeng
Browse files

ia64/cpu: Switch to arch_cpu_finalize_init() 

stable inclusion
from stable-v5.10.189
commit 12d93c6c98d5478128d90ad4fbdf705753a0197e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8LICQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=12d93c6c98d5478128d90ad4fbdf705753a0197e



--------------------------------

commit 6c38e300 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.137045745@linutronix.de


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

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ menu "Processor type and features" 


config IA64

	bool

	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_DMA_MARK_CLEAN

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

arch/ia64/include/asm/bugs.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * This is included by init/main.c to check for architecture-dependent bugs.

 *

 * Needs:

 *	void check_bugs(void);

 *

 * Based on <asm-alpha/bugs.h>.

 *

 * Modified 1998, 1999, 2003

 *	David Mosberger-Tang <davidm@hpl.hp.com>,  Hewlett-Packard Co.

 */

#ifndef _ASM_IA64_BUGS_H

#define _ASM_IA64_BUGS_H



#include <asm/processor.h>



extern void check_bugs (void);



#endif /* _ASM_IA64_BUGS_H */

arch/ia64/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -1071,8 +1071,7 @@ cpu_init (void) 
	}

}



void __init

check_bugs (void)

void __init arch_cpu_finalize_init(void)

{

	ia64_patch_mckinley_e9((unsigned long) __start___mckinley_e9_bundles,

			       (unsigned long) __end___mckinley_e9_bundles);