Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into...

[cascardo/linux.git] / arch / mips / include / asm / vpe.h

diff --git a/arch/mips/include/asm/vpe.h b/arch/mips/include/asm/vpe.h
index becd555..7849f39 100644 (file)
--- a/arch/mips/include/asm/vpe.h
+++ b/arch/mips/include/asm/vpe.h
@@ -1,22 +1,11 @@
 /*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
  * Copyright (C) 2005 MIPS Technologies, Inc.  All rights reserved.
  * Copyright (C) 2013 Imagination Technologies Ltd.
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
  */
-
 #ifndef _ASM_VPE_H
 #define _ASM_VPE_H
 
@@ -73,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;
@@ -123,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);