system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-21 01:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't #define max() to get a version that works with vm_ooffset's.

Browse source 
Just use qmax().

This should be fixed more generally using overloaded functions.
This commit is contained in:
Bruce Evans 1997-11-24 15:03:13 +00:00
parent 638493a3c4
commit 5270ecea67
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=31392
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/vm/vm_map.c
View file

@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_map.c,v 1.96 1997/11/07 08:53:44 phk Exp $
* $Id: vm_map.c,v 1.97 1997/11/14 23:42:10 tegge Exp $
*/
/*
@ -1062,7 +1062,6 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end,
if (current->protection != old_prot) {
#define MASK(entry) (((entry)->eflags & MAP_ENTRY_COW) ? ~VM_PROT_WRITE : \
VM_PROT_ALL)
#define max(a,b) ((a) > (b) ? (a) : (b))
if (current->eflags & MAP_ENTRY_IS_A_MAP) {
vm_map_entry_t share_entry;
@ -1080,7 +1079,7 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end,
(share_entry->start < share_end)) {
pmap_protect(map->pmap,
(max(share_entry->start,
(qmax(share_entry->start,
current->offset) -
current->offset +
current->start),
@ -1098,7 +1097,6 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end,
pmap_protect(map->pmap, current->start,
current->end,
current->protection & MASK(entry));
#undef max
#undef MASK
}