Commit 5d40de0f authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: kill dead code around uaccess 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 6582b7f7

arch/um/include/shared/os.h

+0 −6
Original line number Diff line number Diff line
@@ -203,12 +203,6 @@ extern int os_drop_memory(void *addr, int length); 
extern int can_drop_memory(void);

extern void os_flush_stdout(void);



/* uaccess.c */

extern unsigned long __do_user_copy(void *to, const void *from, int n,

				    void **fault_addr, jmp_buf **fault_catcher,

				    void (*op)(void *to, const void *from,

					       int n), int *faulted_out);



/* execvp.c */

extern int execvp_noalloc(char *buf, const char *file, char *const argv[]);

/* helper.c */

arch/um/include/shared/um_uaccess.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ 
extern int copy_from_user(void *to, const void __user *from, int n);

extern int copy_to_user(void __user *to, const void *from, int n);



extern int __do_copy_to_user(void *to, const void *from, int n,

			     void **fault_addr, jmp_buf **fault_catcher);



/*

 * strncpy_from_user: - Copy a NUL terminated string from userspace.

 * @dst:   Destination address, in kernel space.  This buffer must be at

arch/um/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ clean-files := 


obj-y = config.o exec.o exitcode.o init_task.o irq.o ksyms.o mem.o \

	physmem.o process.o ptrace.o reboot.o sigio.o \

	signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o uaccess.o \

	signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o \

	um_arch.o umid.o skas/



obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o

arch/um/kernel/uaccess.c

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2001 Chris Emerson (cemerson@chiark.greenend.org.uk)

 * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 */



/*

 * These are here rather than tt/uaccess.c because skas mode needs them in

 * order to do SIGBUS recovery when a tmpfs mount runs out of room.

 */



#include <linux/string.h>

#include "os.h"



static void __do_copy(void *to, const void *from, int n)

{

	memcpy(to, from, n);

}





int __do_copy_to_user(void *to, const void *from, int n,

		      void **fault_addr, jmp_buf **fault_catcher)

{

	unsigned long fault;

	int faulted;



	fault = __do_user_copy(to, from, n, fault_addr, fault_catcher,

			       __do_copy, &faulted);

	if (!faulted)

		return 0;

	else

		return n - (fault - (unsigned long) to);

}

arch/um/os-Linux/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 
#



obj-y = aio.o execvp.o file.o helper.o irq.o main.o mem.o process.o \

	registers.o sigio.o signal.o start_up.o time.o tty.o uaccess.o \

	registers.o sigio.o signal.o start_up.o time.o tty.o \

	umid.o tls.o user_syms.o util.o drivers/ sys-$(SUBARCH)/ skas/



obj-$(CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA) += elf_aux.o



USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \

	main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \

	tty.o tls.o uaccess.o umid.o util.o

	tty.o tls.o umid.o util.o



CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)