SOURCES: lrmi-update-v86d.patch - updated from v86d 0.1.7 (but without Syst...

qboosh qboosh at pld-linux.org
Thu Sep 18 19:46:32 CEST 2008


Author: qboosh                       Date: Thu Sep 18 17:46:32 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated from v86d 0.1.7 (but without System BIOS size bug :P)

---- Files affected:
SOURCES:
   lrmi-update-v86d.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/lrmi-update-v86d.patch
diff -u SOURCES/lrmi-update-v86d.patch:1.1 SOURCES/lrmi-update-v86d.patch:1.2
--- SOURCES/lrmi-update-v86d.patch:1.1	Wed Jul 30 18:51:48 2008
+++ SOURCES/lrmi-update-v86d.patch	Thu Sep 18 19:46:26 2008
@@ -1,5 +1,5 @@
 --- lrmi-0.10/lrmi.c.orig	2005-12-05 00:44:44.000000000 +0100
-+++ lrmi-0.10/lrmi.c	2008-07-30 18:46:00.981332179 +0200
++++ lrmi-0.10/lrmi.c	2008-09-18 19:31:56.027620364 +0200
 @@ -61,6 +61,14 @@
  
  #include "lrmi.h"
@@ -15,12 +15,28 @@
  #define REAL_MEM_BASE 	((void *)0x10000)
  #define REAL_MEM_SIZE 	0x40000
  #define REAL_MEM_BLOCKS 	0x100
-@@ -341,7 +349,7 @@
+@@ -340,7 +348,7 @@
+ 		return 0;
  	}
  
- 	if (!map_file((void *)0xa0000, 0x100000 - 0xa0000,
--	 PROT_READ | PROT_WRITE,
-+	 PROT_READ | PROT_WRITE | PROT_EXEC,
+-	if (!map_file((void *)0xa0000, 0x100000 - 0xa0000,
++	if (!map_file((void *)0xa0000, 0x20000,
+ 	 PROT_READ | PROT_WRITE,
  	 MAP_FIXED | MAP_SHARED, "/dev/mem", 0xa0000)) {
  		munmap((void *)0, 0x502);
- 		real_mem_deinit();
+@@ -348,6 +356,15 @@
+ 		return 0;
+ 	}
+ 
++	if (!map_file((void *)0xc0000, 0x40000,
++	 PROT_READ | PROT_WRITE | PROT_EXEC,
++	 MAP_FIXED | MAP_SHARED, "/dev/mem", 0xc0000)) {
++		munmap((void *)0, 0x502);
++		munmap((void *)0xa0000, 0x20000);
++		real_mem_deinit();
++		return 0;
++	}
++
+ 	/*
+ 	 Allocate a stack
+ 	*/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/lrmi-update-v86d.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list