Alex Smith 11c9f9a1d6 Merge branch 'master' into x86_64 ...

Conflicts:
	build/jam/FloppyBootImage
	build/jam/OptionalBuildFeatures
	build/jam/OptionalPackages
	headers/private/shared/cpu_type.h
	src/bin/ps.c
	src/bin/sysinfo.cpp
	src/kits/tracker/PoseView.cpp
	src/preferences/appearance/DecorSettingsView.cpp
	src/preferences/virtualmemory/Settings.cpp
	src/servers/input/AddOnManager.cpp
	src/servers/input/InputServer.cpp
	src/servers/input/InputServerMethod.cpp
	src/system/boot/Jamfile
	src/system/boot/platform/raspberrypi_arm/mmu.cpp
	src/system/boot/platform/u-boot/arch/arm/Jamfile
	src/system/kernel/arch/x86/arch_cpu.cpp
	src/system/kernel/arch/x86/arch_thread.cpp
	src/system/kernel/cache/block_cache.cpp
	src/system/kernel/vm/VMAnonymousCache.cpp

2012-11-18 14:02:07 +00:00

..

allocator.cpp

…

HashedObjectCache.cpp

Tracking info wasn't always retrieved with the cache locked.

2011-11-29 00:15:34 +01:00

HashedObjectCache.h

…

Jamfile

…

MemoryManager.cpp

Merge branch 'master' into x86_64

2012-11-18 14:02:07 +00:00

MemoryManager.h

Fix crash in MemoryManager::PerformMaintenance()

2012-09-11 22:31:19 +02:00

ObjectCache.cpp

Add the object pointers to the panic messages.

2011-11-13 22:18:29 +01:00

ObjectCache.h

mmlr + bonefish:

2011-11-01 22:23:37 +00:00

ObjectDepot.cpp

…

slab_debug.h

Move AllocationTrackingInfo into a header. This way it can be re-used outside

2011-11-04 18:03:34 +00:00

slab_private.h

…

Slab.cpp

Fixed formatting of output in some debugger commands.

2012-07-12 11:29:33 +01:00

SmallObjectCache.cpp

…

SmallObjectCache.h

…