From aa2158d5469463f8c1591e047b9d8a795fc77493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 23 Feb 2016 17:25:40 +0100
Subject: [PATCH] Removed some spec artifacts (like buildroot cleaning)

- Fixed malformed "Loading" banner
- Not relocating memtest86+ above 1 MB
  Related: rhbz#1303804
- Introduced new configuration file (/etc/memtest86+.conf)
- Introduced new memtest-setup switches for selecting ELF/non-ELF versions
  Resolves: rhbz#1303804
---
 memtest86+-5.01-real-mode-reloc.patch | 14 --------------
 memtest86+.spec                       |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 memtest86+-5.01-real-mode-reloc.patch

diff --git a/memtest86+-5.01-real-mode-reloc.patch b/memtest86+-5.01-real-mode-reloc.patch
deleted file mode 100644
index ccb8477..0000000
--- a/memtest86+-5.01-real-mode-reloc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/main.c b/main.c
-index 613f811..44f49f8 100644
---- a/main.c
-+++ b/main.c
-@@ -394,6 +394,9 @@ void test_start(void)
- 	/* If this is the first time here we are CPU 0 */
- 	if (start_seq == 0) {
- 		my_cpu_num = 0;
-+		if ((ulong)&_start != LOW_TEST_ADR) {
-+			run_at(LOW_TEST_ADR, 0);
-+		}
- 	} else {
- 		my_cpu_num = smp_my_cpu_num();
- 	}
diff --git a/memtest86+.spec b/memtest86+.spec
index 4ddfb0b..0988825 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -30,7 +30,6 @@ Patch1:   memtest86+-5.01-no-optimization.patch
 Patch2:   memtest86+-5.01-compile-fix.patch
 Patch3:   memtest86+-5.01-crash-fix.patch
 Patch4:   memtest86+-5.01-fgnu89-inline.patch
-Patch5:   memtest86+-5.01-real-mode-reloc.patch
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -61,9 +60,8 @@ cp -p %{SOURCE6} README.%{readme_suffix}
 %patch2 -p1 -b .compile-fix
 %patch3 -p1 -b .crash-fix
 %patch4 -p1 -b .fgnu89-inline
-%patch5 -p1 -b .real-mode-reloc
 
-sed -i -e's,0x10000,0x100000,' memtest.lds
+#sed -i -e's,0x10000,0x100000,' memtest.lds
 %ifarch x86_64
 sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
 %endif
@@ -127,6 +125,8 @@ fi
 * Tue Feb 23 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 5.01-14
 - Removed some spec artifacts (like buildroot cleaning)
 - Fixed malformed "Loading" banner
+- Not relocating memtest86+ above 1 MB
+  Related: rhbz#1303804
 - Introduced new configuration file (/etc/memtest86+.conf)
 - Introduced new memtest-setup switches for selecting ELF/non-ELF versions
   Resolves: rhbz#1303804