diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 3 | ||||
| -rw-r--r-- | kernel/resource.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c index 8fa2600bde6a..8c5e6413bcf4 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -73,9 +73,6 @@ */ #ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX # define debug_align(X) ALIGN(X, PAGE_SIZE) -#else -# define debug_align(X) (X) -#endif /* If this is set, the section belongs in the init part of the module */ #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) diff --git a/kernel/resource.c b/kernel/resource.c index 841737bbda9e..4d471379b54b 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -388,6 +388,14 @@ static int find_next_iomem_res(resource_size_t start, resource_size_t end, res->desc = p->desc; } + if (p) { + /* copy data */ + res->start = max(start, p->start); + res->end = min(end, p->end); + res->flags = p->flags; + res->desc = p->desc; + } + read_unlock(&resource_lock); return p ? 0 : -ENODEV; } |