Merge branch 'scheduler'

Conflicts:
	build/jam/packages/Haiku
	headers/os/kernel/OS.h
	headers/os/opengl/GLRenderer.h
	headers/private/shared/cpu_type.h
	src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.h
	src/bin/sysinfo.cpp
	src/bin/top.c
	src/system/kernel/arch/x86/arch_system_info.cpp
	src/system/kernel/port.cpp

headers/private/system/syscalls.h

@@ -192,6 +192,9 @@ extern status_t		_kern_unblock_threads(thread_id* threads, uint32 count,
 
 extern bigtime_t	_kern_estimate_max_scheduling_latency(thread_id thread);
 
+extern status_t		_kern_set_scheduler_mode(int32 mode);
+extern int32		_kern_get_scheduler_mode(void);
+
 // user/group functions
 extern gid_t		_kern_getgid(bool effective);
 extern uid_t		_kern_getuid(bool effective);
@@ -511,9 +514,13 @@ extern int64		_kern_atomic_get64(vint64 *value);
 #endif	// ATOMIC64_FUNCS_ARE_SYSCALLS
 
 /* System informations */
-extern status_t		_kern_get_system_info(system_info *info, size_t size);
-extern status_t		_kern_get_system_info_etc(int32 id, void *buffer,
-						size_t bufferSize);
+extern status_t		_kern_get_system_info(system_info* info);
+extern status_t		_kern_get_cpu_info(uint32 firstCPU, uint32 cpuCount,
+						cpu_info* info);
+extern status_t		_kern_get_cpu_topology_info(
+						cpu_topology_node_info* topologyInfos,
+						uint32* topologyInfoCount);
+
 extern status_t		_kern_analyze_scheduling(bigtime_t from, bigtime_t until,
 						void* buffer, size_t size,
 						struct scheduling_analysis* analysis);

headers/private/system/system_info.h

@@ -9,21 +9,6 @@
 #include <OS.h>
 
 
-#define B_MEMORY_INFO	'memo'
-
-struct system_memory_info {
-	uint64		max_memory;
-	uint64		free_memory;
-	uint64		needed_memory;
-	uint64		max_swap_space;
-	uint64		free_swap_space;
-	uint64		block_cache_memory;
-	uint32		page_faults;
-
-	// TODO: add active/inactive page counts, swap in/out, ...
-};
-
-
 enum {
 	// team creation or deletion; object == -1; either one also triggers on
 	// exec()
@@ -63,7 +48,10 @@ extern "C" {
 #endif
 
 
-status_t __get_system_info_etc(int32 id, void* buffer, size_t bufferSize);
+status_t __get_system_info(system_info* info);
+status_t __get_cpu_info(uint32 firstCPU, uint32 cpuCount, cpu_info* info);
+status_t __get_cpu_topology_info(cpu_topology_node_info* topologyInfos,
+			uint32* topologyInfoCount);
 
 status_t __start_watching_system(int32 object, uint32 flags, port_id port,
 			int32 token);