diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 11:06:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 11:06:16 -0800 |
| commit | 77d143de75812596a58d126606f42d1214e09dde (patch) | |
| tree | 2f462fdf839e914fda343dfd3682b914b0a796f4 /arch | |
| parent | ccc039d65f24172eebab5e0160462d3417799af5 (diff) | |
| parent | 9e443bc369e04b8db3266d7253ce7c1eee2ec979 (diff) | |
| download | linux-77d143de75812596a58d126606f42d1214e09dde.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger:
"This time only various cleanups and housekeeping patches"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: hostfs: make functions static
um: Include generic barrier.h
um: Removed unused attributes from thread_struct
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/um/include/asm/processor-generic.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index 75de4abe4f94..88a330dcdede 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -5,3 +5,4 @@ generic-y += switch_to.h clkdev.h generic-y += trace_clock.h generic-y += preempt.h generic-y += hash.h +generic-y += barrier.h diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h index d89b02bb6262..cbc5edd5a901 100644 --- a/arch/um/include/asm/processor-generic.h +++ b/arch/um/include/asm/processor-generic.h @@ -25,10 +25,8 @@ struct thread_struct { void *fault_addr; jmp_buf *fault_catcher; struct task_struct *prev_sched; - unsigned long temp_stack; struct arch_thread arch; jmp_buf switch_buf; - int mm_count; struct { int op; union { @@ -52,7 +50,6 @@ struct thread_struct { .regs = EMPTY_REGS, \ .fault_addr = NULL, \ .prev_sched = NULL, \ - .temp_stack = 0, \ .arch = INIT_ARCH_THREAD, \ .request = { 0 } \ } |