leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/cputime: remove last traces of cputime_t

Browse Source 
The cputime_t type is a thing of the past, replace the last occurences
of the type in the s390 code with a simple u64.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Martin Schwidefsky 2017-03-01 09:16:03 +01:00
parent d9fcf2a1cb
commit e69ca822ce
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/s390/include/asm/cputime.h
View File

@ -8,32 +8,22 @@
#define _S390_CPUTIME_H #define _S390_CPUTIME_H
#include <linux/types.h> #include <linux/types.h>
#include <asm/div64.h>
#define CPUTIME_PER_USEC 4096ULL #define CPUTIME_PER_USEC 4096ULL
#define CPUTIME_PER_SEC (CPUTIME_PER_USEC * USEC_PER_SEC) #define CPUTIME_PER_SEC (CPUTIME_PER_USEC * USEC_PER_SEC)
/* We want to use full resolution of the CPU timer: 2**-12 micro-seconds. */ /* We want to use full resolution of the CPU timer: 2**-12 micro-seconds. */
typedef unsigned long long __nocast cputime_t;
typedef unsigned long long __nocast cputime64_t;
#define cmpxchg_cputime(ptr, old, new) cmpxchg64(ptr, old, new) #define cmpxchg_cputime(ptr, old, new) cmpxchg64(ptr, old, new)
static inline unsigned long __div(unsigned long long n, unsigned long base)
{
return n / base;
}
/* /*
* Convert cputime to microseconds and back. * Convert cputime to microseconds and back.
*/ */
static inline unsigned int cputime_to_usecs(const cputime_t cputime) static inline u64 cputime_to_usecs(const u64 cputime)
{ {
return (__force unsigned long long) cputime >> 12; return cputime >> 12;
} }
u64 arch_cpu_idle_time(int cpu); u64 arch_cpu_idle_time(int cpu);
#define arch_idle_time(cpu) arch_cpu_idle_time(cpu) #define arch_idle_time(cpu) arch_cpu_idle_time(cpu)

2
arch/s390/kernel/vtime.c
View File

@ -111,7 +111,7 @@ static inline u64 scale_vtime(u64 vtime)
} }
static void account_system_index_scaled(struct task_struct *p, static void account_system_index_scaled(struct task_struct *p,
cputime_t cputime, cputime_t scaled, u64 cputime, u64 scaled,
enum cpu_usage_stat index) enum cpu_usage_stat index)
{ {
p->stimescaled += cputime_to_nsecs(scaled); p->stimescaled += cputime_to_nsecs(scaled);