diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-11-08 14:15:59 +0300 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-11-11 18:37:43 +0300 |
| commit | 90c53e65806323382e8bff212cc993700a4a62d9 (patch) | |
| tree | 0b18ee9b2fbfb5151ffbd4eb333a96e97f7f8f49 /arch/s390/include | |
| parent | f8fc82b47149e3449d23e94d6ecf30af2ffcebff (diff) | |
| download | linux-90c53e65806323382e8bff212cc993700a4a62d9.tar.xz | |
s390: move cputime accounting fields from thread_info to thread_struct
The user_timer and system_timer fields are used for the per-thread
cputime accounting code. The access to these values is simpler if
they are moved to the thread_struct as the task_thread_info(tsk)
indirection is not needed anymore.
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/processor.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/thread_info.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index f96a3711b475..ecfa40874f79 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -110,6 +110,8 @@ typedef struct { struct thread_struct { unsigned int acrs[NUM_ACRS]; unsigned long ksp; /* kernel stack pointer */ + unsigned long user_timer; /* task cputime in user space */ + unsigned long system_timer; /* task cputime in kernel space */ mm_segment_t mm_segment; unsigned long gmap_addr; /* address of last gmap fault. */ unsigned int gmap_write_flag; /* gmap fault write indication */ diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h index 7b7a5a15b56c..b75d940fb344 100644 --- a/arch/s390/include/asm/thread_info.h +++ b/arch/s390/include/asm/thread_info.h @@ -32,8 +32,6 @@ struct thread_info { unsigned long flags; /* low level flags */ unsigned long sys_call_table; /* System call table address */ - __u64 user_timer; - __u64 system_timer; unsigned long last_break; /* last breaking-event-address. */ }; |