diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2010-09-18 04:33:45 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2010-09-18 04:33:45 +0000 |
| commit | dd594910e2d5dd20a2349db3d1e0e16e9b7fa5f5 (patch) | |
| tree | a668c7db8bdaa77bb13c4c0d4ff645728128ec53 /emulators | |
| parent | 0362c8ed6342be692a460996f0c5c27469b8a3d4 (diff) | |
| download | ports-dd594910e2d5dd20a2349db3d1e0e16e9b7fa5f5.tar.gz ports-dd594910e2d5dd20a2349db3d1e0e16e9b7fa5f5.zip | |
Replace the partial memory reservation patch by a simpler variation.
Submitted by: tijl
Tested by: Alex Kozlov <spam@rm-rf.kiev.ua>
Notes
Notes:
svn path=/head/; revision=261367
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine-devel/files/patch-partial-reservation | 21 | ||||
| -rw-r--r-- | emulators/wine/files/patch-partial-reservation | 21 |
2 files changed, 6 insertions, 36 deletions
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__ */ diff --git a/emulators/wine/files/patch-partial-reservation b/emulators/wine/files/patch-partial-reservation index af9400870483..6eca6ad32afd 100644 --- a/emulators/wine/files/patch-partial-reservation +++ b/emulators/wine/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__ */ |