i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'scheduler'

Browse Source 
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
This commit is contained in:
Pawel Dziepak
2014-01-17 04:06:15 +01:00
parent dd8a866adc 0269dd284e
commit d0f2d8282f
356 changed files with 11797 additions and 9927 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/boot/kernel_args.h
+1 -1
View File
@@ -59,7 +59,7 @@ typedef struct kernel_args {
uint64 ignored_physical_memory;
uint32 num_cpus;
addr_range cpu_kstack[MAX_BOOT_CPUS];
addr_range cpu_kstack[SMP_MAX_CPUS];
// boot volume KMessage data
FixedWidthPointer<void> boot_volume;
headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
+2 -2
View File
@@ -15,8 +15,8 @@
#include <util/FixedWidthPointer.h>
// must match SMP_MAX_CPUS in arch_smp.h
#define MAX_BOOT_CPUS 8
#define SMP_MAX_CPUS 64
#define MAX_PHYSICAL_MEMORY_RANGE 32
#define MAX_PHYSICAL_ALLOCATED_RANGE 32
#define MAX_VIRTUAL_ALLOCATED_RANGE 32