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

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

uml: create as-layout.h 



This patch moves all the the symbols defined in um_arch.c, which are mostly
boundaries between different parts of the UML kernel address space, to a new
header, as-layout.h.  There are also a few things here which aren't really
related to address space layout, but which don't really have a better place to
go.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent eb830759

arch/um/include/as-layout.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

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

 * Licensed under the GPL

 */



#ifndef __START_H__

#define __START_H__



#include "sysdep/ptrace.h"



struct cpu_task {

	int pid;

	void *task;

};



extern struct cpu_task cpu_tasks[];



extern unsigned long low_physmem;

extern unsigned long high_physmem;

extern unsigned long uml_physmem;

extern unsigned long uml_reserved;

extern unsigned long end_vm;

extern unsigned long start_vm;

extern unsigned long long highmem;



extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;

extern unsigned long _unprotected_end;

extern unsigned long brk_start;



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

extern void set_cmdline(char *cmd);



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



#endif

arch/um/include/user_util.h

+0 −23
Original line number Diff line number Diff line
@@ -30,30 +30,7 @@ extern int grantpt(int __fd); 
extern int unlockpt(int __fd);

extern char *ptsname(int __fd);



struct cpu_task {

	int pid;

	void *task;

};



extern struct cpu_task cpu_tasks[];



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



extern unsigned long low_physmem;

extern unsigned long high_physmem;

extern unsigned long uml_physmem;

extern unsigned long uml_reserved;

extern unsigned long end_vm;

extern unsigned long start_vm;

extern unsigned long long highmem;



extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;

extern unsigned long _unprotected_end;

extern unsigned long brk_start;



extern void *add_signal_handler(int sig, void (*handler)(int));

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

extern void set_cmdline(char *cmd);

extern void input_cb(void (*proc)(void *), void *arg, int arg_len);

extern int get_pty(void);

extern int switcheroo(int fd, int prot, void *from, void *to, int size);

arch/um/kernel/exec.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "asm/uaccess.h"

#include "user_util.h"

#include "kern_util.h"

#include "as-layout.h"

#include "mem_user.h"

#include "kern.h"

#include "irq_user.h"

arch/um/kernel/ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "asm/page.h"

#include "asm/tlbflush.h"

#include "kern_util.h"

#include "as-layout.h"

#include "user_util.h"

#include "mem_user.h"

#include "os.h"

arch/um/kernel/mem.c

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

#include "user_util.h"

#include "kern_util.h"

#include "as-layout.h"

#include "kern.h"

#include "mem_user.h"

#include "uml_uaccess.h"