Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76d4e00a authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

[S390] merge cpu.h into cputime.h 



All definition in cpu.h have to do with cputime accounting. Move
them to cputime.h and remove the header file.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 7aa79f94

arch/s390/include/asm/cpu.h

deleted100644 → 0
+0 −32
Original line number Original line Diff line number Diff line 
/*

 *  include/asm-s390/cpu.h

 *

 *    Copyright IBM Corp. 2007

 *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>

 */



#ifndef _ASM_S390_CPU_H_

#define _ASM_S390_CPU_H_



#include <linux/types.h>

#include <linux/percpu.h>

#include <linux/spinlock.h>



struct s390_idle_data {

	spinlock_t lock;

	unsigned long long idle_count;

	unsigned long long idle_enter;

	unsigned long long idle_time;

};



DECLARE_PER_CPU(struct s390_idle_data, s390_idle);



void vtime_start_cpu(void);



static inline void s390_idle_check(void)

{

	if ((&__get_cpu_var(s390_idle))->idle_enter != 0ULL)

		vtime_start_cpu();

}



#endif /* _ASM_S390_CPU_H_ */

arch/s390/include/asm/cputime.h

+19 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,9 @@ 
#ifndef _S390_CPUTIME_H

#ifndef _S390_CPUTIME_H

#define _S390_CPUTIME_H

#define _S390_CPUTIME_H





#include <linux/types.h>

#include <linux/percpu.h>

#include <linux/spinlock.h>

#include <asm/div64.h>

#include <asm/div64.h>





/* 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. */
@@ -174,8 +177,24 @@ cputime64_to_clock_t(cputime64_t cputime) 
       return __div(cputime, 4096000000ULL / USER_HZ);

       return __div(cputime, 4096000000ULL / USER_HZ);

}

}





struct s390_idle_data {

	spinlock_t lock;

	unsigned long long idle_count;

	unsigned long long idle_enter;

	unsigned long long idle_time;

};



DECLARE_PER_CPU(struct s390_idle_data, s390_idle);



void vtime_start_cpu(void);

cputime64_t s390_get_idle_time(int cpu);

cputime64_t s390_get_idle_time(int cpu);





#define arch_idle_time(cpu) s390_get_idle_time(cpu)

#define arch_idle_time(cpu) s390_get_idle_time(cpu)





static inline void s390_idle_check(void)

{

	if ((&__get_cpu_var(s390_idle))->idle_enter != 0ULL)

		vtime_start_cpu();

}



#endif /* _S390_CPUTIME_H */
 
#endif /* _S390_CPUTIME_H */

arch/s390/kernel/nmi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <asm/lowcore.h>

#include <asm/lowcore.h>

#include <asm/smp.h>

#include <asm/smp.h>

#include <asm/etr.h>

#include <asm/etr.h>

#include <asm/cpu.h>

#include <asm/cputime.h>

#include <asm/nmi.h>

#include <asm/nmi.h>

#include <asm/crw.h>

#include <asm/crw.h>

arch/s390/kernel/s390_ext.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/kernel_stat.h>

#include <linux/kernel_stat.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <asm/cpu.h>

#include <asm/cputime.h>

#include <asm/lowcore.h>

#include <asm/lowcore.h>

#include <asm/s390_ext.h>

#include <asm/s390_ext.h>

#include <asm/irq_regs.h>

#include <asm/irq_regs.h>

arch/s390/kernel/smp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ 
#include <asm/timer.h>

#include <asm/timer.h>

#include <asm/lowcore.h>

#include <asm/lowcore.h>

#include <asm/sclp.h>

#include <asm/sclp.h>

#include <asm/cpu.h>

#include <asm/cputime.h>

#include <asm/vdso.h>

#include <asm/vdso.h>

#include "entry.h"

#include "entry.h"