Accepting request 713581 from home:michals

- Also support extended address space with SLE 12 SP5 (bsc#1138451)
  * refresh makedumpfile-ppc64-VA-range-SUSE.patch

OBS-URL: https://build.opensuse.org/request/show/713581
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=132

makedumpfile-ppc64-VA-range-SUSE.patch

@@ -12,10 +12,45 @@ Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
  makedumpfile.c |    4 ++++
  makedumpfile.h |    3 +++
  3 files changed, 9 insertions(+), 1 deletion(-)
+diff -ur a/arch/ppc64.c b/arch/ppc64.c
+--- a/arch/ppc64.c	2018-12-04 21:21:52.000000000 +0100
++++ b/arch/ppc64.c	2019-07-05 11:25:20.318510887 +0200
+@@ -248,7 +248,9 @@
  
---- a/makedumpfile.h
+ 			if (info->kernel_version >= KERNEL_VERSION(4, 12, 0)) {
-+++ b/makedumpfile.h
+ 				info->l2_index_size = PMD_INDEX_SIZE_L4_64K_4_12;
-@@ -1936,6 +1936,9 @@ struct number_table {
+-				if (info->kernel_version >= KERNEL_VERSION(4, 17, 0))
++				if (info->kernel_version >= KERNEL_VERSION(4, 17, 0) ||
++				    ((NUMBER(SUSE_PRODUCT_CODE) & ~0xffL) == 0x010f0100) ||
++				    ((NUMBER(SUSE_PRODUCT_CODE) & ~0xffL) == 0x010c0500))
+ 					info->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_17;
+ 				else
+ 					info->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_12;
+diff -ur a/makedumpfile.c b/makedumpfile.c
+--- a/makedumpfile.c	2018-12-04 21:21:52.000000000 +0100
++++ b/makedumpfile.c	2019-07-05 11:23:32.357093984 +0200
+@@ -2296,6 +2296,8 @@
+ 	WRITE_NUMBER_UNSIGNED("kimage_voffset", kimage_voffset);
+ #endif
+ 
++	WRITE_NUMBER("SUSE_PRODUCT_CODE", SUSE_PRODUCT_CODE);
++
+ 	if (info->phys_base)
+ 		fprintf(info->file_vmcoreinfo, "%s%lu\n", STR_NUMBER("phys_base"),
+ 			info->phys_base);
+@@ -2696,6 +2698,8 @@
+ 
+ 	READ_NUMBER("HUGETLB_PAGE_DTOR", HUGETLB_PAGE_DTOR);
+ 
++	READ_NUMBER("SUSE_PRODUCT_CODE", SUSE_PRODUCT_CODE);
++
+ 	return TRUE;
+ }
+ 
+diff -ur a/makedumpfile.h b/makedumpfile.h
+--- a/makedumpfile.h	2018-12-04 21:21:52.000000000 +0100
++++ b/makedumpfile.h	2019-07-05 11:23:32.353093931 +0200
+@@ -1936,6 +1936,9 @@
  	unsigned long	PHYS_OFFSET;
  	unsigned long	kimage_voffset;
  #endif
@@ -25,35 +60,3 @@ Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
  };
  
  struct srcfile_table {
---- a/makedumpfile.c
-+++ b/makedumpfile.c
-@@ -2296,6 +2296,8 @@ write_vmcoreinfo_data(void)
- 	WRITE_NUMBER_UNSIGNED("kimage_voffset", kimage_voffset);
- #endif
- 
-+	WRITE_NUMBER("SUSE_PRODUCT_CODE", SUSE_PRODUCT_CODE);
-+
- 	if (info->phys_base)
- 		fprintf(info->file_vmcoreinfo, "%s%lu\n", STR_NUMBER("phys_base"),
- 			info->phys_base);
-@@ -2696,6 +2698,8 @@ read_vmcoreinfo(void)
- 
- 	READ_NUMBER("HUGETLB_PAGE_DTOR", HUGETLB_PAGE_DTOR);
- 
-+	READ_NUMBER("SUSE_PRODUCT_CODE", SUSE_PRODUCT_CODE);
-+
- 	return TRUE;
- }
- 
---- a/arch/ppc64.c
-+++ b/arch/ppc64.c
-@@ -248,7 +248,8 @@ ppc64_vmalloc_init(void)
- 
- 			if (info->kernel_version >= KERNEL_VERSION(4, 12, 0)) {
- 				info->l2_index_size = PMD_INDEX_SIZE_L4_64K_4_12;
--				if (info->kernel_version >= KERNEL_VERSION(4, 17, 0))
-+				if (info->kernel_version >= KERNEL_VERSION(4, 17, 0) ||
-+				    (NUMBER(SUSE_PRODUCT_CODE) & ~0xffL) == 0x010f0100)
- 					info->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_17;
- 				else
- 					info->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_12;

makedumpfile.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  5 09:27:33 UTC 2019 - Michal Suchanek <msuchanek@suse.com>
+
+- Also support extended address space with SLE 12 SP5 (bsc#1138451)
+  * refresh makedumpfile-ppc64-VA-range-SUSE.patch
+
 -------------------------------------------------------------------
 Thu Feb 14 17:41:26 UTC 2019 - ptesarik@suse.com
 

makedumpfile.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #