Home Home > GIT Browse
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
commitbb76a16889af27e61e79f33cabfc4cf1984a63fe (patch)
treee3c39e5b995e4944c4fb41eae7f3f6062881c591
parentfff90ccd897abba19392b8e31484538a96131d5a (diff)
parente7051ca0f024336bd137d5de84a563beb96349fe (diff)
Merge branch 'users/jthumshirn/SLE15-SP1/for-next' into SLE15-SP1
-rw-r--r--patches.suse/0001-mm-defer-ZONE_DEVICE-page-initialization-to-the-poin.patch20
1 files changed, 16 insertions, 4 deletions
diff --git a/patches.suse/0001-mm-defer-ZONE_DEVICE-page-initialization-to-the-poin.patch b/patches.suse/0001-mm-defer-ZONE_DEVICE-page-initialization-to-the-poin.patch
index db32096732..42809770a2 100644
--- a/patches.suse/0001-mm-defer-ZONE_DEVICE-page-initialization-to-the-poin.patch
+++ b/patches.suse/0001-mm-defer-ZONE_DEVICE-page-initialization-to-the-poin.patch
@@ -37,10 +37,10 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
---
include/linux/mm.h | 2 +
- kernel/memremap.c | 23 +++++---------
+ kernel/memremap.c | 27 ++++++-----------
mm/hmm.c | 12 ++++---
mm/page_alloc.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++--
- 4 files changed, 96 insertions(+), 23 deletions(-)
+ 4 files changed, 98 insertions(+), 25 deletions(-)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -55,6 +55,18 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
{
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
+@@ -338,9 +338,9 @@ void *devm_memremap_pages(struct device
+ 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);
@@ -398,21 +398,14 @@ void *devm_memremap_pages(struct device
if (error)
goto err_add_memory;
@@ -116,7 +128,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
error_add_memory:
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -5342,12 +5342,23 @@ void __meminit memmap_init_zone(unsigned
+@@ -5389,12 +5389,23 @@ void __meminit memmap_init_zone(unsigned
if (highest_memmap_pfn < end_pfn - 1)
highest_memmap_pfn = end_pfn - 1;
@@ -143,7 +155,7 @@ Signed-off-by: Michal Hocko <mhocko@suse.com>
for (pfn = start_pfn; pfn < end_pfn; pfn++) {
/*
-@@ -5411,6 +5422,71 @@ not_early:
+@@ -5458,6 +5469,71 @@ not_early:
}
}