MIPS: vpe: Remove vpe_getcwd

I couldn't find any user of the dubious vpe_getcwd so far. So remove it and
get rid of another set_fs(KERNEL_DS).

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/include/asm/vpe.h b/arch/mips/include/asm/vpe.h
index 80e70dbd1f6417aaecf22871e8e82fefc130f8bf..baa949a744cb44c3c92a7314ed4e009e05520dcc 100644 (file)
--- a/arch/mips/include/asm/vpe.h
+++ b/arch/mips/include/asm/vpe.h
@@ -26,7 +26,6 @@
 #endif
 
 #define MAX_VPES 16
-#define VPE_PATH_MAX 256
 
 static inline int aprp_cpu_index(void)
 {
@@ -62,7 +61,6 @@ struct vpe {
        unsigned long len;
        char *pbuffer;
        unsigned long plen;
-       char cwd[VPE_PATH_MAX];
 
        unsigned long __start;
 
@@ -111,7 +109,6 @@ extern const struct file_operations vpe_fops;
 int vpe_notify(int index, struct vpe_notifications *notify);
 
 void *vpe_get_shared(int index);
-char *vpe_getcwd(int index);
 
 struct vpe *get_vpe(int minor);
 struct tc *get_tc(int index);

diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index d0d832ab3d3b86192b57c30f2c8c9e90820965ea..13294972707bdb6ad57829a9362589b87adb3508 100644 (file)
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -746,28 +746,12 @@ static int vpe_elfload(struct vpe *v)
        return 0;
 }
 
-static int getcwd(char *buff, int size)
-{
-       mm_segment_t old_fs;
-       int ret;
-
-       old_fs = get_fs();
-       set_fs(KERNEL_DS);
-
-       ret = sys_getcwd(buff, size);
-
-       set_fs(old_fs);
-
-       return ret;
-}
-
 /* checks VPE is unused and gets ready to load program */
 static int vpe_open(struct inode *inode, struct file *filp)
 {
        enum vpe_state state;
        struct vpe_notifications *notifier;
        struct vpe *v;
-       int ret;
 
        if (VPE_MODULE_MINOR != iminor(inode)) {
                /* assume only 1 device at the moment. */
@@ -803,12 +787,6 @@ static int vpe_open(struct inode *inode, struct file *filp)
        v->plen = P_SIZE;
        v->load_addr = NULL;
        v->len = 0;
-
-       v->cwd[0] = 0;
-       ret = getcwd(v->cwd, VPE_PATH_MAX);
-       if (ret < 0)
-               pr_warn("VPE loader: open, getcwd returned %d\n", ret);
-
        v->shared_ptr = NULL;
        v->__start = 0;
 
@@ -915,17 +893,6 @@ int vpe_notify(int index, struct vpe_notifications *notify)
 }
 EXPORT_SYMBOL(vpe_notify);
 
-char *vpe_getcwd(int index)
-{
-       struct vpe *v = get_vpe(index);
-
-       if (v == NULL)
-               return NULL;
-
-       return v->cwd;
-}
-EXPORT_SYMBOL(vpe_getcwd);
-
 module_init(vpe_module_init);
 module_exit(vpe_module_exit);
 MODULE_DESCRIPTION("MIPS VPE Loader");