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

Commit 0805d89c authored by Gennady Sharapov's avatar Gennady Sharapov Committed by Linus Torvalds
Browse files

[PATCH] uml: move libc-dependent code from signal_user.c 



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

This moves all systemcalls from signal_user.c file under 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 b2de464f

arch/um/include/kern_util.h

+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ extern void timer_handler(int sig, union uml_pt_regs *regs); 
extern int set_signals(int enable);

extern void force_sigbus(void);

extern int pid_to_processor_id(int pid);

extern void block_signals(void);

extern void unblock_signals(void);

extern void deliver_signals(void *t);

extern int next_syscall_index(int max);

extern int next_trap_index(int max);

arch/um/include/os.h

+10 −0
Original line number Diff line number Diff line
@@ -219,4 +219,14 @@ extern int umid_file_name(char *name, char *buf, int len); 
extern int set_umid(char *name);

extern char *get_umid(void);



/* signal.c */

extern void set_sigstack(void *sig_stack, int size);

extern void remove_sigstack(void);

extern void set_handler(int sig, void (*handler)(int), int flags, ...);

extern int change_sig(int signal, int on);

extern void block_signals(void);

extern void unblock_signals(void);

extern int get_signals(void);

extern int set_signals(int enable);



#endif

arch/um/include/signal_user.h

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

 * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#ifndef __SIGNAL_USER_H__

#define __SIGNAL_USER_H__



extern int signal_stack_size;



extern int change_sig(int signal, int on);

extern void set_sigstack(void *stack, int size);

extern void set_handler(int sig, void (*handler)(int), int flags, ...);

extern int set_signals(int enable);

extern int get_signals(void);



#endif



/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */

arch/um/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ clean-files := 
obj-y = config.o exec_kern.o exitcode.o \

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

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

	signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o time.o \

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

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

	user_util.o

arch/um/kernel/irq_user.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "kern_util.h"

#include "user.h"

#include "process.h"

#include "signal_user.h"

#include "sigio.h"

#include "irq_user.h"

#include "os.h"