X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Flightrec%2Fmem.c;h=9134d893916100053d7566a56fbfecec71e419a6;hb=730065c26a5926653684605e0fb9dc14f293569b;hp=efabdb00dfb8bfa5f22c11e2b390b0747ec0e884;hpb=8de0dd9f368c5f2d047213c1196c67cd22563915;p=pcsx_rearmed.git

diff --git a/libpcsxcore/lightrec/mem.c b/libpcsxcore/lightrec/mem.c
index efabdb00..9134d893 100644
--- a/libpcsxcore/lightrec/mem.c
+++ b/libpcsxcore/lightrec/mem.c
@@ -55,8 +55,12 @@ static void * mmap_huge(void *addr, size_t length, int prot, int flags,
 
 	if (map == MAP_FAILED) {
 		map = mmap(addr, length, prot, flags, fd, offset);
-		if (map != MAP_FAILED)
+		if (map != MAP_FAILED) {
 			printf("Regular mmap to address 0x%lx succeeded\n", (uintptr_t) addr);
+#ifdef MADV_HUGEPAGE
+			madvise(map, length, MADV_HUGEPAGE);
+#endif
+		}
 	}
 
 	return map;
@@ -91,11 +95,16 @@ static int lightrec_mmap_ram(bool hugetlb)
 		base = supported_io_bases[i];
 
 		for (j = 0; j < 4; j++) {
-			map = mmap_huge((void *)(base + j * 0x200000),
-					0x200000, PROT_READ | PROT_WRITE,
+			void *base_ptr = (void *)(base + j * 0x200000);
+			map = mmap_huge(base_ptr, 0x200000, PROT_READ | PROT_WRITE,
 					MAP_SHARED | MAP_FIXED_NOREPLACE, memfd, 0);
 			if (map == MAP_FAILED)
 				break;
+			// some systems ignore MAP_FIXED_NOREPLACE
+			if (map != base_ptr) {
+				munmap(map, 0x200000);
+				break;
+			}
 		}
 
 		/* Impossible to map using this base */