Merge tag 'cpuinit-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux (47f92418) · Commits · 戴 / test

Pull __cpuinit removal from Paul Gortmaker: "Remove __cpuinit macros and users. We removed the __cpuinit stuff in 3.11-rc1 with commit ("init.h: remove __cpuinit sections from the kernel") but we left some no-op stubs as a courtesy to unmerged code. Here we get rid of the stubs as well, since (as can be seen in these changes) they are enabling use cases to sneak back in, primarily from older BSP code that has been living out of tree for some time prior to getting mainlined. So we get rid of these "new" users 1st and then get rid of the stubs. Obviously, getting rid of the stubs can't happen until all the users are gone, so I had to keep this together as a series, even though some of these commits since got picked up into maintainers trees as well. The nature of this change is such that it should have zero impact on the generated runtime. This is one of several independent cleanup branches aimed at enabling better organization in the init.h and module.h code. They have been getting coverage in the linux-next tree for the last month, in addition to my local testing, which also covers approximately a half dozen or more architectures" * tag 'cpuinit-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: init: delete the __cpuinit related stubs kernel/cpu.c: remove new instance of __cpuinit that crept back in sched/core: remove __cpuinit section tag that crept back in. mips/mm/tlbex: remove new instance of __cpuinit that crept back in mips/c-r4k: remove legacy __cpuinit section that crept in mips/bcm77xx: remove legacy __cpuinit sections that crept in mips/ath25: remove legacy __cpuinit section that crept in arm/mach-hisi: remove legacy __CPUINIT section that crept in arm/mach-rockchip: remove legacy __cpuinit section that crept in arm/mach-mvebu: remove legacy __cpuinit sections that crept in arm/mach-keystone: remove legacy __cpuinit sections that crept in

arch/arm/mach-mvebu/headsmp-a9.S

+0 −3

Original line number	Diff line number	Diff line
		@@ -13,12 +13,9 @@
		*/

		#include <linux/linkage.h>
		#include <linux/init.h>

		#include <asm/assembler.h>

		__CPUINIT

		ENTRY(mvebu_cortex_a9_secondary_startup)
		ARM_BE8(setend be)
		bl armada_38x_scu_power_up

arch/arm/mach-mvebu/platsmp-a9.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@

		extern void mvebu_cortex_a9_secondary_startup(void);

		static int __cpuinit mvebu_cortex_a9_boot_secondary(unsigned int cpu,
		static int mvebu_cortex_a9_boot_secondary(unsigned int cpu,
		struct task_struct *idle)
		{
		int ret, hw_cpu;

arch/arm/mach-rockchip/platsmp.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -119,8 +119,7 @@ static int pmu_set_power_domain(int pd, bool on)
		* Handling of CPU cores
		*/

		static int __cpuinit rockchip_boot_secondary(unsigned int cpu,
		struct task_struct *idle)
		static int rockchip_boot_secondary(unsigned int cpu, struct task_struct *idle)
		{
		int ret;

include/linux/init.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -91,14 +91,6 @@

		#define __exit __section(.exit.text) __exitused __cold notrace

		/* temporary, until all users are removed */
		#define __cpuinit
		#define __cpuinitdata
		#define __cpuinitconst
		#define __cpuexit
		#define __cpuexitdata
		#define __cpuexitconst

		/* Used for MEMORY_HOTPLUG */
		#define __meminit __section(.meminit.text) __cold notrace
		#define __meminitdata __section(.meminit.data)
		@@ -116,9 +108,6 @@
		#define __INITRODATA .section ".init.rodata","a",%progbits
		#define __FINITDATA .previous

		/* temporary, until all users are removed */
		#define __CPUINIT

		#define __MEMINIT .section ".meminit.text", "ax"
		#define __MEMINITDATA .section ".meminit.data", "aw"
		#define __MEMINITRODATA .section ".meminit.rodata", "a"

scripts/tags.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ exuberant()
		{
		all_target_sources \| xargs $1 -a \
		-I __initdata,__exitdata,__initconst, \
		-I __cpuinitdata,__initdata_memblock \
		-I __initdata_memblock \
		-I __refdata,__attribute,__maybe_unused,__always_unused \
		-I __acquires,__releases,__deprecated \
		-I __read_mostly,__aligned,____cacheline_aligned \

Admin message