Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger: "This pile contains a nice defconfig cleanup, a rewritten stack unwinder and various cleanups" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: Remove unused declarations from <as-layout.h> um: remove used STDIO_CONSOLE Kconfig param um/vdso: add .gitignore for a couple of targets arch/um: make it work with defconfig and x86_64 um: Make kstack_depth_to_print conform to arch/x86 um: Get rid of thread_struct->saved_task um: Make stack trace reliable against kernel mode faults um: Rewrite show_stack()
This commit is contained in:
@@ -19,8 +19,8 @@ struct task_struct;
|
||||
struct mm_struct;
|
||||
|
||||
struct thread_struct {
|
||||
struct task_struct *saved_task;
|
||||
struct pt_regs regs;
|
||||
struct pt_regs *segv_regs;
|
||||
int singlestep_syscall;
|
||||
void *fault_addr;
|
||||
jmp_buf *fault_catcher;
|
||||
|
@@ -44,7 +44,6 @@ struct cpu_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;
|
||||
@@ -52,8 +51,6 @@ 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 unsigned long host_task_size;
|
||||
|
@@ -227,6 +227,7 @@ extern void block_signals(void);
|
||||
extern void unblock_signals(void);
|
||||
extern int get_signals(void);
|
||||
extern int set_signals(int enable);
|
||||
extern int os_is_signal_stack(void);
|
||||
|
||||
/* util.c */
|
||||
extern void stack_protections(unsigned long address);
|
||||
|
Reference in New Issue
Block a user