diff options
| author |   James Morris <james.l.morris@oracle.com> | 2017-12-11 17:01:08 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-12-11 17:01:08 +1100 |
| commit | d21bd6898336a7892914d308d5e0868f0b863571 (patch) | |
| tree | f5f756c25348b5a6c1ce9ddbaa7d1ecd1bef40b0 /lib/ioremap.c | |
| parent | MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries (diff) | |
| parent | Linux 4.15-rc3 (diff) | |
| download | wireguard-linux-d21bd6898336a7892914d308d5e0868f0b863571.tar.xz wireguard-linux-d21bd6898336a7892914d308d5e0868f0b863571.zip | |
Sync to v4.15-rc3 for security subsystem developers to work against.
Diffstat (limited to 'lib/ioremap.c')
| -rw-r--r-- | lib/ioremap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ioremap.c b/lib/ioremap.c index 4bb30206b942..b808a390e4c3 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Re-map IO memory to kernel address space so that we can access it. * This is needed for high PCI addresses that aren't mapped in the @@ -161,6 +162,7 @@ int ioremap_page_range(unsigned long addr, unsigned long next; int err; + might_sleep(); BUG_ON(addr >= end); start = addr; |