Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-01-25 15:06:40 +0100
committerKernel Build Daemon <kbuild@suse.de>2019-01-25 15:06:40 +0100
commitd5fac9c39b3c3da84f81643c856cb398653fea2f (patch)
treeb89c6ac3d80524edf2d17c46ffdfb1db6e8f9e64
parent3bbba790e57733d1120fe40bb69406adaeb3ab2a (diff)
parentdb3694bc9bff461ef89a968d386566fea5bb84c5 (diff)
Merge branch 'users/jthumshirn/SLE15-SP1/for-next' into SLE15-SP1
-rw-r--r--kernel/memremap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/memremap.c b/kernel/memremap.c
index 47b379bf8d3d..43d467b9f81d 100644
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -338,9 +338,9 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap)
resource_size_t align_start, align_size, align_end;
struct vmem_altmap *altmap = pgmap->altmap_valid ?
&pgmap->altmap : NULL;
- unsigned long pfn, pgoff, order;
+ unsigned long pgoff, order;
pgprot_t pgprot = PAGE_KERNEL;
- int error, nid, is_ram, i = 0;
+ int error, nid, is_ram;
struct resource *res = &pgmap->res;
align_start = res->start & ~(SECTION_SIZE - 1);