diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-20 02:25:07 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-20 02:25:07 +0000 |
| commit | 031f431679b03ba7e791dd051fc13f51f806fcd7 (patch) | |
| tree | 9018f8a4a6c04feaf0180cae915dfe804913ce34 /arch/x86/mm/ioremap.c | |
| parent | f7901365aa48b20b25f8402e0fd1eea4ac6c55e7 (diff) | |
| parent | 91db57e54eb9be1560454d6a370d67847b05735f (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rtlsk-v4.4-18.03-rt
Diffstat (limited to 'arch/x86/mm/ioremap.c')
| -rw-r--r-- | arch/x86/mm/ioremap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index b9c78f3bcd67..53ab3f367472 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -348,11 +348,11 @@ void iounmap(volatile void __iomem *addr) (void __force *)addr < phys_to_virt(ISA_END_ADDRESS)) return; + mmiotrace_iounmap(addr); + addr = (volatile void __iomem *) (PAGE_MASK & (unsigned long __force)addr); - mmiotrace_iounmap(addr); - /* Use the vm area unlocked, assuming the caller ensures there isn't another iounmap for the same address in parallel. Reuse of the virtual address is prevented by |