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

Commit 6645cb61 authored by Russell King's avatar Russell King
Browse files

ARM: Fix build errors caused by adding generic macros 



Commit 66a625a8 (ARM: mm: proc-macros: Add generic proc/cache/tlb struct
definition macros) introduced build errors when PM_SLEEP is not enabled.
The per-CPU do_suspend/do_resume functions are defined via the
preprocessor to constant 0.  However, the macros which use these were
converted to assembly, resulting in undefined references to these
functions.  Fix that by moving the ! ifdef section into proc-macros.S
and deleting it from all effected proc-*.S files.

Acked-by: default avatarDave Martin <dave.martin@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 07f1c295

arch/arm/mm/proc-arm920.S

+0 −3
Original line number Diff line number Diff line
@@ -406,9 +406,6 @@ ENTRY(cpu_arm920_do_resume) 
		     PMD_SECT_CACHEABLE | PMD_BIT4 | PMD_SECT_AP_WRITE

	b	cpu_resume_mmu

ENDPROC(cpu_arm920_do_resume)

#else

#define cpu_arm920_do_suspend	0

#define cpu_arm920_do_resume	0

#endif



	__CPUINIT

arch/arm/mm/proc-arm926.S

+0 −3
Original line number Diff line number Diff line
@@ -421,9 +421,6 @@ ENTRY(cpu_arm926_do_resume) 
		     PMD_SECT_CACHEABLE | PMD_BIT4 | PMD_SECT_AP_WRITE

	b	cpu_resume_mmu

ENDPROC(cpu_arm926_do_resume)

#else

#define cpu_arm926_do_suspend	0

#define cpu_arm926_do_resume	0

#endif



	__CPUINIT

arch/arm/mm/proc-macros.S

+5 −0
Original line number Diff line number Diff line
@@ -276,8 +276,13 @@ ENTRY(\name\()_processor_functions) 


	.if \suspend

	.word	cpu_\name\()_suspend_size

#ifdef CONFIG_PM_SLEEP

	.word	cpu_\name\()_do_suspend

	.word	cpu_\name\()_do_resume

#else

	.word	0

	.word	0

#endif

	.else

	.word	0

	.word	0

arch/arm/mm/proc-sa1100.S

+0 −3
Original line number Diff line number Diff line
@@ -200,9 +200,6 @@ ENTRY(cpu_sa1100_do_resume) 
		     PMD_SECT_CACHEABLE | PMD_SECT_AP_WRITE

	b	cpu_resume_mmu

ENDPROC(cpu_sa1100_do_resume)

#else

#define cpu_sa1100_do_suspend	0

#define cpu_sa1100_do_resume	0

#endif



	__CPUINIT

arch/arm/mm/proc-v6.S

+0 −3
Original line number Diff line number Diff line
@@ -169,9 +169,6 @@ ENDPROC(cpu_v6_do_resume) 
cpu_resume_l1_flags:

	ALT_SMP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_FLAGS_SMP)

	ALT_UP(.long  PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_FLAGS_UP)

#else

#define cpu_v6_do_suspend 0

#define cpu_v6_do_resume 0

#endif



	string	cpu_v6_name, "ARMv6-compatible processor"