VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / ipc / sem.c

diff --git a/ipc/sem.c b/ipc/sem.c
index 11ce967..71936c9 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -71,6 +71,8 @@
 #include <linux/time.h>
 #include <linux/smp_lock.h>
 #include <linux/security.h>
+#include <linux/vs_base.h>
+
 #include <asm/uaccess.h>
 #include "util.h"
 
@@ -116,7 +118,7 @@ void __init sem_init (void)
        ipc_init_ids(&sem_ids,sc_semmni);
 
 #ifdef CONFIG_PROC_FS
-       create_proc_read_entry("sysvipc/sem", 0, 0, sysvipc_sem_read_proc, NULL);
+       create_proc_read_entry("sysvipc/sem", 0, NULL, sysvipc_sem_read_proc, NULL);
 #endif
 }
 
@@ -611,7 +613,7 @@ static int semctl_main(int semid, int semnum, int cmd, int version, union semun
        switch (cmd) {
        case GETALL:
        {
-               ushort *array = arg.array;
+               ushort __user *array = arg.array;
                int i;
 
                if(nsems > SEMMSL_FAST) {