Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit af1415314a4190b8ea06e53808d392fcf91555af

Authored by Paul Mundt
1 parent 12b6b01cb4
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

sh: Flag __ioremap_caller() __init_refok. 

The mem_init_done test makes sure that this path is only entered in
__init cases, so leaving ioremap_fixed() as __init and flagging the
caller __init_refok is sufficient.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

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

arch/sh/mm/ioremap.c
Diff comments   View file @ af14153
... ... @@ -33,8 +33,9 @@
33 33 * have to convert them into an offset in a page-aligned mapping, but the
34 34 * caller shouldn't need to know that small detail.
35 35 */
36   -void __iomem *__ioremap_caller(unsigned long phys_addr, unsigned long size,
37   - unsigned long flags, void *caller)
  36 +void __iomem * __init_refok
  37 +__ioremap_caller(unsigned long phys_addr, unsigned long size,
  38 + unsigned long flags, void *caller)
38 39 {
39 40 struct vm_struct *area;
40 41 unsigned long offset, last_addr, addr, orig_addr;