Skip to content

Commit b96fc2f

Browse files
bebarinoolofj
authored andcommitted
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 <[email protected]> Cc: Stephen Warren <[email protected]> Cc: Alexandre Courbot <[email protected]> Cc: Lorenzo Pieralisi <[email protected]> Cc: Will Deacon <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Acked-by: Tony Lindgren <[email protected]> Acked-by: Barry Song <[email protected]> Acked-by: Andy Gross <[email protected]> Acked-by: Viresh Kumar <[email protected]> Acked-by: Thierry Reding <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Sudeep Holla <[email protected]> Acked-by: Mark Rutland <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
1 parent 0cc09e8 commit b96fc2f

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

arch/arm/kernel/psci_smp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int psci_cpu_disable(unsigned int cpu)
7171
return 0;
7272
}
7373

74-
void __ref psci_cpu_die(unsigned int cpu)
74+
void psci_cpu_die(unsigned int cpu)
7575
{
7676
u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN <<
7777
PSCI_0_2_POWER_STATE_TYPE_SHIFT;
@@ -83,7 +83,7 @@ void __ref psci_cpu_die(unsigned int cpu)
8383
panic("psci: cpu %d failed to shutdown\n", cpu);
8484
}
8585

86-
int __ref psci_cpu_kill(unsigned int cpu)
86+
int psci_cpu_kill(unsigned int cpu)
8787
{
8888
int err, i;
8989

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* platform-specific code to shutdown a CPU
2828
* Called with IRQs disabled
2929
*/
30-
void __ref omap4_cpu_die(unsigned int cpu)
30+
void omap4_cpu_die(unsigned int cpu)
3131
{
3232
unsigned int boot_cpu = 0;
3333
void __iomem *base = omap_get_wakeupgen_base();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
331331
return NOTIFY_OK;
332332
}
333333

334-
static struct notifier_block __refdata irq_hotplug_notifier = {
334+
static struct notifier_block irq_hotplug_notifier = {
335335
.notifier_call = irq_cpu_hotplug_notify,
336336
};
337337

arch/arm/mach-prima2/hotplug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static inline void platform_do_lowpower(unsigned int cpu)
3232
*
3333
* Called with IRQs disabled
3434
*/
35-
void __ref sirfsoc_cpu_die(unsigned int cpu)
35+
void sirfsoc_cpu_die(unsigned int cpu)
3636
{
3737
platform_do_lowpower(cpu);
3838
}

arch/arm/mach-qcom/platsmp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ extern void secondary_startup_arm(void);
4949
static DEFINE_SPINLOCK(boot_lock);
5050

5151
#ifdef CONFIG_HOTPLUG_CPU
52-
static void __ref qcom_cpu_die(unsigned int cpu)
52+
static void qcom_cpu_die(unsigned int cpu)
5353
{
5454
wfi();
5555
}

arch/arm/mach-realview/hotplug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
9090
*
9191
* Called with IRQs disabled
9292
*/
93-
void __ref realview_cpu_die(unsigned int cpu)
93+
void realview_cpu_die(unsigned int cpu)
9494
{
9595
int spurious = 0;
9696

arch/arm/mach-spear/hotplug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static inline void spear13xx_do_lowpower(unsigned int cpu, int *spurious)
8080
*
8181
* Called with IRQs disabled
8282
*/
83-
void __ref spear13xx_cpu_die(unsigned int cpu)
83+
void spear13xx_cpu_die(unsigned int cpu)
8484
{
8585
int spurious = 0;
8686

arch/arm/mach-tegra/hotplug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ int tegra_cpu_kill(unsigned cpu)
3737
*
3838
* Called with IRQs disabled
3939
*/
40-
void __ref tegra_cpu_die(unsigned int cpu)
40+
void tegra_cpu_die(unsigned int cpu)
4141
{
4242
if (!tegra_hotplug_shutdown) {
4343
WARN(1, "hotplug is not yet initialized\n");

arch/arm/mach-ux500/hotplug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* Called with IRQs disabled
2323
*/
24-
void __ref ux500_cpu_die(unsigned int cpu)
24+
void ux500_cpu_die(unsigned int cpu)
2525
{
2626
/* directly enter low power state, skipping secure registers */
2727
for (;;) {

arch/arm/mach-vexpress/hotplug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
8585
*
8686
* Called with IRQs disabled
8787
*/
88-
void __ref vexpress_cpu_die(unsigned int cpu)
88+
void vexpress_cpu_die(unsigned int cpu)
8989
{
9090
int spurious = 0;
9191

0 commit comments

Comments
 (0)