From f9fcd98910c635b88299e8d4917e305dbe135a69 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 18 Jan 2010 21:45:00 +0900 Subject: [PATCH] --- yaml --- r: 181109 b: refs/heads/master c: af1415314a4190b8ea06e53808d392fcf91555af h: refs/heads/master i: 181107: e0117547f77783685406589296e8cb158971ba59 v: v3 --- [refs] | 2 +- trunk/arch/sh/mm/ioremap.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6f90593e455f..883bdd100f70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12b6b01cb47dc3eefbef866592193661dad7afb9 +refs/heads/master: af1415314a4190b8ea06e53808d392fcf91555af diff --git a/trunk/arch/sh/mm/ioremap.c b/trunk/arch/sh/mm/ioremap.c index e8b65f645aed..a130b2278e92 100644 --- a/trunk/arch/sh/mm/ioremap.c +++ b/trunk/arch/sh/mm/ioremap.c @@ -33,8 +33,9 @@ * have to convert them into an offset in a page-aligned mapping, but the * caller shouldn't need to know that small detail. */ -void __iomem *__ioremap_caller(unsigned long phys_addr, unsigned long size, - unsigned long flags, void *caller) +void __iomem * __init_refok +__ioremap_caller(unsigned long phys_addr, unsigned long size, + unsigned long flags, void *caller) { struct vm_struct *area; unsigned long offset, last_addr, addr, orig_addr;