Merge branch 'master' into mountpoints

Conflicts:
	Makefile

2 files changed, 4 insertions, 0 deletions

diff --git a/Source/Library/Interface/Process.iface.h b/Source/Library/Interface/Process.iface.h
index 4d3217f..b387801 100644
--- a/Source/Library/Interface/Process.iface.h
+++ b/Source/Library/Interface/Process.iface.h
@@ -15,6 +15,7 @@
 #define PRIF_FREEPAGES 0x03	//Free frames for pages (v) | i:position, i:count
 #define PRIF_GETPID 0x04	//Get PID of a process (i) | no arguments
 #define PRIF_GETPPID 0x05	//Get PPID of a process (i) | no arguments
+#define PRIF_GETUID 0x06	//Get UID of a process (i) | no arguments
 
 #define PRIF_ARGC 0x10	//Get argument count for a process (i) | no arguments
 #define PRIF_ARGV 0x11	//Get argument value for a process (S) | i:argument_index
diff --git a/Source/Library/Userland/Binding/Process.class.h b/Source/Library/Userland/Binding/Process.class.h
index 523be79..1a1481f 100644
--- a/Source/Library/Userland/Binding/Process.class.h
+++ b/Source/Library/Userland/Binding/Process.class.h
@@ -33,6 +33,9 @@ class Process : public RessourceCaller {
 	u32int getPpid() {
 		return doCall(PRIF_GETPPID);
 	}
+	u32int getUid() {
+		return doCall(PRIF_GETUID);
+	}
 	u32int argc() {
 		return doCall(PRIF_ARGC);
 	}