forked from AbleOS/ableos
merge again because my dumb butt forgot to fix conflicts
This commit is contained in:
parent
f6b3168f3b
commit
7d563f8ad2
|
@ -29,22 +29,6 @@ macro_rules! syscall_enum {
|
|||
};
|
||||
}
|
||||
syscall_enum! {
|
||||
<<<<<<< HEAD
|
||||
KILL=0, // Provide a PID
|
||||
CONSOLE_RESET=1, // Reset the console
|
||||
CONSOLE_IN=2, // Console Input
|
||||
CONSOLE_OUT=3, // Console output
|
||||
CONSOLE_GET_TITLE=4, // Get the console title
|
||||
CONSOLE_SET_TITLE=5, // Set the console title
|
||||
GET_PID=6, // Get the proccess ID
|
||||
PROCESS_INFO=7, // Get information about the process
|
||||
//scheduler Related Syscals
|
||||
GET_PRIORITY=8, // Get scheduler priority
|
||||
SET_PRIORITY=9, // Set scheduler priority
|
||||
//
|
||||
GET_HOSTNAME=10,
|
||||
SET_HOSTNAME=11,
|
||||
=======
|
||||
KILL=0, // Provide a PID
|
||||
CONSOLE_RESET=1, // Reset the console
|
||||
CONSOLE_IN=2, // Console Input
|
||||
|
@ -57,7 +41,6 @@ syscall_enum! {
|
|||
//
|
||||
GET_HOSTNAME=10,
|
||||
SET_HOSTNAME=11,
|
||||
>>>>>>> fb851e78c5767d5c0d7f80175d5061fd0746813e
|
||||
|
||||
|
||||
NEW_THREAD=12,
|
||||
|
|
Loading…
Reference in a new issue