CINXE.COM

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Al Viro: [PATCH] i386,amd64: ioremap.c __iomem annotations</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Al Viro" href="/groupie.php?aid=24619" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/12"> [Dec]</a> 聽 <a class="nb" href="/lkml/2005/12/15"> [15]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/12/15/94" onclick="this.href='/lkml/headers'+'/2005/12/15/94';">[headers]</a>聽 <a href="/lkml/bounce/2005/12/15/94">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/12/15/94">First message in thread</a></li><li class="origin"><a href="">Al Viro</a></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2005/12/15/94/1">Get diff 1</a></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Subject</td><td class="rp" itemprop="name">[PATCH] i386,amd64: ioremap.c __iomem annotations</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Al Viro <></td></tr><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Thu, 15 Dec 2005 09:17:50 +0000</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody"><br />Signed-off-by: Al Viro <viro@zeniv.linux.org.uk><br /><br /><br />---<br /><br /> arch/i386/mm/ioremap.c | 2 +-<br /> arch/x86_64/mm/ioremap.c | 2 +-<br /> 2 files changed, 2 insertions(+), 2 deletions(-)<br /><br />b1d0c1d84b2650707044dcc1136985f501f72c20<br />diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c<br />index 8498b5a..247fde7 100644<br />--- a/arch/i386/mm/ioremap.c<br />+++ b/arch/i386/mm/ioremap.c<br />@@ -245,7 +245,7 @@ void iounmap(volatile void __iomem *addr<br /> addr < phys_to_virt(ISA_END_ADDRESS))<br /> return;<br /> <br />- addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr);<br />+ addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr);<br /> <br /> /* Use the vm area unlocked, assuming the caller<br /> ensures there isn't another iounmap for the same address<br />diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c<br />index 0d260e4..ae20706 100644<br />--- a/arch/x86_64/mm/ioremap.c<br />+++ b/arch/x86_64/mm/ioremap.c<br />@@ -263,7 +263,7 @@ void iounmap(volatile void __iomem *addr<br /> addr < phys_to_virt(ISA_END_ADDRESS))<br /> return;<br /> <br />- addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr);<br />+ addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr);<br /> /* Use the vm area unlocked, assuming the caller<br /> ensures there isn't another iounmap for the same address<br /> in parallel. Reuse of the virtual address is prevented by<br />-- <br />0.99.9.GIT<br />-<br />To unsubscribe from this list: send the line "unsubscribe linux-kernel" in<br />the body of a message to majordomo@vger.kernel.org<br />More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a><br />Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a><br /><br /></pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-12-15 10:31 聽聽 [from the cache]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>