diff --git a/declare-static.diff b/declare-static.diff deleted file mode 100644 index 3902582..0000000 --- a/declare-static.diff +++ /dev/null @@ -1,39 +0,0 @@ -Declare functions static not extern they are only used inside this file - - ---- - io.h | 6 +++--- - test.c | 51 ++++++++++++++++++++++++++++++--------------------- - 2 files changed, 33 insertions(+), 24 deletions(-) - -Index: memtest86+-4.00/io.h -=================================================================== ---- memtest86+-4.00.orig/io.h -+++ memtest86+-4.00/io.h -@@ -31,7 +31,7 @@ - */ - - #define __OUT1(s,x) \ --extern inline void __out##s(unsigned x value, unsigned short port) { -+static inline void __out##s(unsigned x value, unsigned short port) { - - #define __OUT2(s,s1,s2) \ - __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" -@@ -43,7 +43,7 @@ __OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" - __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } - - #define __IN1(s) \ --extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; -+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; - - #define __IN2(s,s1,s2) \ - __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" -@@ -55,7 +55,7 @@ __IN1(s##_p) __IN2(s,s1,"w") : "=a" (_v) - __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; } - - #define __OUTS(s) \ --extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ -+static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ - { __asm__ __volatile__ ("cld ; rep ; outs" #s \ - : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); } - diff --git a/include-linkonce b/include-linkonce deleted file mode 100644 index 0a673ef..0000000 --- a/include-linkonce +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur memtest86+-1.70.orig/memtest_shared.lds memtest86+-1.70/memtest_shared.lds ---- memtest86+-1.70.orig/memtest_shared.lds 2006-12-27 02:33:06.000000000 +0100 -+++ memtest86+-1.70/memtest_shared.lds 2007-01-25 16:34:19.000000000 +0100 -@@ -8,6 +8,7 @@ - _start = .; - *(.text) - *(.text.*) -+ *(.gnu.linkonce.t.*) - *(.plt) - _etext = . ; - } = 0x9090 diff --git a/memtest86+-4.00.tar.gz b/memtest86+-4.00.tar.gz deleted file mode 100644 index fb96b9b..0000000 --- a/memtest86+-4.00.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ec42f549da81b715bfc5c55b93b74774fb5c35f7578c7eecebab3ca37866ca4 -size 270327 diff --git a/memtest86+-4.10.tar.bz2 b/memtest86+-4.10.tar.bz2 new file mode 100644 index 0000000..0735b9f --- /dev/null +++ b/memtest86+-4.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10cacb8a6228efe094d5e725ff59aa808104fc86eafa02e55c239ca097877bae +size 188040 diff --git a/memtest86+.changes b/memtest86+.changes index 1af077e..4019fd2 100644 --- a/memtest86+.changes +++ b/memtest86+.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Aug 30 09:59:35 UTC 2010 - trenn@novell.com + +- Remove old patches. Asked for inclusion, but not needed anymore: + Patch 1/3 : No need to include. + Patch 2/3 : Patch for Mt86+ 2.01. Will broke 4.10. Bug already patched in a + cleaner way + Patch 3/3 : Really no need. It's only a different way to add some comments. + +------------------------------------------------------------------- +Fri Aug 27 15:41:16 UTC 2010 - trenn@novell.com + +- Update to version 4.10 with these features/fixes added: + * New Features + o Added support for Core i7 Extreme CPU (32nm) + o Added support for Core i5/i3 (32 nm) + o Added support for Pentium Gxxxx (32 mn) + o Added support for Westmere-based Xeon + o Added preliminary support for Intel Sandy Bridge + o Added support for AMD 6-cores CPU + o Added detection for Intel 3200/3210 + o New installer for USB Key + * Bug Fixes + o Corrected a crash at startup + o Many others bug fixes + ------------------------------------------------------------------- Mon Sep 28 15:18:24 CEST 2009 - trenn@suse.de diff --git a/memtest86+.spec b/memtest86+.spec index 6d208d8..f713aa8 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -18,7 +18,7 @@ Name: memtest86+ -Version: 4.00 +Version: 4.10 Release: 1 # License: BSD 3-clause (or similar) @@ -35,14 +35,9 @@ Obsoletes: memtest86 <= 3.2 Provides: memtest86 > 3.2 # Url: http://www.memtest.org -Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz +Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.bz2 Patch0: fix-destdir -Patch1: include-linkonce -Patch2: serial-enable -Patch3: declare-static.diff -Patch4: use_assembler_routine.patch -Patch5: work-around-4G-virtual-overflow -# +Patch1: serial-enable Summary: Memory Testing Image for x86 Architecture %description @@ -68,10 +63,6 @@ Authors: %setup %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %ifarch x86_64 diff --git a/use_assembler_routine.patch b/use_assembler_routine.patch deleted file mode 100644 index 8a0d773..0000000 --- a/use_assembler_routine.patch +++ /dev/null @@ -1,104 +0,0 @@ -Use assember code, don't execute the functions twice - - - -Index: memtest86+-4.00/test.c -=================================================================== ---- memtest86+-4.00.orig/test.c -+++ memtest86+-4.00/test.c -@@ -444,17 +444,19 @@ void movinv1(int iter, ulong p1, ulong p - if ((uintptr_t)p == (uintptr_t)pe) { - break; - } --/* Original C code replaced with hand tuned assembly code -- * for (; p < pe; p++) { -- * *p = p1; -- * } -- */ -+/* Original C code replaced with hand tuned assembly code */ -+#if 0 -+ for (; p < pe; p++) { -+ *p = p1; -+ } -+#else - asm __volatile__ ( - "rep\n\t" \ - "stosl\n\t" - : "=D" (p) - : "c" (len), "0" (p), "a" (p1) - ); -+#endif - do_tick(); - BAILR - } while (!done); -@@ -484,14 +486,16 @@ void movinv1(int iter, ulong p1, ulong p - if ((uintptr_t)p == (uintptr_t)pe) { - break; - } --/* Original C code replaced with hand tuned assembly code -- * for (; p < pe; p++) { -- * if ((bad=*p) != p1) { -- * error((ulong*)p, p1, bad); -- * } -- * *p = p2; -- * } -- */ -+/* Original C code replaced with hand tuned assembly code */ -+#if 0 -+ for (; p < pe; p++) { -+ ulong bad; -+ if ((bad=*p) != p1) { -+ error((ulong*)p, p1, bad); -+ } -+ *p = p2; -+ } -+#else - asm __volatile__ ( - "jmp L2\n\t" \ - -@@ -526,10 +530,12 @@ void movinv1(int iter, ulong p1, ulong p - : "a" (p1), "0" (p), "d" (pe), "b" (p2) - : "ecx" - ); -+#endif - do_tick(); - BAILR - } while (!done); - } -+ - for (j=segs-1; j>=0; j--) { - start = v->map[j].start; - end = v->map[j].end; -@@ -550,14 +556,16 @@ void movinv1(int iter, ulong p1, ulong p - if ((uintptr_t)p == (uintptr_t)pe) { - break; - } --/* Original C code replaced with hand tuned assembly code -- * do { -- * if ((bad=*p) != p2) { -- * error((ulong*)p, p2, bad); -- * } -- * *p = p1; -- * } while (p-- > pe); -- */ -+/* Original C code replaced with hand tuned assembly code */ -+#if 0 -+ do { -+ ulong bad; -+ if ((bad=*p) != p2) { -+ error((ulong*)p, p2, bad); -+ } -+ *p = p1; -+ } while (p-- > pe); -+#else - asm __volatile__ ( - "addl $4, %%edi\n\t" - "jmp L9\n\t" -@@ -594,6 +602,7 @@ void movinv1(int iter, ulong p1, ulong p - : "a" (p1), "0" (p), "d" (pe), "b" (p2) - : "ecx" - ); -+#endif - do_tick(); - BAILR - } while (!done); diff --git a/work-around-4G-virtual-overflow b/work-around-4G-virtual-overflow deleted file mode 100644 index cba7492..0000000 --- a/work-around-4G-virtual-overflow +++ /dev/null @@ -1,42 +0,0 @@ ---- memtest86+-2.01/init.c.orig 2008-11-26 13:28:22.000000000 +0100 -+++ memtest86+-2.01/init.c 2008-11-28 16:06:50.000000000 +0100 -@@ -238,7 +238,7 @@ - unsigned long addr_hi; - }; - extern unsigned char pdp[]; -- extern struct pde pd2[]; -+ extern struct pde pd1[]; - unsigned long window = page >> 19; - if (FLAT || (window == mapped_window)) { - return 0; -@@ -266,11 +266,11 @@ - * Bit 6 = Dirty. 1 = memory has been written to. - * Bit 7 = Page Size. 1 = page size is 2 MBytes - * --------------------------------------------------*/ -- pd2[i].addr_lo = ((window & 1) << 31) + ((i & 0x3ff) << 21) + 0xE3; -- pd2[i].addr_hi = (window >> 1); -+ pd1[i].addr_lo = ((window & 1) << 31) + ((i & 0x3ff) << 21) + 0xE3; -+ pd1[i].addr_hi = (window >> 1); - } - paging_off(); -- if (window > 1) { -+ if (window > 0) { - paging_on(pdp); - } - mapped_window = window; -@@ -281,13 +281,13 @@ - { - void *result; - if (FLAT || (page_addr < 0x80000)) { -- /* If the address is less that 1GB directly use the address */ -+ /* If the address is less than 2GB directly use the address */ - result = (void *)(page_addr << 12); - } - else { - unsigned long alias; - alias = page_addr & 0x7FFFF; -- alias += 0x80000; -+ alias += 0x40000; - result = (void *)(alias << 12); - } - return result;