Merge remote-tracking branch 'haiku/master' into package-management
Conflicts: build/jam/HaikuImage build/jam/OptionalPackageDependencies build/jam/OptionalPackages build/scripts/build_cross_tools_gcc4 src/add-ons/translators/icns/Jamfile src/add-ons/translators/jpeg/Jamfile
This commit is contained in:
@@ -15,13 +15,6 @@
|
||||
// Note: the VM probably won't support all combinations - it will try
|
||||
// its best, but create_area() will fail if it has to.
|
||||
// Of course, the exact behaviour will be documented somewhere...
|
||||
#define B_EXECUTE_AREA 0x04
|
||||
#define B_STACK_AREA 0x08
|
||||
// "stack" protection is not available on most platforms - it's used
|
||||
// to only commit memory as needed, and have guard pages at the
|
||||
// bottom of the stack.
|
||||
// "execute" protection is currently ignored, but nevertheless, you
|
||||
// should use it if you require to execute code in that area.
|
||||
|
||||
#define B_KERNEL_EXECUTE_AREA 0x40
|
||||
#define B_KERNEL_STACK_AREA 0x80
|
||||
|
||||
Reference in New Issue
Block a user