Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[PATCH] uml: move sigio_user.c to os-Linux/sigio.c 



The serial UML OS-abstraction layer patch (um/kernel dir).

This moves sigio_user.c to os-Linux dir

Signed-off-by: default avatarGennady Sharapov <Gennady.V.Sharapov@intel.com>
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 8e367065

arch/um/include/os.h

+5 −0
Original line number Diff line number Diff line
@@ -311,4 +311,9 @@ extern void os_set_pollfd(int i, int fd); 
extern void os_set_ioignore(void);

extern void init_irq_signals(int on_sigstack);



/* sigio.c */

extern void write_sigio_workaround(void);

extern int add_sigio_fd(int fd, int read);

extern int ignore_sigio_fd(int fd);



#endif

arch/um/include/sigio.h

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 


extern int write_sigio_irq(int fd);

extern int register_sigio_fd(int fd);

extern int add_sigio_fd(int fd, int read);

extern int ignore_sigio_fd(int fd);

extern void sigio_lock(void);

extern void sigio_unlock(void);

arch/um/include/user_util.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ extern int attach(int pid); 
extern void kill_child_dead(int pid);

extern int cont(int pid);

extern void check_sigio(void);

extern void write_sigio_workaround(void);

extern void arch_check_bugs(void);

extern int cpu_feature(char *what, char *buf, int len);

extern int arch_handle_signal(int sig, union uml_pt_regs *regs);

arch/um/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 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_user.o sigio_kern.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

arch/um/os-Linux/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -3,14 +3,15 @@ 
# Licensed under the GPL

#



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

	start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o user_syms.o \

	util.o drivers/ sys-$(SUBARCH)/

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

	signal.o start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o \

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



obj-$(CONFIG_MODE_SKAS) += skas/



USER_OBJS := aio.o elf_aux.o file.o helper.o irq.o main.o mem.o process.o \

	signal.o start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o util.o

	sigio.o signal.o start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o \

	util.o



elf_aux.o: $(ARCH_DIR)/kernel-offsets.h

CFLAGS_elf_aux.o += -I$(objtree)/arch/um