Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fd3d72859b5fab00aba2e7ce5ca65744f6720769

Authored by Russell King
Committed by Russell King
1 parent df43309bd5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ARM] nommu: fix breakage caused by f9720205d1f847cb59e197e851b5276425363f6b 

Someone forgot to use 'ls include/asm-*/flat.h' or
'grep -r flat_get_addr_from_rp .' to find all architectures which
may be affected by their change.  Fix the fall out.

Noticed-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

include/asm-arm/flat.h
Diff comments   View file @ fd3d728
... ... @@ -11,9 +11,10 @@
11 11 #define flat_argvp_envp_on_stack() 1
12 12 #define flat_old_ram_flag(flags) (flags)
13 13 #define flat_reloc_valid(reloc, size) ((reloc) <= (size))
14   -#define flat_get_addr_from_rp(rp, relval, flags) get_unaligned(rp)
  14 +#define flat_get_addr_from_rp(rp, relval, flags, persistent) get_unaligned(rp)
15 15 #define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp)
16 16 #define flat_get_relocate_addr(rel) (rel)
  17 +#define flat_set_persistent(relval, p) 0
17 18  
18 19 #endif /* __ARM_FLAT_H__ */