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/posix/unistd.h
-2
View File
@@ -104,10 +104,8 @@
/* TODO: check */
#define _SC_IOV_MAX 32
#define _SC_UIO_MAXIOV _SC_IOV_MAX
#define _SC_NPROCESSORS_MAX 33
#define _SC_NPROCESSORS_CONF 34
#define _SC_NPROCESSORS_ONLN 35
#define _SC_CPUID_MAX 36
#define _SC_ATEXIT_MAX 37
#define _SC_PASS_MAX 39
#define _SC_PHYS_PAGES 40