8192ab42bf
Untangle UML headers somewhat and add some includes where they were needed explicitly, but gotten accidentally via some other header. arch/um/include/um_uaccess.h loses asm/fixmap.h because it uses no fixmap stuff and gains elf.h, because it needs FIXADDR_USER_*, and archsetjmp.h, because it needs jmp_buf. pmd_alloc_one is uninlined because it needs mm_struct, and that's inconvenient to provide in asm-um/pgtable-3level.h. elf_core_copy_fpregs is also uninlined from elf-i386.h and elf-x86_64.h, which duplicated the code anyway, to arch/um/kernel/process.c, so that the reference to current_thread doesn't pull sched.h or anything related into asm/elf.h. arch/um/sys-i386/ldt.c, arch/um/kernel/tlb.c and arch/um/kernel/skas/uaccess.c got sched.h because they dereference task_structs. Its includes of linux and asm headers got turned from "" to <>. arch/um/sys-i386/bug.c gets asm/errno.h because it needs errno constants. asm/elf-i386 gets asm/user.h because it needs user_regs_struct. asm/fixmap.h gets page.h because it needs PAGE_SIZE and PAGE_MASK and system.h for BUG_ON. asm/pgtable doesn't need sched.h. asm/processor-generic.h defined mm_segment_t, but didn't use it. So, that definition is moved to uaccess.h, which defines a bunch of mm_segment_t-related stuff. thread_info.h uses mm_segment_t, and includes uaccess.h, which causes a recursion. So, the definition is placed above the include of thread_info. in uaccess.h. thread_info.h also gets page.h because it needs PAGE_SIZE. ObCheckpatchViolationJustification - I'm not adding a typedef; I'm moving mm_segment_t from one place to another. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
130 lines
2.7 KiB
C
130 lines
2.7 KiB
C
/*
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#ifndef __UM_PROCESSOR_GENERIC_H
|
|
#define __UM_PROCESSOR_GENERIC_H
|
|
|
|
struct pt_regs;
|
|
|
|
struct task_struct;
|
|
|
|
#include "asm/ptrace.h"
|
|
#include "asm/pgtable.h"
|
|
#include "registers.h"
|
|
#include "sysdep/archsetjmp.h"
|
|
|
|
struct mm_struct;
|
|
|
|
struct thread_struct {
|
|
struct task_struct *saved_task;
|
|
/*
|
|
* This flag is set to 1 before calling do_fork (and analyzed in
|
|
* copy_thread) to mark that we are begin called from userspace (fork /
|
|
* vfork / clone), and reset to 0 after. It is left to 0 when called
|
|
* from kernelspace (i.e. kernel_thread() or fork_idle(),
|
|
* as of 2.6.11).
|
|
*/
|
|
int forking;
|
|
int nsyscalls;
|
|
struct pt_regs regs;
|
|
int singlestep_syscall;
|
|
void *fault_addr;
|
|
jmp_buf *fault_catcher;
|
|
struct task_struct *prev_sched;
|
|
unsigned long temp_stack;
|
|
jmp_buf *exec_buf;
|
|
struct arch_thread arch;
|
|
jmp_buf switch_buf;
|
|
int mm_count;
|
|
struct {
|
|
int op;
|
|
union {
|
|
struct {
|
|
int pid;
|
|
} fork, exec;
|
|
struct {
|
|
int (*proc)(void *);
|
|
void *arg;
|
|
} thread;
|
|
struct {
|
|
void (*proc)(void *);
|
|
void *arg;
|
|
} cb;
|
|
} u;
|
|
} request;
|
|
};
|
|
|
|
#define INIT_THREAD \
|
|
{ \
|
|
.forking = 0, \
|
|
.nsyscalls = 0, \
|
|
.regs = EMPTY_REGS, \
|
|
.fault_addr = NULL, \
|
|
.prev_sched = NULL, \
|
|
.temp_stack = 0, \
|
|
.exec_buf = NULL, \
|
|
.arch = INIT_ARCH_THREAD, \
|
|
.request = { 0 } \
|
|
}
|
|
|
|
extern struct task_struct *alloc_task_struct(void);
|
|
|
|
static inline void release_thread(struct task_struct *task)
|
|
{
|
|
}
|
|
|
|
extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
|
|
|
|
static inline void prepare_to_copy(struct task_struct *tsk)
|
|
{
|
|
}
|
|
|
|
|
|
extern unsigned long thread_saved_pc(struct task_struct *t);
|
|
|
|
static inline void mm_copy_segments(struct mm_struct *from_mm,
|
|
struct mm_struct *new_mm)
|
|
{
|
|
}
|
|
|
|
#define init_stack (init_thread_union.stack)
|
|
|
|
/*
|
|
* User space process size: 3GB (default).
|
|
*/
|
|
extern unsigned long task_size;
|
|
|
|
#define TASK_SIZE (task_size)
|
|
|
|
/* This decides where the kernel will search for a free chunk of vm
|
|
* space during mmap's.
|
|
*/
|
|
#define TASK_UNMAPPED_BASE (0x40000000)
|
|
|
|
extern void start_thread(struct pt_regs *regs, unsigned long entry,
|
|
unsigned long stack);
|
|
|
|
struct cpuinfo_um {
|
|
unsigned long loops_per_jiffy;
|
|
int ipi_pipe[2];
|
|
};
|
|
|
|
extern struct cpuinfo_um boot_cpu_data;
|
|
|
|
#define my_cpu_data cpu_data[smp_processor_id()]
|
|
|
|
#ifdef CONFIG_SMP
|
|
extern struct cpuinfo_um cpu_data[];
|
|
#define current_cpu_data cpu_data[smp_processor_id()]
|
|
#else
|
|
#define cpu_data (&boot_cpu_data)
|
|
#define current_cpu_data boot_cpu_data
|
|
#endif
|
|
|
|
|
|
#define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf)
|
|
extern unsigned long get_wchan(struct task_struct *p);
|
|
|
|
#endif
|