Commit 1d3468a6 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: move _kern.c files 



Move most *_kern.c files in arch/um/kernel to *.c.  This makes UML somewhat
more closely resemble the other arches.

[akpm@osdl.org: use the new INTF_* flags]
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 469226a4

arch/um/kernel/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -6,11 +6,10 @@ 
extra-y := vmlinux.lds

clean-files :=



obj-y = config.o exec_kern.o exitcode.o \

	init_task.o irq.o ksyms.o mem.o physmem.o \

	process_kern.o ptrace.o reboot.o resource.o sigio_kern.o \

	signal_kern.o smp.o syscall_kern.o sysrq.o \

	time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o

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

	physmem.o process_kern.o ptrace.o reboot.o resource.o sigio.o \

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

	um_arch.o umid.o



obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o

obj-$(CONFIG_GPROF)	+= gprof_syms.o

arch/um/kernel/exec_kern.c→arch/um/kernel/exec.c

+11 −2
Original line number Diff line number Diff line
@@ -31,18 +31,27 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp) 
	CHOOSE_MODE_PROC(start_thread_tt, start_thread_skas, regs, eip, esp);

}



#ifdef CONFIG_TTY_LOG

extern void log_exec(char **argv, void *tty);

#endif



static long execve1(char *file, char __user * __user *argv,

		    char __user *__user *env)

{

        long error;



#ifdef CONFIG_TTY_LOG

	log_exec(argv, current->tty);

	task_lock(current);

	log_exec(argv, current->signal->tty);

	task_unlock(current);

#endif

        error = do_execve(file, argv, env, &current->thread.regs);

        if (error == 0){

		task_lock(current);

                current->ptrace &= ~PT_DTRACE;

#ifdef SUBARCH_EXECVE1

		SUBARCH_EXECVE1(&current->thread.regs.regs);

#endif

		task_unlock(current);

                set_cmdline(current_cmd());

        }

arch/um/kernel/sigio_kern.c→arch/um/kernel/sigio.c

+1 −1

File changed and moved.

Contains only whitespace changes.

arch/um/kernel/signal_kern.c→arch/um/kernel/signal.c

+5 −5
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int kern_do_signal(struct pt_regs *regs) 
			PT_REGS_RESTART_SYSCALL(regs);

			break;

		case -ERESTART_RESTARTBLOCK:

			PT_REGS_SYSCALL_RET(regs) = __NR_restart_syscall;

			PT_REGS_ORIG_SYSCALL(regs) = __NR_restart_syscall;

			PT_REGS_RESTART_SYSCALL(regs);

			break;

 		}

arch/um/kernel/syscall_kern.c→arch/um/kernel/syscall.c

+16 −16
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ long sys_uname(struct old_utsname __user * name) 
	if (!name)

		return -EFAULT;

	down_read(&uts_sem);

	err=copy_to_user(name, &system_utsname, sizeof (*name));

	err = copy_to_user(name, utsname(), sizeof (*name));

	up_read(&uts_sem);

	return err?-EFAULT:0;

}
@@ -126,19 +126,19 @@ long sys_olduname(struct oldold_utsname __user * name) 


  	down_read(&uts_sem);



	error = __copy_to_user(&name->sysname,&system_utsname.sysname,

	error = __copy_to_user(&name->sysname, &utsname()->sysname,

			       __OLD_UTS_LEN);

	error |= __put_user(0, name->sysname + __OLD_UTS_LEN);

	error |= __copy_to_user(&name->nodename,&system_utsname.nodename,

	error |= __copy_to_user(&name->nodename, &utsname()->nodename,

				__OLD_UTS_LEN);

	error |= __put_user(0, name->nodename + __OLD_UTS_LEN);

	error |= __copy_to_user(&name->release,&system_utsname.release,

	error |= __copy_to_user(&name->release, &utsname()->release,

				__OLD_UTS_LEN);

	error |= __put_user(0, name->release + __OLD_UTS_LEN);

	error |= __copy_to_user(&name->version,&system_utsname.version,

	error |= __copy_to_user(&name->version, &utsname()->version,

				__OLD_UTS_LEN);

	error |= __put_user(0, name->version + __OLD_UTS_LEN);

	error |= __copy_to_user(&name->machine,&system_utsname.machine,

	error |= __copy_to_user(&name->machine, &utsname()->machine,

				__OLD_UTS_LEN);

	error |= __put_user(0, name->machine + __OLD_UTS_LEN);