From dd594910e2d5dd20a2349db3d1e0e16e9b7fa5f5 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sat, 18 Sep 2010 04:33:45 +0000 Subject: Replace the partial memory reservation patch by a simpler variation. Submitted by: tijl Tested by: Alex Kozlov --- .../wine-devel/files/patch-partial-reservation | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'emulators/wine-devel/files') diff --git a/emulators/wine-devel/files/patch-partial-reservation b/emulators/wine-devel/files/patch-partial-reservation index af9400870483..6eca6ad32afd 100644 --- a/emulators/wine-devel/files/patch-partial-reservation +++ b/emulators/wine-devel/files/patch-partial-reservation @@ -1,26 +1,11 @@ -diff --git libs/wine/mmap.c libs/wine/mmap.c -index d107fc7..a694e4f 100644 --- libs/wine/mmap.c +++ libs/wine/mmap.c -@@ -344,9 +344,13 @@ void mmap_init(void) - struct reserved_area *area; - struct list *ptr; - #ifdef __i386__ -+ char *user_space_limit = (char *)0x7ffe0000; -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+ reserve_malloc_space( 8 * 1024 * 1024 ); -+ reserve_area( user_space_limit, (char *)0x82000000 ); -+#else - char stack; - char * const stack_ptr = &stack; -- char *user_space_limit = (char *)0x7ffe0000; - - reserve_malloc_space( 8 * 1024 * 1024 ); - -@@ -377,6 +381,7 @@ void mmap_init(void) +@@ -383,6 +383,9 @@ void mmap_init(void) reserve_area( base, end ); } else reserve_area( user_space_limit, 0 ); ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++ wine_mmap_remove_reserved_area( (char *)0x82000000, 0xffffffff - 0x82000000, 1 ); +#endif #endif /* __i386__ */ -- cgit v1.2.3