Messages in this thread Patch in this message | | | Date | Thu, 16 Apr 2015 10:04:40 +0200 | From | Pavel Machek <> | Subject | [patch for 4.0] x86: silence warning in /dev/mem support |
| |
The compiler is right, the code is tricky, but it is also correct AFAICT.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index fdf617c..8a8dce8 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -341,7 +341,7 @@ void *xlate_dev_mem_ptr(phys_addr_t phys) addr = (void __force *)ioremap_cache(start, PAGE_SIZE); if (addr) - addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); + addr = (void *)((unsigned long)addr | (unsigned long) (phys & ~PAGE_MASK)); return addr; }
-- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
| |