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

Commit b96fc2f3 authored by Stephen Boyd's avatar Stephen Boyd Committed by Olof Johansson
Browse files

ARM: Remove __ref on hotplug cpu die path 



Now that __cpuinit has been removed, the __ref markings on these
functions are useless. Remove them. This also reduces the size of
the multi_v7_defconfig image:

$ size before after
   text    data     bss     dec     hex filename
   12683578        1470996  348904 14503478         dd4e36 before
   12683274        1470996  348904 14503174         dd4d06 after

presumably because now we don't have to jump to code in the
.ref.text section and/or the noinline marking is removed.

Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: <linux-omap@vger.kernel.org>
Cc: <linux-arm-msm@vger.kernel.org>
Cc: <spear-devel@list.st.com>
Cc: <linux-tegra@vger.kernel.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarBarry Song <baohua@kernel.org>
Acked-by: default avatarAndy Gross <agross@codeaurora.org>
Acked-by: default avatarViresh Kumar <vireshk@kernel.org>
Acked-by: default avatarThierry Reding <thierry.reding@gmail.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 0cc09e85

arch/arm/kernel/psci_smp.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ int psci_cpu_disable(unsigned int cpu) 
	return 0;

}



void __ref psci_cpu_die(unsigned int cpu)

void psci_cpu_die(unsigned int cpu)

{

	u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN <<

		    PSCI_0_2_POWER_STATE_TYPE_SHIFT;
@@ -83,7 +83,7 @@ void __ref psci_cpu_die(unsigned int cpu) 
	panic("psci: cpu %d failed to shutdown\n", cpu);

}



int __ref psci_cpu_kill(unsigned int cpu)

int psci_cpu_kill(unsigned int cpu)

{

	int err, i;

arch/arm/mach-omap2/omap-hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 * platform-specific code to shutdown a CPU

 * Called with IRQs disabled

 */

void __ref omap4_cpu_die(unsigned int cpu)

void omap4_cpu_die(unsigned int cpu)

{

	unsigned int boot_cpu = 0;

	void __iomem *base = omap_get_wakeupgen_base();

arch/arm/mach-omap2/omap-wakeupgen.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self, 
	return NOTIFY_OK;

}



static struct notifier_block __refdata irq_hotplug_notifier = {

static struct notifier_block irq_hotplug_notifier = {

	.notifier_call = irq_cpu_hotplug_notify,

};

arch/arm/mach-prima2/hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static inline void platform_do_lowpower(unsigned int cpu) 
 *

 * Called with IRQs disabled

 */

void __ref sirfsoc_cpu_die(unsigned int cpu)

void sirfsoc_cpu_die(unsigned int cpu)

{

	platform_do_lowpower(cpu);

}

arch/arm/mach-qcom/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ extern void secondary_startup_arm(void); 
static DEFINE_SPINLOCK(boot_lock);



#ifdef CONFIG_HOTPLUG_CPU

static void __ref qcom_cpu_die(unsigned int cpu)

static void qcom_cpu_die(unsigned int cpu)

{

	wfi();

}