Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[~andy/linux] / arch / mips / include / asm / vpe.h

diff --git a/arch/mips/include/asm/vpe.h b/arch/mips/include/asm/vpe.h
index e0684f5f0054aa33b762606fd386479fe64513dd..7849f3978feafe09cd0d9e712526bcc13d5e6c37 100644 (file)
--- a/arch/mips/include/asm/vpe.h
+++ b/arch/mips/include/asm/vpe.h
@@ -62,7 +62,6 @@ struct vpe {
        unsigned long len;
        char *pbuffer;
        unsigned long plen;
-       unsigned int uid, gid;
        char cwd[VPE_PATH_MAX];
 
        unsigned long __start;
@@ -112,8 +111,6 @@ extern const struct file_operations vpe_fops;
 int vpe_notify(int index, struct vpe_notifications *notify);
 
 void *vpe_get_shared(int index);
-int vpe_getuid(int index);
-int vpe_getgid(int index);
 char *vpe_getcwd(int index);
 
 struct vpe *get_vpe(int minor);