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

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

uml: remove code made redundant by CHOOSE_MODE removal 



This patch makes a number of simplifications enabled by the removal of
CHOOSE_MODE.  There were lots of functions that looked like

	int foo(args){
		foo_skas(args);
	}

The bodies of foo_skas are now folded into foo, and their declarations (and
sometimes entire header files) are deleted.

In addition, the union uml_pt_regs, which was a union between the tt and skas
register formats, is now a struct, with the tt-mode arm of the union being
removed.

It turns out that usr2_handler was unused, so it is gone.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ae2587e4

arch/um/drivers/harddog_user.c

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

#include "user.h"

#include "mconsole.h"

#include "mconsole.h"

#include "os.h"

#include "os.h"

#include "mode.h"





struct dog_data {

struct dog_data {

	int stdin;

	int stdin;

arch/um/include/arch.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "sysdep/ptrace.h"

#include "sysdep/ptrace.h"





extern void arch_check_bugs(void);

extern void arch_check_bugs(void);

extern int arch_fixup(unsigned long address, union uml_pt_regs *regs);

extern int arch_fixup(unsigned long address, struct uml_pt_regs *regs);

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

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





#endif
 
#endif

arch/um/include/as-layout.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,6 +29,6 @@ extern unsigned long brk_start; 




extern int linux_main(int argc, char **argv);

extern int linux_main(int argc, char **argv);





extern void (*sig_info[])(int, union uml_pt_regs *);

extern void (*sig_info[])(int, struct uml_pt_regs *);





#endif
 
#endif

arch/um/include/irq_user.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ struct irq_fd { 




enum { IRQ_READ, IRQ_WRITE };

enum { IRQ_READ, IRQ_WRITE };





extern void sigio_handler(int sig, union uml_pt_regs *regs);

extern void sigio_handler(int sig, struct uml_pt_regs *regs);

extern int activate_fd(int irq, int fd, int type, void *dev_id);

extern int activate_fd(int irq, int fd, int type, void *dev_id);

extern void free_irq_by_irq_and_dev(unsigned int irq, void *dev_id);

extern void free_irq_by_irq_and_dev(unsigned int irq, void *dev_id);

extern void free_irq_by_fd(int fd);

extern void free_irq_by_fd(int fd);

arch/um/include/kern_util.h

+10 −12
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include "sysdep/faultinfo.h"

#include "sysdep/faultinfo.h"

#include "uml-config.h"

#include "uml-config.h"





typedef void (*kern_hndl)(int, union uml_pt_regs *);

typedef void (*kern_hndl)(int, struct uml_pt_regs *);





struct kern_handlers {

struct kern_handlers {

	kern_hndl relay_signal;

	kern_hndl relay_signal;
@@ -41,7 +41,7 @@ extern unsigned long alloc_stack(int order, int atomic); 
extern int do_signal(void);

extern int do_signal(void);

extern int is_stack_fault(unsigned long sp);

extern int is_stack_fault(unsigned long sp);

extern unsigned long segv(struct faultinfo fi, unsigned long ip,

extern unsigned long segv(struct faultinfo fi, unsigned long ip,

			  int is_user, union uml_pt_regs *regs);

			  int is_user, struct uml_pt_regs *regs);

extern int handle_page_fault(unsigned long address, unsigned long ip,

extern int handle_page_fault(unsigned long address, unsigned long ip,

			     int is_write, int is_user, int *code_out);

			     int is_write, int is_user, int *code_out);

extern void syscall_ready(void);

extern void syscall_ready(void);
@@ -54,7 +54,7 @@ extern int need_finish_fork(void); 
extern void free_stack(unsigned long stack, int order);

extern void free_stack(unsigned long stack, int order);

extern void add_input_request(int op, void (*proc)(int), void *arg);

extern void add_input_request(int op, void (*proc)(int), void *arg);

extern char *current_cmd(void);

extern char *current_cmd(void);

extern void timer_handler(int sig, union uml_pt_regs *regs);

extern void timer_handler(int sig, struct uml_pt_regs *regs);

extern int set_signals(int enable);

extern int set_signals(int enable);

extern int pid_to_processor_id(int pid);

extern int pid_to_processor_id(int pid);

extern void deliver_signals(void *t);

extern void deliver_signals(void *t);
@@ -64,9 +64,9 @@ extern void finish_fork(void); 
extern void paging_init(void);

extern void paging_init(void);

extern void init_flush_vm(void);

extern void init_flush_vm(void);

extern void *syscall_sp(void *t);

extern void *syscall_sp(void *t);

extern void syscall_trace(union uml_pt_regs *regs, int entryexit);

extern void syscall_trace(struct uml_pt_regs *regs, int entryexit);

extern int hz(void);

extern int hz(void);

extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs);

extern unsigned int do_IRQ(int irq, struct uml_pt_regs *regs);

extern void interrupt_end(void);

extern void interrupt_end(void);

extern void initial_thread_cb(void (*proc)(void *), void *arg);

extern void initial_thread_cb(void (*proc)(void *), void *arg);

extern int debugger_signal(int status, int pid);

extern int debugger_signal(int status, int pid);
@@ -76,9 +76,9 @@ extern int init_ptrace_proxy(int idle_pid, int startup, int stop); 
extern int init_parent_proxy(int pid);

extern int init_parent_proxy(int pid);

extern int singlestepping(void *t);

extern int singlestepping(void *t);

extern void check_stack_overflow(void *ptr);

extern void check_stack_overflow(void *ptr);

extern void relay_signal(int sig, union uml_pt_regs *regs);

extern void relay_signal(int sig, struct uml_pt_regs *regs);

extern int user_context(unsigned long sp);

extern int user_context(unsigned long sp);

extern void timer_irq(union uml_pt_regs *regs);

extern void timer_irq(struct uml_pt_regs *regs);

extern void do_uml_exitcalls(void);

extern void do_uml_exitcalls(void);

extern int attach_debugger(int idle_pid, int pid, int stop);

extern int attach_debugger(int idle_pid, int pid, int stop);

extern int config_gdb(char *str);

extern int config_gdb(char *str);
@@ -109,11 +109,9 @@ extern void time_init_kern(void); 




/* Are we disallowed to sleep? Used to choose between GFP_KERNEL and GFP_ATOMIC. */

/* Are we disallowed to sleep? Used to choose between GFP_KERNEL and GFP_ATOMIC. */

extern int __cant_sleep(void);

extern int __cant_sleep(void);

extern void sigio_handler(int sig, union uml_pt_regs *regs);

extern void sigio_handler(int sig, struct uml_pt_regs *regs);



extern void copy_sc(struct uml_pt_regs *regs, void *from);

extern void copy_sc(union uml_pt_regs *regs, void *from);



extern unsigned long to_irq_stack(unsigned long *mask_out);

extern unsigned long to_irq_stack(unsigned long *mask_out);

unsigned long from_irq_stack(int nested);

unsigned long from_irq_stack(int nested);



extern int start_uml(void);

#endif
 
#endif