projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c0f6ba
)
clocksource: Use a plain u64 instead of cycle_t
author
Thomas Gleixner
<tglx@linutronix.de>
Wed, 21 Dec 2016 19:32:01 +0000
(20:32 +0100)
committer
Thomas Gleixner
<tglx@linutronix.de>
Sun, 25 Dec 2016 10:04:12 +0000
(11:04 +0100)
There is no point in having an extra type for extra confusion. u64 is
unambiguous.
Conversion was done with the following coccinelle script:
@rem@
@@
-typedef u64 cycle_t;
@fix@
typedef cycle_t;
@@
-cycle_t
+u64
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
132 files changed:
arch/alpha/kernel/time.c
patch
|
blob
|
blame
|
history
arch/arm/mach-davinci/time.c
patch
|
blob
|
blame
|
history
arch/arm/mach-ep93xx/timer-ep93xx.c
patch
|
blob
|
blame
|
history
arch/arm/mach-footbridge/dc21285-timer.c
patch
|
blob
|
blame
|
history
arch/arm/mach-ixp4xx/common.c
patch
|
blob
|
blame
|
history
arch/arm/mach-mmp/time.c
patch
|
blob
|
blame
|
history
arch/arm/mach-omap2/timer.c
patch
|
blob
|
blame
|
history
arch/arm/plat-iop/time.c
patch
|
blob
|
blame
|
history
arch/avr32/kernel/time.c
patch
|
blob
|
blame
|
history
arch/blackfin/kernel/time-ts.c
patch
|
blob
|
blame
|
history
arch/c6x/kernel/time.c
patch
|
blob
|
blame
|
history
arch/hexagon/kernel/time.c
patch
|
blob
|
blame
|
history
arch/ia64/kernel/cyclone.c
patch
|
blob
|
blame
|
history
arch/ia64/kernel/fsyscall_gtod_data.h
patch
|
blob
|
blame
|
history
arch/ia64/kernel/time.c
patch
|
blob
|
blame
|
history
arch/ia64/sn/kernel/sn2/timer.c
patch
|
blob
|
blame
|
history
arch/m68k/68000/timers.c
patch
|
blob
|
blame
|
history
arch/m68k/coldfire/dma_timer.c
patch
|
blob
|
blame
|
history
arch/m68k/coldfire/pit.c
patch
|
blob
|
blame
|
history
arch/m68k/coldfire/sltimers.c
patch
|
blob
|
blame
|
history
arch/m68k/coldfire/timers.c
patch
|
blob
|
blame
|
history
arch/microblaze/kernel/timer.c
patch
|
blob
|
blame
|
history
arch/mips/alchemy/common/time.c
patch
|
blob
|
blame
|
history
arch/mips/cavium-octeon/csrc-octeon.c
patch
|
blob
|
blame
|
history
arch/mips/jz4740/time.c
patch
|
blob
|
blame
|
history
arch/mips/kernel/cevt-txx9.c
patch
|
blob
|
blame
|
history
arch/mips/kernel/csrc-bcm1480.c
patch
|
blob
|
blame
|
history
arch/mips/kernel/csrc-ioasic.c
patch
|
blob
|
blame
|
history
arch/mips/kernel/csrc-r4k.c
patch
|
blob
|
blame
|
history
arch/mips/kernel/csrc-sb1250.c
patch
|
blob
|
blame
|
history
arch/mips/loongson32/common/time.c
patch
|
blob
|
blame
|
history
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
patch
|
blob
|
blame
|
history
arch/mips/loongson64/loongson-3/hpet.c
patch
|
blob
|
blame
|
history
arch/mips/mti-malta/malta-time.c
patch
|
blob
|
blame
|
history
arch/mips/netlogic/common/time.c
patch
|
blob
|
blame
|
history
arch/mips/sgi-ip27/ip27-timer.c
patch
|
blob
|
blame
|
history
arch/mn10300/kernel/csrc-mn10300.c
patch
|
blob
|
blame
|
history
arch/nios2/kernel/time.c
patch
|
blob
|
blame
|
history
arch/openrisc/kernel/time.c
patch
|
blob
|
blame
|
history
arch/parisc/kernel/time.c
patch
|
blob
|
blame
|
history
arch/powerpc/kernel/time.c
patch
|
blob
|
blame
|
history
arch/s390/kernel/time.c
patch
|
blob
|
blame
|
history
arch/sparc/kernel/time_32.c
patch
|
blob
|
blame
|
history
arch/sparc/kernel/time_64.c
patch
|
blob
|
blame
|
history
arch/um/kernel/time.c
patch
|
blob
|
blame
|
history
arch/unicore32/kernel/time.c
patch
|
blob
|
blame
|
history
arch/x86/entry/vdso/vclock_gettime.c
patch
|
blob
|
blame
|
history
arch/x86/include/asm/kvm_host.h
patch
|
blob
|
blame
|
history
arch/x86/include/asm/pvclock.h
patch
|
blob
|
blame
|
history
arch/x86/include/asm/tsc.h
patch
|
blob
|
blame
|
history
arch/x86/include/asm/vgtod.h
patch
|
blob
|
blame
|
history
arch/x86/kernel/apb_timer.c
patch
|
blob
|
blame
|
history
arch/x86/kernel/cpu/mshyperv.c
patch
|
blob
|
blame
|
history
arch/x86/kernel/hpet.c
patch
|
blob
|
blame
|
history
arch/x86/kernel/kvmclock.c
patch
|
blob
|
blame
|
history
arch/x86/kernel/pvclock.c
patch
|
blob
|
blame
|
history
arch/x86/kernel/tsc.c
patch
|
blob
|
blame
|
history
arch/x86/kvm/x86.c
patch
|
blob
|
blame
|
history
arch/x86/lguest/boot.c
patch
|
blob
|
blame
|
history
arch/x86/platform/uv/uv_time.c
patch
|
blob
|
blame
|
history
arch/x86/xen/time.c
patch
|
blob
|
blame
|
history
arch/x86/xen/xen-ops.h
patch
|
blob
|
blame
|
history
arch/xtensa/kernel/time.c
patch
|
blob
|
blame
|
history
drivers/char/hpet.c
patch
|
blob
|
blame
|
history
drivers/clocksource/acpi_pm.c
patch
|
blob
|
blame
|
history
drivers/clocksource/arc_timer.c
patch
|
blob
|
blame
|
history
drivers/clocksource/arm_arch_timer.c
patch
|
blob
|
blame
|
history
drivers/clocksource/arm_global_timer.c
patch
|
blob
|
blame
|
history
drivers/clocksource/cadence_ttc_timer.c
patch
|
blob
|
blame
|
history
drivers/clocksource/clksrc-dbx500-prcmu.c
patch
|
blob
|
blame
|
history
drivers/clocksource/dw_apb_timer.c
patch
|
blob
|
blame
|
history
drivers/clocksource/em_sti.c
patch
|
blob
|
blame
|
history
drivers/clocksource/exynos_mct.c
patch
|
blob
|
blame
|
history
drivers/clocksource/h8300_timer16.c
patch
|
blob
|
blame
|
history
drivers/clocksource/h8300_tpu.c
patch
|
blob
|
blame
|
history
drivers/clocksource/i8253.c
patch
|
blob
|
blame
|
history
drivers/clocksource/jcore-pit.c
patch
|
blob
|
blame
|
history
drivers/clocksource/metag_generic.c
patch
|
blob
|
blame
|
history
drivers/clocksource/mips-gic-timer.c
patch
|
blob
|
blame
|
history
drivers/clocksource/mmio.c
patch
|
blob
|
blame
|
history
drivers/clocksource/mxs_timer.c
patch
|
blob
|
blame
|
history
drivers/clocksource/qcom-timer.c
patch
|
blob
|
blame
|
history
drivers/clocksource/samsung_pwm_timer.c
patch
|
blob
|
blame
|
history
drivers/clocksource/scx200_hrt.c
patch
|
blob
|
blame
|
history
drivers/clocksource/sh_cmt.c
patch
|
blob
|
blame
|
history
drivers/clocksource/sh_tmu.c
patch
|
blob
|
blame
|
history
drivers/clocksource/tcb_clksrc.c
patch
|
blob
|
blame
|
history
drivers/clocksource/time-pistachio.c
patch
|
blob
|
blame
|
history
drivers/clocksource/timer-atlas7.c
patch
|
blob
|
blame
|
history
drivers/clocksource/timer-atmel-pit.c
patch
|
blob
|
blame
|
history
drivers/clocksource/timer-atmel-st.c
patch
|
blob
|
blame
|
history
drivers/clocksource/timer-nps.c
patch
|
blob
|
blame
|
history
drivers/clocksource/timer-prima2.c
patch
|
blob
|
blame
|
history
drivers/clocksource/timer-sun5i.c
patch
|
blob
|
blame
|
history
drivers/clocksource/timer-ti-32k.c
patch
|
blob
|
blame
|
history
drivers/clocksource/vt8500_timer.c
patch
|
blob
|
blame
|
history
drivers/hv/hv.c
patch
|
blob
|
blame
|
history
drivers/irqchip/irq-mips-gic.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/freescale/fec_ptp.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/intel/e1000e/netdev.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/intel/e1000e/ptp.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/intel/igb/igb_ptp.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/mellanox/mlx4/en_clock.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/mellanox/mlx4/main.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/mellanox/mlx5/core/en_clock.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/mellanox/mlx5/core/main.c
patch
|
blob
|
blame
|
history
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
patch
|
blob
|
blame
|
history
drivers/net/ethernet/ti/cpts.c
patch
|
blob
|
blame
|
history
include/kvm/arm_arch_timer.h
patch
|
blob
|
blame
|
history
include/linux/clocksource.h
patch
|
blob
|
blame
|
history
include/linux/dw_apb_timer.h
patch
|
blob
|
blame
|
history
include/linux/irqchip/mips-gic.h
patch
|
blob
|
blame
|
history
include/linux/mlx4/device.h
patch
|
blob
|
blame
|
history
include/linux/timecounter.h
patch
|
blob
|
blame
|
history
include/linux/timekeeper_internal.h
patch
|
blob
|
blame
|
history
include/linux/timekeeping.h
patch
|
blob
|
blame
|
history
include/linux/types.h
patch
|
blob
|
blame
|
history
kernel/time/clocksource.c
patch
|
blob
|
blame
|
history
kernel/time/jiffies.c
patch
|
blob
|
blame
|
history
kernel/time/timecounter.c
patch
|
blob
|
blame
|
history
kernel/time/timekeeping.c
patch
|
blob
|
blame
|
history
kernel/time/timekeeping_internal.h
patch
|
blob
|
blame
|
history
kernel/trace/ftrace.c
patch
|
blob
|
blame
|
history
kernel/trace/trace.c
patch
|
blob
|
blame
|
history
kernel/trace/trace.h
patch
|
blob
|
blame
|
history
kernel/trace/trace_irqsoff.c
patch
|
blob
|
blame
|
history
kernel/trace/trace_sched_wakeup.c
patch
|
blob
|
blame
|
history
sound/hda/hdac_stream.c
patch
|
blob
|
blame
|
history
virt/kvm/arm/arch_timer.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/alpha/kernel/time.c
b/arch/alpha/kernel/time.c
index 992000e3d9e4dcec51e5b82bfc64256a563f0ff0..3bfe058d75d996796ff8992962a1fcb2632b6311 100644
(file)
--- a/
arch/alpha/kernel/time.c
+++ b/
arch/alpha/kernel/time.c
@@
-133,7
+133,7
@@
init_rtc_clockevent(void)
* The QEMU clock as a clocksource primitive.
*/
* The QEMU clock as a clocksource primitive.
*/
-static
cycle_t
+static
u64
qemu_cs_read(struct clocksource *cs)
{
return qemu_get_vmtime();
qemu_cs_read(struct clocksource *cs)
{
return qemu_get_vmtime();
@@
-260,7
+260,7
@@
common_init_rtc(void)
* use this method when WTINT is in use.
*/
* use this method when WTINT is in use.
*/
-static
cycle_t
read_rpcc(struct clocksource *cs)
+static
u64
read_rpcc(struct clocksource *cs)
{
return rpcc();
}
{
return rpcc();
}
diff --git
a/arch/arm/mach-davinci/time.c
b/arch/arm/mach-davinci/time.c
index 6c18445a4639b169dc2dd24ad0b6d0475870486f..034f865fe78e8f19b42ae941965cd98ddc971270 100644
(file)
--- a/
arch/arm/mach-davinci/time.c
+++ b/
arch/arm/mach-davinci/time.c
@@
-268,7
+268,7
@@
static void __init timer_init(void)
/*
* clocksource
*/
/*
* clocksource
*/
-static
cycle_t
read_cycles(struct clocksource *cs)
+static
u64
read_cycles(struct clocksource *cs)
{
struct timer_s *t = &timers[TID_CLOCKSOURCE];
{
struct timer_s *t = &timers[TID_CLOCKSOURCE];
diff --git
a/arch/arm/mach-ep93xx/timer-ep93xx.c
b/arch/arm/mach-ep93xx/timer-ep93xx.c
index e5f791145bd00dc4cb9424101564ef60c0c2f6bb..874cbc91b66944e09e64f66d0bb833e684586cba 100644
(file)
--- a/
arch/arm/mach-ep93xx/timer-ep93xx.c
+++ b/
arch/arm/mach-ep93xx/timer-ep93xx.c
@@
-59,13
+59,13
@@
static u64 notrace ep93xx_read_sched_clock(void)
return ret;
}
return ret;
}
-
cycle_t
ep93xx_clocksource_read(struct clocksource *c)
+
u64
ep93xx_clocksource_read(struct clocksource *c)
{
u64 ret;
ret = readl(EP93XX_TIMER4_VALUE_LOW);
ret |= ((u64) (readl(EP93XX_TIMER4_VALUE_HIGH) & 0xff) << 32);
{
u64 ret;
ret = readl(EP93XX_TIMER4_VALUE_LOW);
ret |= ((u64) (readl(EP93XX_TIMER4_VALUE_HIGH) & 0xff) << 32);
- return (
cycle_t
) ret;
+ return (
u64
) ret;
}
static int ep93xx_clkevt_set_next_event(unsigned long next,
}
static int ep93xx_clkevt_set_next_event(unsigned long next,
diff --git
a/arch/arm/mach-footbridge/dc21285-timer.c
b/arch/arm/mach-footbridge/dc21285-timer.c
index 810edc78c8172a7fc24f7121418cae34d67f73a5..75395a720e6338b49636bef9157ea330f133025c 100644
(file)
--- a/
arch/arm/mach-footbridge/dc21285-timer.c
+++ b/
arch/arm/mach-footbridge/dc21285-timer.c
@@
-19,7
+19,7
@@
#include "common.h"
#include "common.h"
-static
cycle_t
cksrc_dc21285_read(struct clocksource *cs)
+static
u64
cksrc_dc21285_read(struct clocksource *cs)
{
return cs->mask - *CSR_TIMER2_VALUE;
}
{
return cs->mask - *CSR_TIMER2_VALUE;
}
diff --git
a/arch/arm/mach-ixp4xx/common.c
b/arch/arm/mach-ixp4xx/common.c
index 0f08f611c1a69e4ff3ed73c0a238562f156f6376..846e033c56fa74a6a6873534255653b8593b3382 100644
(file)
--- a/
arch/arm/mach-ixp4xx/common.c
+++ b/
arch/arm/mach-ixp4xx/common.c
@@
-493,7
+493,7
@@
static u64 notrace ixp4xx_read_sched_clock(void)
* clocksource
*/
* clocksource
*/
-static
cycle_t
ixp4xx_clocksource_read(struct clocksource *c)
+static
u64
ixp4xx_clocksource_read(struct clocksource *c)
{
return *IXP4XX_OSTS;
}
{
return *IXP4XX_OSTS;
}
diff --git
a/arch/arm/mach-mmp/time.c
b/arch/arm/mach-mmp/time.c
index 3c2c92aaa0aecc8eea9147478bcda5fcc513ea4e..96ad1db0b04bef7c59a191ffec822a5e84ae7686 100644
(file)
--- a/
arch/arm/mach-mmp/time.c
+++ b/
arch/arm/mach-mmp/time.c
@@
-144,7
+144,7
@@
static struct clock_event_device ckevt = {
.set_state_oneshot = timer_set_shutdown,
};
.set_state_oneshot = timer_set_shutdown,
};
-static
cycle_t
clksrc_read(struct clocksource *cs)
+static
u64
clksrc_read(struct clocksource *cs)
{
return timer_read();
}
{
return timer_read();
}
diff --git
a/arch/arm/mach-omap2/timer.c
b/arch/arm/mach-omap2/timer.c
index 5e2e2218a4023a28b25657f2174735d908fd2a68..56128da23c3a1531994e37522a05e625764cc6ee 100644
(file)
--- a/
arch/arm/mach-omap2/timer.c
+++ b/
arch/arm/mach-omap2/timer.c
@@
-369,9
+369,9
@@
static bool use_gptimer_clksrc __initdata;
/*
* clocksource
*/
/*
* clocksource
*/
-static
cycle_t
clocksource_read_cycles(struct clocksource *cs)
+static
u64
clocksource_read_cycles(struct clocksource *cs)
{
{
- return (
cycle_t
)__omap_dm_timer_read_counter(&clksrc,
+ return (
u64
)__omap_dm_timer_read_counter(&clksrc,
OMAP_TIMER_NONPOSTED);
}
OMAP_TIMER_NONPOSTED);
}
diff --git
a/arch/arm/plat-iop/time.c
b/arch/arm/plat-iop/time.c
index ed8d129d4beab1e174371a8d37e9171b1f853ea4..2cff0010f677fe9a54fd12c4a3954fa61d0a2990 100644
(file)
--- a/
arch/arm/plat-iop/time.c
+++ b/
arch/arm/plat-iop/time.c
@@
-38,7
+38,7
@@
/*
* IOP clocksource (free-running timer 1).
*/
/*
* IOP clocksource (free-running timer 1).
*/
-static
cycle_t
notrace iop_clocksource_read(struct clocksource *unused)
+static
u64
notrace iop_clocksource_read(struct clocksource *unused)
{
return 0xffffffffu - read_tcr1();
}
{
return 0xffffffffu - read_tcr1();
}
diff --git
a/arch/avr32/kernel/time.c
b/arch/avr32/kernel/time.c
index a124c55733dbf7dc19e61aacbf74671ff149de83..4d9b69615979cfc33de7efe8b724fbe60a49cc54 100644
(file)
--- a/
arch/avr32/kernel/time.c
+++ b/
arch/avr32/kernel/time.c
@@
-20,9
+20,9
@@
static bool disable_cpu_idle_poll;
static bool disable_cpu_idle_poll;
-static
cycle_t
read_cycle_count(struct clocksource *cs)
+static
u64
read_cycle_count(struct clocksource *cs)
{
{
- return (
cycle_t
)sysreg_read(COUNT);
+ return (
u64
)sysreg_read(COUNT);
}
/*
}
/*
diff --git
a/arch/blackfin/kernel/time-ts.c
b/arch/blackfin/kernel/time-ts.c
index fb9e95f1b719efaabcbc627eede3662f5db21d95..0e9fcf841d67c24fb77230e1a0d97d7a1c1b0272 100644
(file)
--- a/
arch/blackfin/kernel/time-ts.c
+++ b/
arch/blackfin/kernel/time-ts.c
@@
-26,7
+26,7
@@
#if defined(CONFIG_CYCLES_CLOCKSOURCE)
#if defined(CONFIG_CYCLES_CLOCKSOURCE)
-static notrace
cycle_t
bfin_read_cycles(struct clocksource *cs)
+static notrace
u64
bfin_read_cycles(struct clocksource *cs)
{
#ifdef CONFIG_CPU_FREQ
return __bfin_cycles_off + (get_cycles() << __bfin_cycles_mod);
{
#ifdef CONFIG_CPU_FREQ
return __bfin_cycles_off + (get_cycles() << __bfin_cycles_mod);
@@
-80,7
+80,7
@@
void __init setup_gptimer0(void)
enable_gptimers(TIMER0bit);
}
enable_gptimers(TIMER0bit);
}
-static
cycle_t
bfin_read_gptimer0(struct clocksource *cs)
+static
u64
bfin_read_gptimer0(struct clocksource *cs)
{
return bfin_read_TIMER0_COUNTER();
}
{
return bfin_read_TIMER0_COUNTER();
}
diff --git
a/arch/c6x/kernel/time.c
b/arch/c6x/kernel/time.c
index 04845aaf59858f81feebeeca6c45096b48c313d8..6a8e00a1f6d56b74f294586de606b707b642db00 100644
(file)
--- a/
arch/c6x/kernel/time.c
+++ b/
arch/c6x/kernel/time.c
@@
-26,7
+26,7
@@
static u32 sched_clock_multiplier;
#define SCHED_CLOCK_SHIFT 16
static u32 sched_clock_multiplier;
#define SCHED_CLOCK_SHIFT 16
-static
cycle_t
tsc_read(struct clocksource *cs)
+static
u64
tsc_read(struct clocksource *cs)
{
return get_cycles();
}
{
return get_cycles();
}
diff --git
a/arch/hexagon/kernel/time.c
b/arch/hexagon/kernel/time.c
index a6a1d1f8309a40918e0e884715a09380d45c6d18..ff4e9bf995e91cec460232ebdb9a878f073957c9 100644
(file)
--- a/
arch/hexagon/kernel/time.c
+++ b/
arch/hexagon/kernel/time.c
@@
-72,9
+72,9
@@
struct adsp_hw_timer_struct {
/* Look for "TCX0" for related constants. */
static __iomem struct adsp_hw_timer_struct *rtos_timer;
/* Look for "TCX0" for related constants. */
static __iomem struct adsp_hw_timer_struct *rtos_timer;
-static
cycle_t
timer_get_cycles(struct clocksource *cs)
+static
u64
timer_get_cycles(struct clocksource *cs)
{
{
- return (
cycle_t
) __vmgettime();
+ return (
u64
) __vmgettime();
}
static struct clocksource hexagon_clocksource = {
}
static struct clocksource hexagon_clocksource = {
diff --git
a/arch/ia64/kernel/cyclone.c
b/arch/ia64/kernel/cyclone.c
index 5fa3848ba22497c34d68e4f0e3f4069f79c73d09..ee1a4afbf9da0167ffa80e9bd8a775c4cffd71c8 100644
(file)
--- a/
arch/ia64/kernel/cyclone.c
+++ b/
arch/ia64/kernel/cyclone.c
@@
-21,9
+21,9
@@
void __init cyclone_setup(void)
static void __iomem *cyclone_mc;
static void __iomem *cyclone_mc;
-static
cycle_t
read_cyclone(struct clocksource *cs)
+static
u64
read_cyclone(struct clocksource *cs)
{
{
- return (
cycle_t
)readq((void __iomem *)cyclone_mc);
+ return (
u64
)readq((void __iomem *)cyclone_mc);
}
static struct clocksource clocksource_cyclone = {
}
static struct clocksource clocksource_cyclone = {
diff --git
a/arch/ia64/kernel/fsyscall_gtod_data.h
b/arch/ia64/kernel/fsyscall_gtod_data.h
index 146b15b5fec30f34d4c78df1a390870b34781aaa..dcc5149177315a4a4aabcb78a70298cbc9eb1f72 100644
(file)
--- a/
arch/ia64/kernel/fsyscall_gtod_data.h
+++ b/
arch/ia64/kernel/fsyscall_gtod_data.h
@@
-9,15
+9,15
@@
struct fsyscall_gtod_data_t {
seqcount_t seq;
struct timespec wall_time;
struct timespec monotonic_time;
seqcount_t seq;
struct timespec wall_time;
struct timespec monotonic_time;
-
cycle_t
clk_mask;
+
u64
clk_mask;
u32 clk_mult;
u32 clk_shift;
void *clk_fsys_mmio;
u32 clk_mult;
u32 clk_shift;
void *clk_fsys_mmio;
-
cycle_t
clk_cycle_last;
+
u64
clk_cycle_last;
} ____cacheline_aligned;
struct itc_jitter_data_t {
int itc_jitter;
} ____cacheline_aligned;
struct itc_jitter_data_t {
int itc_jitter;
-
cycle_t
itc_lastcycle;
+
u64
itc_lastcycle;
} ____cacheline_aligned;
} ____cacheline_aligned;
diff --git
a/arch/ia64/kernel/time.c
b/arch/ia64/kernel/time.c
index 021f44ab4bfb84493bde9dec03183463bd899b7e..71775b95d6cc06cd9d8d8e9cadbf3fdb5333f967 100644
(file)
--- a/
arch/ia64/kernel/time.c
+++ b/
arch/ia64/kernel/time.c
@@
-31,7
+31,7
@@
#include "fsyscall_gtod_data.h"
#include "fsyscall_gtod_data.h"
-static
cycle_t
itc_get_cycles(struct clocksource *cs);
+static
u64
itc_get_cycles(struct clocksource *cs);
struct fsyscall_gtod_data_t fsyscall_gtod_data;
struct fsyscall_gtod_data_t fsyscall_gtod_data;
@@
-323,7
+323,7
@@
void ia64_init_itm(void)
}
}
}
}
-static
cycle_t
itc_get_cycles(struct clocksource *cs)
+static
u64
itc_get_cycles(struct clocksource *cs)
{
unsigned long lcycle, now, ret;
{
unsigned long lcycle, now, ret;
@@
-397,7
+397,7
@@
void update_vsyscall_tz(void)
}
void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
}
void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
- struct clocksource *c, u32 mult,
cycle_t
cycle_last)
+ struct clocksource *c, u32 mult,
u64
cycle_last)
{
write_seqcount_begin(&fsyscall_gtod_data.seq);
{
write_seqcount_begin(&fsyscall_gtod_data.seq);
diff --git
a/arch/ia64/sn/kernel/sn2/timer.c
b/arch/ia64/sn/kernel/sn2/timer.c
index abab8f99e9139a7822b22f166ffe3c6e03700863..66edc36426edecfd69649c542572fae469e526fe 100644
(file)
--- a/
arch/ia64/sn/kernel/sn2/timer.c
+++ b/
arch/ia64/sn/kernel/sn2/timer.c
@@
-22,9
+22,9
@@
extern unsigned long sn_rtc_cycles_per_second;
extern unsigned long sn_rtc_cycles_per_second;
-static
cycle_t
read_sn2(struct clocksource *cs)
+static
u64
read_sn2(struct clocksource *cs)
{
{
- return (
cycle_t
)readq(RTC_COUNTER_ADDR);
+ return (
u64
)readq(RTC_COUNTER_ADDR);
}
static struct clocksource clocksource_sn2 = {
}
static struct clocksource clocksource_sn2 = {
diff --git
a/arch/m68k/68000/timers.c
b/arch/m68k/68000/timers.c
index 99a98698bc959035fb89c2d004a02800abcf81a4..252455bce1446b5c3734b054b27afaa85733c9ef 100644
(file)
--- a/
arch/m68k/68000/timers.c
+++ b/
arch/m68k/68000/timers.c
@@
-76,7
+76,7
@@
static struct irqaction m68328_timer_irq = {
/***************************************************************************/
/***************************************************************************/
-static
cycle_t
m68328_read_clk(struct clocksource *cs)
+static
u64
m68328_read_clk(struct clocksource *cs)
{
unsigned long flags;
u32 cycles;
{
unsigned long flags;
u32 cycles;
diff --git
a/arch/m68k/coldfire/dma_timer.c
b/arch/m68k/coldfire/dma_timer.c
index 235ad57c470798c9538fab0fab7fef4936bd7a3c..8273eea5787455d34e93f281b9c368d490bde9e3 100644
(file)
--- a/
arch/m68k/coldfire/dma_timer.c
+++ b/
arch/m68k/coldfire/dma_timer.c
@@
-34,7
+34,7
@@
#define DMA_DTMR_CLK_DIV_16 (2 << 1)
#define DMA_DTMR_ENABLE (1 << 0)
#define DMA_DTMR_CLK_DIV_16 (2 << 1)
#define DMA_DTMR_ENABLE (1 << 0)
-static
cycle_t
cf_dt_get_cycles(struct clocksource *cs)
+static
u64
cf_dt_get_cycles(struct clocksource *cs)
{
return __raw_readl(DTCN0);
}
{
return __raw_readl(DTCN0);
}
diff --git
a/arch/m68k/coldfire/pit.c
b/arch/m68k/coldfire/pit.c
index d86a9ffb3f13eadde3ee66380945b8932622dc93..175553d5b8ed8ff3d65a1501a662f75498853c51 100644
(file)
--- a/
arch/m68k/coldfire/pit.c
+++ b/
arch/m68k/coldfire/pit.c
@@
-118,7
+118,7
@@
static struct irqaction pit_irq = {
/***************************************************************************/
/***************************************************************************/
-static
cycle_t
pit_read_clk(struct clocksource *cs)
+static
u64
pit_read_clk(struct clocksource *cs)
{
unsigned long flags;
u32 cycles;
{
unsigned long flags;
u32 cycles;
diff --git
a/arch/m68k/coldfire/sltimers.c
b/arch/m68k/coldfire/sltimers.c
index 831a08cf6f40d7e6e6c28594035a75e0c6a8b1c7..3292c0d68b18b69ddbdce8a37d24dfa06d6d8c27 100644
(file)
--- a/
arch/m68k/coldfire/sltimers.c
+++ b/
arch/m68k/coldfire/sltimers.c
@@
-97,7
+97,7
@@
static struct irqaction mcfslt_timer_irq = {
.handler = mcfslt_tick,
};
.handler = mcfslt_tick,
};
-static
cycle_t
mcfslt_read_clk(struct clocksource *cs)
+static
u64
mcfslt_read_clk(struct clocksource *cs)
{
unsigned long flags;
u32 cycles, scnt;
{
unsigned long flags;
u32 cycles, scnt;
diff --git
a/arch/m68k/coldfire/timers.c
b/arch/m68k/coldfire/timers.c
index cd496a20fcc7ced7b802e705badcae2417eb2256..2dc7a58204f654b69af1b6323927dd5cf2934071 100644
(file)
--- a/
arch/m68k/coldfire/timers.c
+++ b/
arch/m68k/coldfire/timers.c
@@
-89,7
+89,7
@@
static struct irqaction mcftmr_timer_irq = {
/***************************************************************************/
/***************************************************************************/
-static
cycle_t
mcftmr_read_clk(struct clocksource *cs)
+static
u64
mcftmr_read_clk(struct clocksource *cs)
{
unsigned long flags;
u32 cycles;
{
unsigned long flags;
u32 cycles;
diff --git
a/arch/microblaze/kernel/timer.c
b/arch/microblaze/kernel/timer.c
index 9e954959f60504cd7cf04d1c8c58f897bf6cea76..1d6fad50fa76f60f89fc15f244f767d5846c3471 100644
(file)
--- a/
arch/microblaze/kernel/timer.c
+++ b/
arch/microblaze/kernel/timer.c
@@
-190,17
+190,17
@@
static u64 xilinx_clock_read(void)
return read_fn(timer_baseaddr + TCR1);
}
return read_fn(timer_baseaddr + TCR1);
}
-static
cycle_t
xilinx_read(struct clocksource *cs)
+static
u64
xilinx_read(struct clocksource *cs)
{
/* reading actual value of timer 1 */
{
/* reading actual value of timer 1 */
- return (
cycle_t
)xilinx_clock_read();
+ return (
u64
)xilinx_clock_read();
}
static struct timecounter xilinx_tc = {
.cc = NULL,
};
}
static struct timecounter xilinx_tc = {
.cc = NULL,
};
-static
cycle_t
xilinx_cc_read(const struct cyclecounter *cc)
+static
u64
xilinx_cc_read(const struct cyclecounter *cc)
{
return xilinx_read(NULL);
}
{
return xilinx_read(NULL);
}
diff --git
a/arch/mips/alchemy/common/time.c
b/arch/mips/alchemy/common/time.c
index f99d3ec17a459237a05dd76253ed7ef26d5bbca9..e1bec5a77c3941ee17cdcc114b8981a6c3c188cf 100644
(file)
--- a/
arch/mips/alchemy/common/time.c
+++ b/
arch/mips/alchemy/common/time.c
@@
-44,7
+44,7
@@
/* 32kHz clock enabled and detected */
#define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S)
/* 32kHz clock enabled and detected */
#define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S)
-static
cycle_t
au1x_counter1_read(struct clocksource *cs)
+static
u64
au1x_counter1_read(struct clocksource *cs)
{
return alchemy_rdsys(AU1000_SYS_RTCREAD);
}
{
return alchemy_rdsys(AU1000_SYS_RTCREAD);
}
diff --git
a/arch/mips/cavium-octeon/csrc-octeon.c
b/arch/mips/cavium-octeon/csrc-octeon.c
index 23c2344a35525fa9a0badfb3bbca9a89d60293c5..39f153fe0022a349791fcc2c605b83b5a8fc027b 100644
(file)
--- a/
arch/mips/cavium-octeon/csrc-octeon.c
+++ b/
arch/mips/cavium-octeon/csrc-octeon.c
@@
-98,7
+98,7
@@
void octeon_init_cvmcount(void)
local_irq_restore(flags);
}
local_irq_restore(flags);
}
-static
cycle_t
octeon_cvmcount_read(struct clocksource *cs)
+static
u64
octeon_cvmcount_read(struct clocksource *cs)
{
return read_c0_cvmcount();
}
{
return read_c0_cvmcount();
}
diff --git
a/arch/mips/jz4740/time.c
b/arch/mips/jz4740/time.c
index 1f7ca2c9f26259c52382e091dbef166a41e046f6..bcf8f8c6273774f63e56efcbb6e423cb7b6bf5b2 100644
(file)
--- a/
arch/mips/jz4740/time.c
+++ b/
arch/mips/jz4740/time.c
@@
-34,7
+34,7
@@
static uint16_t jz4740_jiffies_per_tick;
static uint16_t jz4740_jiffies_per_tick;
-static
cycle_t
jz4740_clocksource_read(struct clocksource *cs)
+static
u64
jz4740_clocksource_read(struct clocksource *cs)
{
return jz4740_timer_get_count(TIMER_CLOCKSOURCE);
}
{
return jz4740_timer_get_count(TIMER_CLOCKSOURCE);
}
diff --git
a/arch/mips/kernel/cevt-txx9.c
b/arch/mips/kernel/cevt-txx9.c
index 537eefdf838fec40cc0a947008c01ea0084ca0b3..aaca60d6ffc31f4320e740ac27b6b986065772b5 100644
(file)
--- a/
arch/mips/kernel/cevt-txx9.c
+++ b/
arch/mips/kernel/cevt-txx9.c
@@
-27,7
+27,7
@@
struct txx9_clocksource {
struct txx9_tmr_reg __iomem *tmrptr;
};
struct txx9_tmr_reg __iomem *tmrptr;
};
-static
cycle_t
txx9_cs_read(struct clocksource *cs)
+static
u64
txx9_cs_read(struct clocksource *cs)
{
struct txx9_clocksource *txx9_cs =
container_of(cs, struct txx9_clocksource, cs);
{
struct txx9_clocksource *txx9_cs =
container_of(cs, struct txx9_clocksource, cs);
diff --git
a/arch/mips/kernel/csrc-bcm1480.c
b/arch/mips/kernel/csrc-bcm1480.c
index 7f65b53d1b242eda3a67c889c731956ddcdf5e1a..f011261e95061860c4590036f96670336eb3ea91 100644
(file)
--- a/
arch/mips/kernel/csrc-bcm1480.c
+++ b/
arch/mips/kernel/csrc-bcm1480.c
@@
-25,9
+25,9
@@
#include <asm/sibyte/sb1250.h>
#include <asm/sibyte/sb1250.h>
-static
cycle_t
bcm1480_hpt_read(struct clocksource *cs)
+static
u64
bcm1480_hpt_read(struct clocksource *cs)
{
{
- return (
cycle_t
) __raw_readq(IOADDR(A_SCD_ZBBUS_CYCLE_COUNT));
+ return (
u64
) __raw_readq(IOADDR(A_SCD_ZBBUS_CYCLE_COUNT));
}
struct clocksource bcm1480_clocksource = {
}
struct clocksource bcm1480_clocksource = {
diff --git
a/arch/mips/kernel/csrc-ioasic.c
b/arch/mips/kernel/csrc-ioasic.c
index 722f5589cd1dcdb1ec8440ca5fa93af219deb7ce..f6acd1e58c26103b5ad13c0e6368523b7c375265 100644
(file)
--- a/
arch/mips/kernel/csrc-ioasic.c
+++ b/
arch/mips/kernel/csrc-ioasic.c
@@
-22,7
+22,7
@@
#include <asm/dec/ioasic.h>
#include <asm/dec/ioasic_addrs.h>
#include <asm/dec/ioasic.h>
#include <asm/dec/ioasic_addrs.h>
-static
cycle_t
dec_ioasic_hpt_read(struct clocksource *cs)
+static
u64
dec_ioasic_hpt_read(struct clocksource *cs)
{
return ioasic_read(IO_REG_FCTR);
}
{
return ioasic_read(IO_REG_FCTR);
}
diff --git
a/arch/mips/kernel/csrc-r4k.c
b/arch/mips/kernel/csrc-r4k.c
index d76275da54cb89df684a9575dd33461fd22da3d8..eed099f35bf13af6e1e05122017c90dd5ae283d3 100644
(file)
--- a/
arch/mips/kernel/csrc-r4k.c
+++ b/
arch/mips/kernel/csrc-r4k.c
@@
-11,7
+11,7
@@
#include <asm/time.h>
#include <asm/time.h>
-static
cycle_t
c0_hpt_read(struct clocksource *cs)
+static
u64
c0_hpt_read(struct clocksource *cs)
{
return read_c0_count();
}
{
return read_c0_count();
}
diff --git
a/arch/mips/kernel/csrc-sb1250.c
b/arch/mips/kernel/csrc-sb1250.c
index d915652b4d56f88585fdb16428c2761a85e32c11..b07b7310d3f422cd91c1a20f96b8a72c9cfa44f5 100644
(file)
--- a/
arch/mips/kernel/csrc-sb1250.c
+++ b/
arch/mips/kernel/csrc-sb1250.c
@@
-30,7
+30,7
@@
* The HPT is free running from SB1250_HPT_VALUE down to 0 then starts over
* again.
*/
* The HPT is free running from SB1250_HPT_VALUE down to 0 then starts over
* again.
*/
-static inline
cycle_t
sb1250_hpt_get_cycles(void)
+static inline
u64
sb1250_hpt_get_cycles(void)
{
unsigned int count;
void __iomem *addr;
{
unsigned int count;
void __iomem *addr;
@@
-41,7
+41,7
@@
static inline cycle_t sb1250_hpt_get_cycles(void)
return SB1250_HPT_VALUE - count;
}
return SB1250_HPT_VALUE - count;
}
-static
cycle_t
sb1250_hpt_read(struct clocksource *cs)
+static
u64
sb1250_hpt_read(struct clocksource *cs)
{
return sb1250_hpt_get_cycles();
}
{
return sb1250_hpt_get_cycles();
}
diff --git
a/arch/mips/loongson32/common/time.c
b/arch/mips/loongson32/common/time.c
index ff224f0020e504da5e45f6c0e0264eba526b1669..e6f972d35252cabc0c41b0e8a26bd994e5631351 100644
(file)
--- a/
arch/mips/loongson32/common/time.c
+++ b/
arch/mips/loongson32/common/time.c
@@
-63,7
+63,7
@@
void __init ls1x_pwmtimer_init(void)
ls1x_pwmtimer_restart();
}
ls1x_pwmtimer_restart();
}
-static
cycle_t
ls1x_clocksource_read(struct clocksource *cs)
+static
u64
ls1x_clocksource_read(struct clocksource *cs)
{
unsigned long flags;
int count;
{
unsigned long flags;
int count;
@@
-107,7
+107,7
@@
static cycle_t ls1x_clocksource_read(struct clocksource *cs)
raw_spin_unlock_irqrestore(&ls1x_timer_lock, flags);
raw_spin_unlock_irqrestore(&ls1x_timer_lock, flags);
- return (
cycle_t
) (jifs * ls1x_jiffies_per_tick) + count;
+ return (
u64
) (jifs * ls1x_jiffies_per_tick) + count;
}
static struct clocksource ls1x_clocksource = {
}
static struct clocksource ls1x_clocksource = {
diff --git
a/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
b/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
index da77d412514c03db21e6577466a9c8b8e8ac158b..9edfa55a0e7828d5f1b7ba10d91bb627650d7d00 100644
(file)
--- a/
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
+++ b/
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
@@
-144,7
+144,7
@@
void __init setup_mfgpt0_timer(void)
* to just read by itself. So use jiffies to emulate a free
* running counter:
*/
* to just read by itself. So use jiffies to emulate a free
* running counter:
*/
-static
cycle_t
mfgpt_read(struct clocksource *cs)
+static
u64
mfgpt_read(struct clocksource *cs)
{
unsigned long flags;
int count;
{
unsigned long flags;
int count;
@@
-188,7
+188,7
@@
static cycle_t mfgpt_read(struct clocksource *cs)
raw_spin_unlock_irqrestore(&mfgpt_lock, flags);
raw_spin_unlock_irqrestore(&mfgpt_lock, flags);
- return (
cycle_t
) (jifs * COMPARE) + count;
+ return (
u64
) (jifs * COMPARE) + count;
}
static struct clocksource clocksource_mfgpt = {
}
static struct clocksource clocksource_mfgpt = {
diff --git
a/arch/mips/loongson64/loongson-3/hpet.c
b/arch/mips/loongson64/loongson-3/hpet.c
index 4788bea62a6ab1dfe411dac5122f834a68e3ec3e..24afe364637bc447909329f06f8d9aa9c2e351ff 100644
(file)
--- a/
arch/mips/loongson64/loongson-3/hpet.c
+++ b/
arch/mips/loongson64/loongson-3/hpet.c
@@
-248,9
+248,9
@@
void __init setup_hpet_timer(void)
pr_info("hpet clock event device register\n");
}
pr_info("hpet clock event device register\n");
}
-static
cycle_t
hpet_read_counter(struct clocksource *cs)
+static
u64
hpet_read_counter(struct clocksource *cs)
{
{
- return (
cycle_t
)hpet_read(HPET_COUNTER);
+ return (
u64
)hpet_read(HPET_COUNTER);
}
static void hpet_suspend(struct clocksource *cs)
}
static void hpet_suspend(struct clocksource *cs)
diff --git
a/arch/mips/mti-malta/malta-time.c
b/arch/mips/mti-malta/malta-time.c
index 7407da04f8d6bc1cf0da21b4800530087f7d0c88..1829a9031eec7aaa2fd68727db9c111c0517ca81 100644
(file)
--- a/
arch/mips/mti-malta/malta-time.c
+++ b/
arch/mips/mti-malta/malta-time.c
@@
-75,7
+75,7
@@
static void __init estimate_frequencies(void)
unsigned int count, start;
unsigned char secs1, secs2, ctrl;
int secs;
unsigned int count, start;
unsigned char secs1, secs2, ctrl;
int secs;
-
cycle_t
giccount = 0, gicstart = 0;
+
u64
giccount = 0, gicstart = 0;
#if defined(CONFIG_KVM_GUEST) && CONFIG_KVM_GUEST_TIMER_FREQ
mips_hpt_frequency = CONFIG_KVM_GUEST_TIMER_FREQ * 1000000;
#if defined(CONFIG_KVM_GUEST) && CONFIG_KVM_GUEST_TIMER_FREQ
mips_hpt_frequency = CONFIG_KVM_GUEST_TIMER_FREQ * 1000000;
diff --git
a/arch/mips/netlogic/common/time.c
b/arch/mips/netlogic/common/time.c
index 5873c83e65be05bc0f07417c5d3929a4b41e61e2..cbbf0d48216be732ed3cc50ad01c5ee6fd36d3b5 100644
(file)
--- a/
arch/mips/netlogic/common/time.c
+++ b/
arch/mips/netlogic/common/time.c
@@
-59,14
+59,14
@@
unsigned int get_c0_compare_int(void)
return IRQ_TIMER;
}
return IRQ_TIMER;
}
-static
cycle_t
nlm_get_pic_timer(struct clocksource *cs)
+static
u64
nlm_get_pic_timer(struct clocksource *cs)
{
uint64_t picbase = nlm_get_node(0)->picbase;
return ~nlm_pic_read_timer(picbase, PIC_CLOCK_TIMER);
}
{
uint64_t picbase = nlm_get_node(0)->picbase;
return ~nlm_pic_read_timer(picbase, PIC_CLOCK_TIMER);
}
-static
cycle_t
nlm_get_pic_timer32(struct clocksource *cs)
+static
u64
nlm_get_pic_timer32(struct clocksource *cs)
{
uint64_t picbase = nlm_get_node(0)->picbase;
{
uint64_t picbase = nlm_get_node(0)->picbase;
diff --git
a/arch/mips/sgi-ip27/ip27-timer.c
b/arch/mips/sgi-ip27/ip27-timer.c
index 42d6cb9f956e35500d5a1b3268685447ebd5f7f2..695c51bdd7dcb1ed84f1ce6f801c8dff3bcf874a 100644
(file)
--- a/
arch/mips/sgi-ip27/ip27-timer.c
+++ b/
arch/mips/sgi-ip27/ip27-timer.c
@@
-140,7
+140,7
@@
static void __init hub_rt_clock_event_global_init(void)
setup_irq(irq, &hub_rt_irqaction);
}
setup_irq(irq, &hub_rt_irqaction);
}
-static
cycle_t
hub_rt_read(struct clocksource *cs)
+static
u64
hub_rt_read(struct clocksource *cs)
{
return REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT);
}
{
return REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT);
}
diff --git
a/arch/mn10300/kernel/csrc-mn10300.c
b/arch/mn10300/kernel/csrc-mn10300.c
index 45644cf18c41245904722c405d7faeff4861838a..6b74df3661f22aa1dbf13b77b7b68702da0fbe98 100644
(file)
--- a/
arch/mn10300/kernel/csrc-mn10300.c
+++ b/
arch/mn10300/kernel/csrc-mn10300.c
@@
-13,7
+13,7
@@
#include <asm/timex.h>
#include "internal.h"
#include <asm/timex.h>
#include "internal.h"
-static
cycle_t
mn10300_read(struct clocksource *cs)
+static
u64
mn10300_read(struct clocksource *cs)
{
return read_timestamp_counter();
}
{
return read_timestamp_counter();
}
diff --git
a/arch/nios2/kernel/time.c
b/arch/nios2/kernel/time.c
index 746bf5caaffc7989884813b16bc3fd3fce85d0ef..6e2bdc9b8530e1745f01de61eab96d3fb660551c 100644
(file)
--- a/
arch/nios2/kernel/time.c
+++ b/
arch/nios2/kernel/time.c
@@
-81,7
+81,7
@@
static inline unsigned long read_timersnapshot(struct nios2_timer *timer)
return count;
}
return count;
}
-static
cycle_t
nios2_timer_read(struct clocksource *cs)
+static
u64
nios2_timer_read(struct clocksource *cs)
{
struct nios2_clocksource *nios2_cs = to_nios2_clksource(cs);
unsigned long flags;
{
struct nios2_clocksource *nios2_cs = to_nios2_clksource(cs);
unsigned long flags;
diff --git
a/arch/openrisc/kernel/time.c
b/arch/openrisc/kernel/time.c
index 50e970183dcd7e996431fcfa8d6645f494128d8a..687c11d048d7c2493c7d302e3c0cd053f99ef360 100644
(file)
--- a/
arch/openrisc/kernel/time.c
+++ b/
arch/openrisc/kernel/time.c
@@
-117,9
+117,9
@@
static __init void openrisc_clockevent_init(void)
* is 32 bits wide and runs at the CPU clock frequency.
*/
* is 32 bits wide and runs at the CPU clock frequency.
*/
-static
cycle_t
openrisc_timer_read(struct clocksource *cs)
+static
u64
openrisc_timer_read(struct clocksource *cs)
{
{
- return (
cycle_t
) mfspr(SPR_TTCR);
+ return (
u64
) mfspr(SPR_TTCR);
}
static struct clocksource openrisc_timer = {
}
static struct clocksource openrisc_timer = {
diff --git
a/arch/parisc/kernel/time.c
b/arch/parisc/kernel/time.c
index 037d81f00520db1e7f5b41fb4150f1820ac2f9ea..da0d9cb63403d4b3b4f9647cf8415dd11db30fd3 100644
(file)
--- a/
arch/parisc/kernel/time.c
+++ b/
arch/parisc/kernel/time.c
@@
-137,7
+137,7
@@
EXPORT_SYMBOL(profile_pc);
/* clock source code */
/* clock source code */
-static
cycle_t
notrace read_cr16(struct clocksource *cs)
+static
u64
notrace read_cr16(struct clocksource *cs)
{
return get_cycles();
}
{
return get_cycles();
}
diff --git
a/arch/powerpc/kernel/time.c
b/arch/powerpc/kernel/time.c
index 19397e2a8bf5a51ded5eb4f09907b0947631761d..bc2e08d415fa3af8fea6d6f3e63b75e2900c78ff 100644
(file)
--- a/
arch/powerpc/kernel/time.c
+++ b/
arch/powerpc/kernel/time.c
@@
-80,7
+80,7
@@
#include <linux/clockchips.h>
#include <linux/timekeeper_internal.h>
#include <linux/clockchips.h>
#include <linux/timekeeper_internal.h>
-static
cycle_t
rtc_read(struct clocksource *);
+static
u64
rtc_read(struct clocksource *);
static struct clocksource clocksource_rtc = {
.name = "rtc",
.rating = 400,
static struct clocksource clocksource_rtc = {
.name = "rtc",
.rating = 400,
@@
-89,7
+89,7
@@
static struct clocksource clocksource_rtc = {
.read = rtc_read,
};
.read = rtc_read,
};
-static
cycle_t
timebase_read(struct clocksource *);
+static
u64
timebase_read(struct clocksource *);
static struct clocksource clocksource_timebase = {
.name = "timebase",
.rating = 400,
static struct clocksource clocksource_timebase = {
.name = "timebase",
.rating = 400,
@@
-802,18
+802,18
@@
void read_persistent_clock(struct timespec *ts)
}
/* clocksource code */
}
/* clocksource code */
-static
cycle_t
rtc_read(struct clocksource *cs)
+static
u64
rtc_read(struct clocksource *cs)
{
{
- return (
cycle_t
)get_rtc();
+ return (
u64
)get_rtc();
}
}
-static
cycle_t
timebase_read(struct clocksource *cs)
+static
u64
timebase_read(struct clocksource *cs)
{
{
- return (
cycle_t
)get_tb();
+ return (
u64
)get_tb();
}
void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
}
void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
- struct clocksource *clock, u32 mult,
cycle_t
cycle_last)
+ struct clocksource *clock, u32 mult,
u64
cycle_last)
{
u64 new_tb_to_xs, new_stamp_xsec;
u32 frac_sec;
{
u64 new_tb_to_xs, new_stamp_xsec;
u32 frac_sec;
diff --git
a/arch/s390/kernel/time.c
b/arch/s390/kernel/time.c
index ec76315c9ee56e1db679850570b65b998e412242..52949df8852996985fd974c5f04d72c58d0e287d 100644
(file)
--- a/
arch/s390/kernel/time.c
+++ b/
arch/s390/kernel/time.c
@@
-209,7
+209,7
@@
void read_boot_clock64(struct timespec64 *ts)
tod_to_timeval(clock - TOD_UNIX_EPOCH, ts);
}
tod_to_timeval(clock - TOD_UNIX_EPOCH, ts);
}
-static
cycle_t
read_tod_clock(struct clocksource *cs)
+static
u64
read_tod_clock(struct clocksource *cs)
{
unsigned long long now, adj;
{
unsigned long long now, adj;
diff --git
a/arch/sparc/kernel/time_32.c
b/arch/sparc/kernel/time_32.c
index 1affabc96b087bb699a339372f0b0f963c92ecbd..244062bdaa564b9ea3471da9b6a9fe86125fa00e 100644
(file)
--- a/
arch/sparc/kernel/time_32.c
+++ b/
arch/sparc/kernel/time_32.c
@@
-148,7
+148,7
@@
static unsigned int sbus_cycles_offset(void)
return offset;
}
return offset;
}
-static
cycle_t
timer_cs_read(struct clocksource *cs)
+static
u64
timer_cs_read(struct clocksource *cs)
{
unsigned int seq, offset;
u64 cycles;
{
unsigned int seq, offset;
u64 cycles;
diff --git
a/arch/sparc/kernel/time_64.c
b/arch/sparc/kernel/time_64.c
index 807f7e2ce014a18e68a9370a99efcb32d37ded10..12a6d3555cb84332a5755ad18c13eb84b62c60b6 100644
(file)
--- a/
arch/sparc/kernel/time_64.c
+++ b/
arch/sparc/kernel/time_64.c
@@
-770,7
+770,7
@@
void udelay(unsigned long usecs)
}
EXPORT_SYMBOL(udelay);
}
EXPORT_SYMBOL(udelay);
-static
cycle_t
clocksource_tick_read(struct clocksource *cs)
+static
u64
clocksource_tick_read(struct clocksource *cs)
{
return tick_ops->get_tick();
}
{
return tick_ops->get_tick();
}
diff --git
a/arch/um/kernel/time.c
b/arch/um/kernel/time.c
index 25c23666d5924836c1ab19a95cbdefa1c70e7ab1..ba87a27d6715872d77723eff3c480cf587589d61 100644
(file)
--- a/
arch/um/kernel/time.c
+++ b/
arch/um/kernel/time.c
@@
-83,7
+83,7
@@
static irqreturn_t um_timer(int irq, void *dev)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static
cycle_t
timer_read(struct clocksource *cs)
+static
u64
timer_read(struct clocksource *cs)
{
return os_nsecs() / TIMER_MULTIPLIER;
}
{
return os_nsecs() / TIMER_MULTIPLIER;
}
diff --git
a/arch/unicore32/kernel/time.c
b/arch/unicore32/kernel/time.c
index ac4c5449bb88dad90a1f194088f84d724aa4c622..fceaa673f8614f0ef0a375ff9007c813bc8710fe 100644
(file)
--- a/
arch/unicore32/kernel/time.c
+++ b/
arch/unicore32/kernel/time.c
@@
-62,7
+62,7
@@
static struct clock_event_device ckevt_puv3_osmr0 = {
.set_state_oneshot = puv3_osmr0_shutdown,
};
.set_state_oneshot = puv3_osmr0_shutdown,
};
-static
cycle_t
puv3_read_oscr(struct clocksource *cs)
+static
u64
puv3_read_oscr(struct clocksource *cs)
{
return readl(OST_OSCR);
}
{
return readl(OST_OSCR);
}
diff --git
a/arch/x86/entry/vdso/vclock_gettime.c
b/arch/x86/entry/vdso/vclock_gettime.c
index 02223cb4bcfd8155f041aac6ccd11a448ec5ebbe..9d4d6e1383117b5091a172b1c373eb2dc7ed3c2e 100644
(file)
--- a/
arch/x86/entry/vdso/vclock_gettime.c
+++ b/
arch/x86/entry/vdso/vclock_gettime.c
@@
-92,10
+92,10
@@
static notrace const struct pvclock_vsyscall_time_info *get_pvti0(void)
return (const struct pvclock_vsyscall_time_info *)&pvclock_page;
}
return (const struct pvclock_vsyscall_time_info *)&pvclock_page;
}
-static notrace
cycle_t
vread_pvclock(int *mode)
+static notrace
u64
vread_pvclock(int *mode)
{
const struct pvclock_vcpu_time_info *pvti = &get_pvti0()->pvti;
{
const struct pvclock_vcpu_time_info *pvti = &get_pvti0()->pvti;
-
cycle_t
ret;
+
u64
ret;
u64 last;
u32 version;
u64 last;
u32 version;
@@
-142,9
+142,9
@@
static notrace cycle_t vread_pvclock(int *mode)
}
#endif
}
#endif
-notrace static
cycle_t
vread_tsc(void)
+notrace static
u64
vread_tsc(void)
{
{
-
cycle_t ret = (cycle_t
)rdtsc_ordered();
+
u64 ret = (u64
)rdtsc_ordered();
u64 last = gtod->cycle_last;
if (likely(ret >= last))
u64 last = gtod->cycle_last;
if (likely(ret >= last))
diff --git
a/arch/x86/include/asm/kvm_host.h
b/arch/x86/include/asm/kvm_host.h
index 2e25038dbd932cfec9381eccbc1f4c30fe0c7b2e..a7066dc1a7e9ca894784b3eeee328c214f1c6162 100644
(file)
--- a/
arch/x86/include/asm/kvm_host.h
+++ b/
arch/x86/include/asm/kvm_host.h
@@
-768,7
+768,7
@@
struct kvm_arch {
spinlock_t pvclock_gtod_sync_lock;
bool use_master_clock;
u64 master_kernel_ns;
spinlock_t pvclock_gtod_sync_lock;
bool use_master_clock;
u64 master_kernel_ns;
-
cycle_t
master_cycle_now;
+
u64
master_cycle_now;
struct delayed_work kvmclock_update_work;
struct delayed_work kvmclock_sync_work;
struct delayed_work kvmclock_update_work;
struct delayed_work kvmclock_sync_work;
diff --git
a/arch/x86/include/asm/pvclock.h
b/arch/x86/include/asm/pvclock.h
index 3ad741b84072b33f85c386c0abfda7eda649de39..448cfe1b48cf02b46c76b76cf2aa0be93b3df0bc 100644
(file)
--- a/
arch/x86/include/asm/pvclock.h
+++ b/
arch/x86/include/asm/pvclock.h
@@
-14,7
+14,7
@@
static inline struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void)
#endif
/* some helper functions for xen and kvm pv clock sources */
#endif
/* some helper functions for xen and kvm pv clock sources */
-
cycle_t
pvclock_clocksource_read(struct pvclock_vcpu_time_info *src);
+
u64
pvclock_clocksource_read(struct pvclock_vcpu_time_info *src);
u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src);
void pvclock_set_flags(u8 flags);
unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src);
u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src);
void pvclock_set_flags(u8 flags);
unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src);
@@
-87,11
+87,10
@@
static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
}
static __always_inline
}
static __always_inline
-cycle_t __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src,
- u64 tsc)
+u64 __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src, u64 tsc)
{
u64 delta = tsc - src->tsc_timestamp;
{
u64 delta = tsc - src->tsc_timestamp;
-
cycle_t
offset = pvclock_scale_delta(delta, src->tsc_to_system_mul,
+
u64
offset = pvclock_scale_delta(delta, src->tsc_to_system_mul,
src->tsc_shift);
return src->system_time + offset;
}
src->tsc_shift);
return src->system_time + offset;
}
diff --git
a/arch/x86/include/asm/tsc.h
b/arch/x86/include/asm/tsc.h
index abb1fdcc545a530f59880b3e7e754cf6034bf9a2..f5e6f1c417df8724ad1f851f20259b75ecfc875f 100644
(file)
--- a/
arch/x86/include/asm/tsc.h
+++ b/
arch/x86/include/asm/tsc.h
@@
-29,7
+29,7
@@
static inline cycles_t get_cycles(void)
return rdtsc();
}
return rdtsc();
}
-extern struct system_counterval_t convert_art_to_tsc(
cycle_t
art);
+extern struct system_counterval_t convert_art_to_tsc(
u64
art);
extern void tsc_init(void);
extern void mark_tsc_unstable(char *reason);
extern void tsc_init(void);
extern void mark_tsc_unstable(char *reason);
diff --git
a/arch/x86/include/asm/vgtod.h
b/arch/x86/include/asm/vgtod.h
index 3a01996db58fbf7bfa41ca52c86f323d4bb6c937..022e5971456260e108981ce451ea23099558d6ce 100644
(file)
--- a/
arch/x86/include/asm/vgtod.h
+++ b/
arch/x86/include/asm/vgtod.h
@@
-17,8
+17,8
@@
struct vsyscall_gtod_data {
unsigned seq;
int vclock_mode;
unsigned seq;
int vclock_mode;
-
cycle_t
cycle_last;
-
cycle_t
mask;
+
u64
cycle_last;
+
u64
mask;
u32 mult;
u32 shift;
u32 mult;
u32 shift;
diff --git
a/arch/x86/kernel/apb_timer.c
b/arch/x86/kernel/apb_timer.c
index 456316f6c868dc1aff24585bdc9b0119e4804693..092ea664d2c6b783e176e40b98a4b2515875f6bd 100644
(file)
--- a/
arch/x86/kernel/apb_timer.c
+++ b/
arch/x86/kernel/apb_timer.c
@@
-247,7
+247,7
@@
void apbt_setup_secondary_clock(void) {}
static int apbt_clocksource_register(void)
{
u64 start, now;
static int apbt_clocksource_register(void)
{
u64 start, now;
-
cycle_t
t1;
+
u64
t1;
/* Start the counter, use timer 2 as source, timer 0/1 for event */
dw_apb_clocksource_start(clocksource_apbt);
/* Start the counter, use timer 2 as source, timer 0/1 for event */
dw_apb_clocksource_start(clocksource_apbt);
@@
-355,7
+355,7
@@
unsigned long apbt_quick_calibrate(void)
{
int i, scale;
u64 old, new;
{
int i, scale;
u64 old, new;
-
cycle_t
t1, t2;
+
u64
t1, t2;
unsigned long khz = 0;
u32 loop, shift;
unsigned long khz = 0;
u32 loop, shift;
diff --git
a/arch/x86/kernel/cpu/mshyperv.c
b/arch/x86/kernel/cpu/mshyperv.c
index f37e02e41a7755f68f9db3b2a9b95b6ecef9206e..65e20c97e04b1e2591a356eda4e922ed92ec0310 100644
(file)
--- a/
arch/x86/kernel/cpu/mshyperv.c
+++ b/
arch/x86/kernel/cpu/mshyperv.c
@@
-133,9
+133,9
@@
static uint32_t __init ms_hyperv_platform(void)
return 0;
}
return 0;
}
-static
cycle_t
read_hv_clock(struct clocksource *arg)
+static
u64
read_hv_clock(struct clocksource *arg)
{
{
-
cycle_t
current_tick;
+
u64
current_tick;
/*
* Read the partition counter to get the current tick count. This count
* is set to 0 when the partition is created and is incremented in
/*
* Read the partition counter to get the current tick count. This count
* is set to 0 when the partition is created and is incremented in
diff --git
a/arch/x86/kernel/hpet.c
b/arch/x86/kernel/hpet.c
index 274fab99169d8235628b13fa955fc98b520ee27f..367756d55980fd02b94fe72a7c65f628421e089c 100644
(file)
--- a/
arch/x86/kernel/hpet.c
+++ b/
arch/x86/kernel/hpet.c
@@
-791,7
+791,7
@@
static union hpet_lock hpet __cacheline_aligned = {
{ .lock = __ARCH_SPIN_LOCK_UNLOCKED, },
};
{ .lock = __ARCH_SPIN_LOCK_UNLOCKED, },
};
-static
cycle_t
read_hpet(struct clocksource *cs)
+static
u64
read_hpet(struct clocksource *cs)
{
unsigned long flags;
union hpet_lock old, new;
{
unsigned long flags;
union hpet_lock old, new;
@@
-802,7
+802,7
@@
static cycle_t read_hpet(struct clocksource *cs)
* Read HPET directly if in NMI.
*/
if (in_nmi())
* Read HPET directly if in NMI.
*/
if (in_nmi())
- return (
cycle_t
)hpet_readl(HPET_COUNTER);
+ return (
u64
)hpet_readl(HPET_COUNTER);
/*
* Read the current state of the lock and HPET value atomically.
/*
* Read the current state of the lock and HPET value atomically.
@@
-821,7
+821,7
@@
static cycle_t read_hpet(struct clocksource *cs)
WRITE_ONCE(hpet.value, new.value);
arch_spin_unlock(&hpet.lock);
local_irq_restore(flags);
WRITE_ONCE(hpet.value, new.value);
arch_spin_unlock(&hpet.lock);
local_irq_restore(flags);
- return (
cycle_t
)new.value;
+ return (
u64
)new.value;
}
local_irq_restore(flags);
}
local_irq_restore(flags);
@@
-843,15
+843,15
@@
contended:
new.lockval = READ_ONCE(hpet.lockval);
} while ((new.value == old.value) && arch_spin_is_locked(&new.lock));
new.lockval = READ_ONCE(hpet.lockval);
} while ((new.value == old.value) && arch_spin_is_locked(&new.lock));
- return (
cycle_t
)new.value;
+ return (
u64
)new.value;
}
#else
/*
* For UP or 32-bit.
*/
}
#else
/*
* For UP or 32-bit.
*/
-static
cycle_t
read_hpet(struct clocksource *cs)
+static
u64
read_hpet(struct clocksource *cs)
{
{
- return (
cycle_t
)hpet_readl(HPET_COUNTER);
+ return (
u64
)hpet_readl(HPET_COUNTER);
}
#endif
}
#endif
@@
-867,7
+867,7
@@
static struct clocksource clocksource_hpet = {
static int hpet_clocksource_register(void)
{
u64 start, now;
static int hpet_clocksource_register(void)
{
u64 start, now;
-
cycle_t
t1;
+
u64
t1;
/* Start the counter */
hpet_restart_counter();
/* Start the counter */
hpet_restart_counter();
diff --git
a/arch/x86/kernel/kvmclock.c
b/arch/x86/kernel/kvmclock.c
index 60b9949f1e65129464ad717bf1381c0a14206645..2a5cafdf8808eee394039c30f0700c234e4a615b 100644
(file)
--- a/
arch/x86/kernel/kvmclock.c
+++ b/
arch/x86/kernel/kvmclock.c
@@
-32,7
+32,7
@@
static int kvmclock __ro_after_init = 1;
static int msr_kvm_system_time = MSR_KVM_SYSTEM_TIME;
static int msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK;
static int kvmclock __ro_after_init = 1;
static int msr_kvm_system_time = MSR_KVM_SYSTEM_TIME;
static int msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK;
-static
cycle_t
kvm_sched_clock_offset;
+static
u64
kvm_sched_clock_offset;
static int parse_no_kvmclock(char *arg)
{
static int parse_no_kvmclock(char *arg)
{
@@
-79,10
+79,10
@@
static int kvm_set_wallclock(const struct timespec *now)
return -1;
}
return -1;
}
-static
cycle_t
kvm_clock_read(void)
+static
u64
kvm_clock_read(void)
{
struct pvclock_vcpu_time_info *src;
{
struct pvclock_vcpu_time_info *src;
-
cycle_t
ret;
+
u64
ret;
int cpu;
preempt_disable_notrace();
int cpu;
preempt_disable_notrace();
@@
-93,12
+93,12
@@
static cycle_t kvm_clock_read(void)
return ret;
}
return ret;
}
-static
cycle_t
kvm_clock_get_cycles(struct clocksource *cs)
+static
u64
kvm_clock_get_cycles(struct clocksource *cs)
{
return kvm_clock_read();
}
{
return kvm_clock_read();
}
-static
cycle_t
kvm_sched_clock_read(void)
+static
u64
kvm_sched_clock_read(void)
{
return kvm_clock_read() - kvm_sched_clock_offset;
}
{
return kvm_clock_read() - kvm_sched_clock_offset;
}
diff --git
a/arch/x86/kernel/pvclock.c
b/arch/x86/kernel/pvclock.c
index 5b2cc889ce346586527ff260f018b5d7d436ca8f..9e93fe5803b470676997cec46a5f05f6e3c1177c 100644
(file)
--- a/
arch/x86/kernel/pvclock.c
+++ b/
arch/x86/kernel/pvclock.c
@@
-71,10
+71,10
@@
u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
return flags & valid_flags;
}
return flags & valid_flags;
}
-
cycle_t
pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
+
u64
pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
{
unsigned version;
{
unsigned version;
-
cycle_t
ret;
+
u64
ret;
u64 last;
u8 flags;
u64 last;
u8 flags;
diff --git
a/arch/x86/kernel/tsc.c
b/arch/x86/kernel/tsc.c
index 0aed75a1e31b0e7f88d3f3f105ea4207f5bcade2..be3a49ee035650f1f1eac68c07ad0e8898c40585 100644
(file)
--- a/
arch/x86/kernel/tsc.c
+++ b/
arch/x86/kernel/tsc.c
@@
-1101,9
+1101,9
@@
static void tsc_resume(struct clocksource *cs)
* checking the result of read_tsc() - cycle_last for being negative.
* That works because CLOCKSOURCE_MASK(64) does not mask out any bit.
*/
* checking the result of read_tsc() - cycle_last for being negative.
* That works because CLOCKSOURCE_MASK(64) does not mask out any bit.
*/
-static
cycle_t
read_tsc(struct clocksource *cs)
+static
u64
read_tsc(struct clocksource *cs)
{
{
- return (
cycle_t
)rdtsc_ordered();
+ return (
u64
)rdtsc_ordered();
}
/*
}
/*
@@
-1192,7
+1192,7
@@
int unsynchronized_tsc(void)
/*
* Convert ART to TSC given numerator/denominator found in detect_art()
*/
/*
* Convert ART to TSC given numerator/denominator found in detect_art()
*/
-struct system_counterval_t convert_art_to_tsc(
cycle_t
art)
+struct system_counterval_t convert_art_to_tsc(
u64
art)
{
u64 tmp, res, rem;
{
u64 tmp, res, rem;
diff --git
a/arch/x86/kvm/x86.c
b/arch/x86/kvm/x86.c
index 445c51b6cf6dc702a0da9710ee5b6eb4b996ec34..ed04398f52c1bf30ed9a1ec0d62c5a4ee91adbd4 100644
(file)
--- a/
arch/x86/kvm/x86.c
+++ b/
arch/x86/kvm/x86.c
@@
-1131,8
+1131,8
@@
struct pvclock_gtod_data {
struct { /* extract of a clocksource struct */
int vclock_mode;
struct { /* extract of a clocksource struct */
int vclock_mode;
-
cycle_t
cycle_last;
-
cycle_t
mask;
+
u64
cycle_last;
+
u64
mask;
u32 mult;
u32 shift;
} clock;
u32 mult;
u32 shift;
} clock;
@@
-1572,9
+1572,9
@@
static inline void adjust_tsc_offset_host(struct kvm_vcpu *vcpu, s64 adjustment)
#ifdef CONFIG_X86_64
#ifdef CONFIG_X86_64
-static
cycle_t
read_tsc(void)
+static
u64
read_tsc(void)
{
{
-
cycle_t ret = (cycle_t
)rdtsc_ordered();
+
u64 ret = (u64
)rdtsc_ordered();
u64 last = pvclock_gtod_data.clock.cycle_last;
if (likely(ret >= last))
u64 last = pvclock_gtod_data.clock.cycle_last;
if (likely(ret >= last))
@@
-1592,7
+1592,7
@@
static cycle_t read_tsc(void)
return last;
}
return last;
}
-static inline u64 vgettsc(
cycle_t
*cycle_now)
+static inline u64 vgettsc(
u64
*cycle_now)
{
long v;
struct pvclock_gtod_data *gtod = &pvclock_gtod_data;
{
long v;
struct pvclock_gtod_data *gtod = &pvclock_gtod_data;
@@
-1603,7
+1603,7
@@
static inline u64 vgettsc(cycle_t *cycle_now)
return v * gtod->clock.mult;
}
return v * gtod->clock.mult;
}
-static int do_monotonic_boot(s64 *t,
cycle_t
*cycle_now)
+static int do_monotonic_boot(s64 *t,
u64
*cycle_now)
{
struct pvclock_gtod_data *gtod = &pvclock_gtod_data;
unsigned long seq;
{
struct pvclock_gtod_data *gtod = &pvclock_gtod_data;
unsigned long seq;
@@
-1624,7
+1624,7
@@
static int do_monotonic_boot(s64 *t, cycle_t *cycle_now)
}
/* returns true if host is using tsc clocksource */
}
/* returns true if host is using tsc clocksource */
-static bool kvm_get_time_and_clockread(s64 *kernel_ns,
cycle_t
*cycle_now)
+static bool kvm_get_time_and_clockread(s64 *kernel_ns,
u64
*cycle_now)
{
/* checked again under seqlock below */
if (pvclock_gtod_data.clock.vclock_mode != VCLOCK_TSC)
{
/* checked again under seqlock below */
if (pvclock_gtod_data.clock.vclock_mode != VCLOCK_TSC)
diff --git
a/arch/x86/lguest/boot.c
b/arch/x86/lguest/boot.c
index 4ca0d78adcf0832f7f722ef090dfa92d00824ab3..d3289d7e78fac8ac98a40e3b62b9dcd406402910 100644
(file)
--- a/
arch/x86/lguest/boot.c
+++ b/
arch/x86/lguest/boot.c
@@
-916,7
+916,7
@@
static unsigned long lguest_tsc_khz(void)
* If we can't use the TSC, the kernel falls back to our lower-priority
* "lguest_clock", where we read the time value given to us by the Host.
*/
* If we can't use the TSC, the kernel falls back to our lower-priority
* "lguest_clock", where we read the time value given to us by the Host.
*/
-static
cycle_t
lguest_clock_read(struct clocksource *cs)
+static
u64
lguest_clock_read(struct clocksource *cs)
{
unsigned long sec, nsec;
{
unsigned long sec, nsec;
diff --git
a/arch/x86/platform/uv/uv_time.c
b/arch/x86/platform/uv/uv_time.c
index b333fc45f9ec8025e72b2ad29abfeffbc7285e4b..2ee7632d49162f18812f01ae78f5fbd081128845 100644
(file)
--- a/
arch/x86/platform/uv/uv_time.c
+++ b/
arch/x86/platform/uv/uv_time.c
@@
-30,7
+30,7
@@
#define RTC_NAME "sgi_rtc"
#define RTC_NAME "sgi_rtc"
-static
cycle_t
uv_read_rtc(struct clocksource *cs);
+static
u64
uv_read_rtc(struct clocksource *cs);
static int uv_rtc_next_event(unsigned long, struct clock_event_device *);
static int uv_rtc_shutdown(struct clock_event_device *evt);
static int uv_rtc_next_event(unsigned long, struct clock_event_device *);
static int uv_rtc_shutdown(struct clock_event_device *evt);
@@
-38,7
+38,7
@@
static struct clocksource clocksource_uv = {
.name = RTC_NAME,
.rating = 299,
.read = uv_read_rtc,
.name = RTC_NAME,
.rating = 299,
.read = uv_read_rtc,
- .mask = (
cycle_t
)UVH_RTC_REAL_TIME_CLOCK_MASK,
+ .mask = (
u64
)UVH_RTC_REAL_TIME_CLOCK_MASK,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
@@
-296,7
+296,7
@@
static int uv_rtc_unset_timer(int cpu, int force)
* cachelines of it's own page. This allows faster simultaneous reads
* from a given socket.
*/
* cachelines of it's own page. This allows faster simultaneous reads
* from a given socket.
*/
-static
cycle_t
uv_read_rtc(struct clocksource *cs)
+static
u64
uv_read_rtc(struct clocksource *cs)
{
unsigned long offset;
{
unsigned long offset;
@@
-305,7
+305,7
@@
static cycle_t uv_read_rtc(struct clocksource *cs)
else
offset = (uv_blade_processor_id() * L1_CACHE_BYTES) % PAGE_SIZE;
else
offset = (uv_blade_processor_id() * L1_CACHE_BYTES) % PAGE_SIZE;
- return (
cycle_t
)uv_read_local_mmr(UVH_RTC | offset);
+ return (
u64
)uv_read_local_mmr(UVH_RTC | offset);
}
/*
}
/*
diff --git
a/arch/x86/xen/time.c
b/arch/x86/xen/time.c
index 33d8f6a7829d75c6673a8287d8a9d4be68401d9e..1e69956d7852bbfc8816acfb3bdd3d701ed99d59 100644
(file)
--- a/
arch/x86/xen/time.c
+++ b/
arch/x86/xen/time.c
@@
-39,10
+39,10
@@
static unsigned long xen_tsc_khz(void)
return pvclock_tsc_khz(info);
}
return pvclock_tsc_khz(info);
}
-
cycle_t
xen_clocksource_read(void)
+
u64
xen_clocksource_read(void)
{
struct pvclock_vcpu_time_info *src;
{
struct pvclock_vcpu_time_info *src;
-
cycle_t
ret;
+
u64
ret;
preempt_disable_notrace();
src = &__this_cpu_read(xen_vcpu)->time;
preempt_disable_notrace();
src = &__this_cpu_read(xen_vcpu)->time;
@@
-51,7
+51,7
@@
cycle_t xen_clocksource_read(void)
return ret;
}
return ret;
}
-static
cycle_t
xen_clocksource_get_cycles(struct clocksource *cs)
+static
u64
xen_clocksource_get_cycles(struct clocksource *cs)
{
return xen_clocksource_read();
}
{
return xen_clocksource_read();
}
diff --git
a/arch/x86/xen/xen-ops.h
b/arch/x86/xen/xen-ops.h
index 3cbce3b085e73519973d766a75c86520723c219a..ac0a2b0f9e626088fd44670c1709e0bf2da2900f 100644
(file)
--- a/
arch/x86/xen/xen-ops.h
+++ b/
arch/x86/xen/xen-ops.h
@@
-67,7
+67,7
@@
void xen_init_irq_ops(void);
void xen_setup_timer(int cpu);
void xen_setup_runstate_info(int cpu);
void xen_teardown_timer(int cpu);
void xen_setup_timer(int cpu);
void xen_setup_runstate_info(int cpu);
void xen_teardown_timer(int cpu);
-
cycle_t
xen_clocksource_read(void);
+
u64
xen_clocksource_read(void);
void xen_setup_cpu_clockevents(void);
void __init xen_init_time_ops(void);
void __init xen_hvm_init_time_ops(void);
void xen_setup_cpu_clockevents(void);
void __init xen_init_time_ops(void);
void __init xen_hvm_init_time_ops(void);
diff --git
a/arch/xtensa/kernel/time.c
b/arch/xtensa/kernel/time.c
index be81e69b25bc98e46514c46e4a5a030afb87ecca..668c1056f9e49bf8ca23234d16dc44fec9bec9b2 100644
(file)
--- a/
arch/xtensa/kernel/time.c
+++ b/
arch/xtensa/kernel/time.c
@@
-34,9
+34,9
@@
unsigned long ccount_freq; /* ccount Hz */
EXPORT_SYMBOL(ccount_freq);
unsigned long ccount_freq; /* ccount Hz */
EXPORT_SYMBOL(ccount_freq);
-static
cycle_t
ccount_read(struct clocksource *cs)
+static
u64
ccount_read(struct clocksource *cs)
{
{
- return (
cycle_t
)get_ccount();
+ return (
u64
)get_ccount();
}
static u64 notrace ccount_sched_clock_read(void)
}
static u64 notrace ccount_sched_clock_read(void)
diff --git
a/drivers/char/hpet.c
b/drivers/char/hpet.c
index be54e5331a4517899e0e4ace0c48418cbb082a0e..20b32bb8c2aff5f57aa93e4eaa657e5275bf9313 100644
(file)
--- a/
drivers/char/hpet.c
+++ b/
drivers/char/hpet.c
@@
-69,9
+69,9
@@
static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;
#ifdef CONFIG_IA64
static void __iomem *hpet_mctr;
#ifdef CONFIG_IA64
static void __iomem *hpet_mctr;
-static
cycle_t
read_hpet(struct clocksource *cs)
+static
u64
read_hpet(struct clocksource *cs)
{
{
- return (
cycle_t
)read_counter((void __iomem *)hpet_mctr);
+ return (
u64
)read_counter((void __iomem *)hpet_mctr);
}
static struct clocksource clocksource_hpet = {
}
static struct clocksource clocksource_hpet = {
diff --git
a/drivers/clocksource/acpi_pm.c
b/drivers/clocksource/acpi_pm.c
index 28037d0b8dcd133c4be8814bf609342c1520d0c4..1961e3539b5760fd78bd8c076ad790ffad729dc1 100644
(file)
--- a/
drivers/clocksource/acpi_pm.c
+++ b/
drivers/clocksource/acpi_pm.c
@@
-58,16
+58,16
@@
u32 acpi_pm_read_verified(void)
return v2;
}
return v2;
}
-static
cycle_t
acpi_pm_read(struct clocksource *cs)
+static
u64
acpi_pm_read(struct clocksource *cs)
{
{
- return (
cycle_t
)read_pmtmr();
+ return (
u64
)read_pmtmr();
}
static struct clocksource clocksource_acpi_pm = {
.name = "acpi_pm",
.rating = 200,
.read = acpi_pm_read,
}
static struct clocksource clocksource_acpi_pm = {
.name = "acpi_pm",
.rating = 200,
.read = acpi_pm_read,
- .mask = (
cycle_t
)ACPI_PM_MASK,
+ .mask = (
u64
)ACPI_PM_MASK,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
@@
-81,9
+81,9
@@
static int __init acpi_pm_good_setup(char *__str)
}
__setup("acpi_pm_good", acpi_pm_good_setup);
}
__setup("acpi_pm_good", acpi_pm_good_setup);
-static
cycle_t
acpi_pm_read_slow(struct clocksource *cs)
+static
u64
acpi_pm_read_slow(struct clocksource *cs)
{
{
- return (
cycle_t
)acpi_pm_read_verified();
+ return (
u64
)acpi_pm_read_verified();
}
static inline void acpi_pm_need_workaround(void)
}
static inline void acpi_pm_need_workaround(void)
@@
-145,7
+145,7
@@
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,
*/
static int verify_pmtmr_rate(void)
{
*/
static int verify_pmtmr_rate(void)
{
-
cycle_t
value1, value2;
+
u64
value1, value2;
unsigned long count, delta;
mach_prepare_counter();
unsigned long count, delta;
mach_prepare_counter();
@@
-175,7
+175,7
@@
static int verify_pmtmr_rate(void)
static int __init init_acpi_pm_clocksource(void)
{
static int __init init_acpi_pm_clocksource(void)
{
-
cycle_t
value1, value2;
+
u64
value1, value2;
unsigned int i, j = 0;
if (!pmtmr_ioport)
unsigned int i, j = 0;
if (!pmtmr_ioport)
diff --git
a/drivers/clocksource/arc_timer.c
b/drivers/clocksource/arc_timer.c
index a49748d826c0315cf537a0beea7fb40073e410a8..3ea46343024f8fea4b64728c6985210bd8331e20 100644
(file)
--- a/
drivers/clocksource/arc_timer.c
+++ b/
drivers/clocksource/arc_timer.c
@@
-56,7
+56,7
@@
static int noinline arc_get_timer_clk(struct device_node *node)
#ifdef CONFIG_ARC_TIMERS_64BIT
#ifdef CONFIG_ARC_TIMERS_64BIT
-static
cycle_t
arc_read_gfrc(struct clocksource *cs)
+static
u64
arc_read_gfrc(struct clocksource *cs)
{
unsigned long flags;
u32 l, h;
{
unsigned long flags;
u32 l, h;
@@
-71,7
+71,7
@@
static cycle_t arc_read_gfrc(struct clocksource *cs)
local_irq_restore(flags);
local_irq_restore(flags);
- return (((
cycle_t
)h) << 32) | l;
+ return (((
u64
)h) << 32) | l;
}
static struct clocksource arc_counter_gfrc = {
}
static struct clocksource arc_counter_gfrc = {
@@
-105,7
+105,7
@@
CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc);
#define AUX_RTC_LOW 0x104
#define AUX_RTC_HIGH 0x105
#define AUX_RTC_LOW 0x104
#define AUX_RTC_HIGH 0x105
-static
cycle_t
arc_read_rtc(struct clocksource *cs)
+static
u64
arc_read_rtc(struct clocksource *cs)
{
unsigned long status;
u32 l, h;
{
unsigned long status;
u32 l, h;
@@
-122,7
+122,7
@@
static cycle_t arc_read_rtc(struct clocksource *cs)
status = read_aux_reg(AUX_RTC_CTRL);
} while (!(status & _BITUL(31)));
status = read_aux_reg(AUX_RTC_CTRL);
} while (!(status & _BITUL(31)));
- return (((
cycle_t
)h) << 32) | l;
+ return (((
u64
)h) << 32) | l;
}
static struct clocksource arc_counter_rtc = {
}
static struct clocksource arc_counter_rtc = {
@@
-166,9
+166,9
@@
CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc);
* 32bit TIMER1 to keep counting monotonically and wraparound
*/
* 32bit TIMER1 to keep counting monotonically and wraparound
*/
-static
cycle_t
arc_read_timer1(struct clocksource *cs)
+static
u64
arc_read_timer1(struct clocksource *cs)
{
{
- return (
cycle_t
) read_aux_reg(ARC_REG_TIMER1_CNT);
+ return (
u64
) read_aux_reg(ARC_REG_TIMER1_CNT);
}
static struct clocksource arc_counter_timer1 = {
}
static struct clocksource arc_counter_timer1 = {
diff --git
a/drivers/clocksource/arm_arch_timer.c
b/drivers/clocksource/arm_arch_timer.c
index 02fef6830e728d0adfad52920034c722273dfe61..394e417414d3f297c9f56497f1a00b31afe55d21 100644
(file)
--- a/
drivers/clocksource/arm_arch_timer.c
+++ b/
drivers/clocksource/arm_arch_timer.c
@@
-562,12
+562,12
@@
static u64 arch_counter_get_cntvct_mem(void)
*/
u64 (*arch_timer_read_counter)(void) = arch_counter_get_cntvct;
*/
u64 (*arch_timer_read_counter)(void) = arch_counter_get_cntvct;
-static
cycle_t
arch_counter_read(struct clocksource *cs)
+static
u64
arch_counter_read(struct clocksource *cs)
{
return arch_timer_read_counter();
}
{
return arch_timer_read_counter();
}
-static
cycle_t
arch_counter_read_cc(const struct cyclecounter *cc)
+static
u64
arch_counter_read_cc(const struct cyclecounter *cc)
{
return arch_timer_read_counter();
}
{
return arch_timer_read_counter();
}
diff --git
a/drivers/clocksource/arm_global_timer.c
b/drivers/clocksource/arm_global_timer.c
index 8da03298f844f386b81c08f3bc12228fcab340ab..570cc58baec441f018ee8ffe704c4b53ce12a008 100644
(file)
--- a/
drivers/clocksource/arm_global_timer.c
+++ b/
drivers/clocksource/arm_global_timer.c
@@
-195,7
+195,7
@@
static int gt_dying_cpu(unsigned int cpu)
return 0;
}
return 0;
}
-static
cycle_t
gt_clocksource_read(struct clocksource *cs)
+static
u64
gt_clocksource_read(struct clocksource *cs)
{
return gt_counter_read();
}
{
return gt_counter_read();
}
diff --git
a/drivers/clocksource/cadence_ttc_timer.c
b/drivers/clocksource/cadence_ttc_timer.c
index fbfbdec13b081837e3866ee06f8a9c231cce990c..44e5e951583bc38fc8c4a6a9b89ea91f7587af34 100644
(file)
--- a/
drivers/clocksource/cadence_ttc_timer.c
+++ b/
drivers/clocksource/cadence_ttc_timer.c
@@
-158,11
+158,11
@@
static irqreturn_t ttc_clock_event_interrupt(int irq, void *dev_id)
*
* returns: Current timer counter register value
**/
*
* returns: Current timer counter register value
**/
-static
cycle_t
__ttc_clocksource_read(struct clocksource *cs)
+static
u64
__ttc_clocksource_read(struct clocksource *cs)
{
struct ttc_timer *timer = &to_ttc_timer_clksrc(cs)->ttc;
{
struct ttc_timer *timer = &to_ttc_timer_clksrc(cs)->ttc;
- return (
cycle_t
)readl_relaxed(timer->base_addr +
+ return (
u64
)readl_relaxed(timer->base_addr +
TTC_COUNT_VAL_OFFSET);
}
TTC_COUNT_VAL_OFFSET);
}
diff --git
a/drivers/clocksource/clksrc-dbx500-prcmu.c
b/drivers/clocksource/clksrc-dbx500-prcmu.c
index 77a365f573d7f19a385f06ceffb16011a9159d98..c69e2772658d9318892ce377cebff1eb4118c793 100644
(file)
--- a/
drivers/clocksource/clksrc-dbx500-prcmu.c
+++ b/
drivers/clocksource/clksrc-dbx500-prcmu.c
@@
-30,7
+30,7
@@
static void __iomem *clksrc_dbx500_timer_base;
static void __iomem *clksrc_dbx500_timer_base;
-static
cycle_t
notrace clksrc_dbx500_prcmu_read(struct clocksource *cs)
+static
u64
notrace clksrc_dbx500_prcmu_read(struct clocksource *cs)
{
void __iomem *base = clksrc_dbx500_timer_base;
u32 count, count2;
{
void __iomem *base = clksrc_dbx500_timer_base;
u32 count, count2;
diff --git
a/drivers/clocksource/dw_apb_timer.c
b/drivers/clocksource/dw_apb_timer.c
index 797505aa2ba41263f5f2080f9b777f383b744bfe..63e4f5519577bea8edbf6c023eef89d242ff0f34 100644
(file)
--- a/
drivers/clocksource/dw_apb_timer.c
+++ b/
drivers/clocksource/dw_apb_timer.c
@@
-348,7
+348,7
@@
void dw_apb_clocksource_start(struct dw_apb_clocksource *dw_cs)
dw_apb_clocksource_read(dw_cs);
}
dw_apb_clocksource_read(dw_cs);
}
-static
cycle_t
__apbt_read_clocksource(struct clocksource *cs)
+static
u64
__apbt_read_clocksource(struct clocksource *cs)
{
u32 current_count;
struct dw_apb_clocksource *dw_cs =
{
u32 current_count;
struct dw_apb_clocksource *dw_cs =
@@
-357,7
+357,7
@@
static cycle_t __apbt_read_clocksource(struct clocksource *cs)
current_count = apbt_readl_relaxed(&dw_cs->timer,
APBTMR_N_CURRENT_VALUE);
current_count = apbt_readl_relaxed(&dw_cs->timer,
APBTMR_N_CURRENT_VALUE);
- return (
cycle_t
)~current_count;
+ return (
u64
)~current_count;
}
static void apbt_restart_clocksource(struct clocksource *cs)
}
static void apbt_restart_clocksource(struct clocksource *cs)
@@
-416,7
+416,7
@@
void dw_apb_clocksource_register(struct dw_apb_clocksource *dw_cs)
*
* @dw_cs: The clocksource to read.
*/
*
* @dw_cs: The clocksource to read.
*/
-
cycle_t
dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs)
+
u64
dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs)
{
{
- return (
cycle_t
)~apbt_readl(&dw_cs->timer, APBTMR_N_CURRENT_VALUE);
+ return (
u64
)~apbt_readl(&dw_cs->timer, APBTMR_N_CURRENT_VALUE);
}
}
diff --git
a/drivers/clocksource/em_sti.c
b/drivers/clocksource/em_sti.c
index 19bb1792d647dc8cca312248b5f2c7eef86099dd..aff87df07449d62d0fc0b401f4038463b18ab326 100644
(file)
--- a/
drivers/clocksource/em_sti.c
+++ b/
drivers/clocksource/em_sti.c
@@
-110,9
+110,9
@@
static void em_sti_disable(struct em_sti_priv *p)
clk_disable_unprepare(p->clk);
}
clk_disable_unprepare(p->clk);
}
-static
cycle_t
em_sti_count(struct em_sti_priv *p)
+static
u64
em_sti_count(struct em_sti_priv *p)
{
{
-
cycle_t
ticks;
+
u64
ticks;
unsigned long flags;
/* the STI hardware buffers the 48-bit count, but to
unsigned long flags;
/* the STI hardware buffers the 48-bit count, but to
@@
-121,14
+121,14
@@
static cycle_t em_sti_count(struct em_sti_priv *p)
* Always read STI_COUNT_H before STI_COUNT_L.
*/
raw_spin_lock_irqsave(&p->lock, flags);
* Always read STI_COUNT_H before STI_COUNT_L.
*/
raw_spin_lock_irqsave(&p->lock, flags);
- ticks = (
cycle_t
)(em_sti_read(p, STI_COUNT_H) & 0xffff) << 32;
+ ticks = (
u64
)(em_sti_read(p, STI_COUNT_H) & 0xffff) << 32;
ticks |= em_sti_read(p, STI_COUNT_L);
raw_spin_unlock_irqrestore(&p->lock, flags);
return ticks;
}
ticks |= em_sti_read(p, STI_COUNT_L);
raw_spin_unlock_irqrestore(&p->lock, flags);
return ticks;
}
-static
cycle_t em_sti_set_next(struct em_sti_priv *p, cycle_t
next)
+static
u64 em_sti_set_next(struct em_sti_priv *p, u64
next)
{
unsigned long flags;
{
unsigned long flags;
@@
-198,7
+198,7
@@
static struct em_sti_priv *cs_to_em_sti(struct clocksource *cs)
return container_of(cs, struct em_sti_priv, cs);
}
return container_of(cs, struct em_sti_priv, cs);
}
-static
cycle_t
em_sti_clocksource_read(struct clocksource *cs)
+static
u64
em_sti_clocksource_read(struct clocksource *cs)
{
return em_sti_count(cs_to_em_sti(cs));
}
{
return em_sti_count(cs_to_em_sti(cs));
}
@@
-271,7
+271,7
@@
static int em_sti_clock_event_next(unsigned long delta,
struct clock_event_device *ced)
{
struct em_sti_priv *p = ced_to_em_sti(ced);
struct clock_event_device *ced)
{
struct em_sti_priv *p = ced_to_em_sti(ced);
-
cycle_t
next;
+
u64
next;
int safe;
next = em_sti_set_next(p, em_sti_count(p) + delta);
int safe;
next = em_sti_set_next(p, em_sti_count(p) + delta);
diff --git
a/drivers/clocksource/exynos_mct.c
b/drivers/clocksource/exynos_mct.c
index 8f3488b808964b1884eaf18d602fe2ae9b4921c2..c8b9f834f4de1ea00443fc5de7de72dc6bb974fe 100644
(file)
--- a/
drivers/clocksource/exynos_mct.c
+++ b/
drivers/clocksource/exynos_mct.c
@@
-183,7
+183,7
@@
static u64 exynos4_read_count_64(void)
hi2 = readl_relaxed(reg_base + EXYNOS4_MCT_G_CNT_U);
} while (hi != hi2);
hi2 = readl_relaxed(reg_base + EXYNOS4_MCT_G_CNT_U);
} while (hi != hi2);
- return ((
cycle_t
)hi << 32) | lo;
+ return ((
u64
)hi << 32) | lo;
}
/**
}
/**
@@
-199,7
+199,7
@@
static u32 notrace exynos4_read_count_32(void)
return readl_relaxed(reg_base + EXYNOS4_MCT_G_CNT_L);
}
return readl_relaxed(reg_base + EXYNOS4_MCT_G_CNT_L);
}
-static
cycle_t
exynos4_frc_read(struct clocksource *cs)
+static
u64
exynos4_frc_read(struct clocksource *cs)
{
return exynos4_read_count_32();
}
{
return exynos4_read_count_32();
}
@@
-266,7
+266,7
@@
static void exynos4_mct_comp0_stop(void)
static void exynos4_mct_comp0_start(bool periodic, unsigned long cycles)
{
unsigned int tcon;
static void exynos4_mct_comp0_start(bool periodic, unsigned long cycles)
{
unsigned int tcon;
-
cycle_t
comp_cycle;
+
u64
comp_cycle;
tcon = readl_relaxed(reg_base + EXYNOS4_MCT_G_TCON);
tcon = readl_relaxed(reg_base + EXYNOS4_MCT_G_TCON);
diff --git
a/drivers/clocksource/h8300_timer16.c
b/drivers/clocksource/h8300_timer16.c
index 07d9d5be9054a6e46aeef0a933e0344b1dcf84dc..5b27fb9997c22083cf602811d86864cd7e7cdb0e 100644
(file)
--- a/
drivers/clocksource/h8300_timer16.c
+++ b/
drivers/clocksource/h8300_timer16.c
@@
-72,7
+72,7
@@
static inline struct timer16_priv *cs_to_priv(struct clocksource *cs)
return container_of(cs, struct timer16_priv, cs);
}
return container_of(cs, struct timer16_priv, cs);
}
-static
cycle_t
timer16_clocksource_read(struct clocksource *cs)
+static
u64
timer16_clocksource_read(struct clocksource *cs)
{
struct timer16_priv *p = cs_to_priv(cs);
unsigned long raw, value;
{
struct timer16_priv *p = cs_to_priv(cs);
unsigned long raw, value;
diff --git
a/drivers/clocksource/h8300_tpu.c
b/drivers/clocksource/h8300_tpu.c
index 7bdf1991c847448525c3dc9d6fddf4e758361375..72e1cf2b30962ee09bd04b3c4fbaaa5654c3f39b 100644
(file)
--- a/
drivers/clocksource/h8300_tpu.c
+++ b/
drivers/clocksource/h8300_tpu.c
@@
-64,7
+64,7
@@
static inline struct tpu_priv *cs_to_priv(struct clocksource *cs)
return container_of(cs, struct tpu_priv, cs);
}
return container_of(cs, struct tpu_priv, cs);
}
-static
cycle_t
tpu_clocksource_read(struct clocksource *cs)
+static
u64
tpu_clocksource_read(struct clocksource *cs)
{
struct tpu_priv *p = cs_to_priv(cs);
unsigned long flags;
{
struct tpu_priv *p = cs_to_priv(cs);
unsigned long flags;
diff --git
a/drivers/clocksource/i8253.c
b/drivers/clocksource/i8253.c
index 0efd36e483ab416bf01c34e8250afc78faca035a..64f6490740d78b19b58f31178554630542685fc4 100644
(file)
--- a/
drivers/clocksource/i8253.c
+++ b/
drivers/clocksource/i8253.c
@@
-25,7
+25,7
@@
EXPORT_SYMBOL(i8253_lock);
* to just read by itself. So use jiffies to emulate a free
* running counter:
*/
* to just read by itself. So use jiffies to emulate a free
* running counter:
*/
-static
cycle_t
i8253_read(struct clocksource *cs)
+static
u64
i8253_read(struct clocksource *cs)
{
static int old_count;
static u32 old_jifs;
{
static int old_count;
static u32 old_jifs;
@@
-83,7
+83,7
@@
static cycle_t i8253_read(struct clocksource *cs)
count = (PIT_LATCH - 1) - count;
count = (PIT_LATCH - 1) - count;
- return (
cycle_t
)(jifs * PIT_LATCH) + count;
+ return (
u64
)(jifs * PIT_LATCH) + count;
}
static struct clocksource i8253_cs = {
}
static struct clocksource i8253_cs = {
diff --git
a/drivers/clocksource/jcore-pit.c
b/drivers/clocksource/jcore-pit.c
index 54e1665aa03c26c20b5e6236e1d3aac4be6871f3..e90a6cfcb061f388618bbb09f724ae32163679f7 100644
(file)
--- a/
drivers/clocksource/jcore-pit.c
+++ b/
drivers/clocksource/jcore-pit.c
@@
-57,7
+57,7
@@
static notrace u64 jcore_sched_clock_read(void)
return seclo * NSEC_PER_SEC + nsec;
}
return seclo * NSEC_PER_SEC + nsec;
}
-static
cycle_t
jcore_clocksource_read(struct clocksource *cs)
+static
u64
jcore_clocksource_read(struct clocksource *cs)
{
return jcore_sched_clock_read();
}
{
return jcore_sched_clock_read();
}
diff --git
a/drivers/clocksource/metag_generic.c
b/drivers/clocksource/metag_generic.c
index a80ab3e446b7111476a007f975930572f7afe537..8d06a0f7ff268dc236a5d22500ee2c851bb9ab8a 100644
(file)
--- a/
drivers/clocksource/metag_generic.c
+++ b/
drivers/clocksource/metag_generic.c
@@
-56,7
+56,7
@@
static int metag_timer_set_next_event(unsigned long delta,
return 0;
}
return 0;
}
-static
cycle_t
metag_clocksource_read(struct clocksource *cs)
+static
u64
metag_clocksource_read(struct clocksource *cs)
{
return __core_reg_get(TXTIMER);
}
{
return __core_reg_get(TXTIMER);
}
diff --git
a/drivers/clocksource/mips-gic-timer.c
b/drivers/clocksource/mips-gic-timer.c
index 7a960cd0110494a0c5b885fd6e89b81f3fec9c9c..7b86d07c99b4ce0327e0f517be7b328a248880a3 100644
(file)
--- a/
drivers/clocksource/mips-gic-timer.c
+++ b/
drivers/clocksource/mips-gic-timer.c
@@
-125,7
+125,7
@@
static int gic_clockevent_init(void)
return 0;
}
return 0;
}
-static
cycle_t
gic_hpt_read(struct clocksource *cs)
+static
u64
gic_hpt_read(struct clocksource *cs)
{
return gic_read_count();
}
{
return gic_read_count();
}
diff --git
a/drivers/clocksource/mmio.c
b/drivers/clocksource/mmio.c
index c4f7d7a9b68987e861bb52ea807f919ca785a1c9..4c4df981d8ccc9fbe6a05f1de56dea642089f24a 100644
(file)
--- a/
drivers/clocksource/mmio.c
+++ b/
drivers/clocksource/mmio.c
@@
-20,24
+20,24
@@
static inline struct clocksource_mmio *to_mmio_clksrc(struct clocksource *c)
return container_of(c, struct clocksource_mmio, clksrc);
}
return container_of(c, struct clocksource_mmio, clksrc);
}
-
cycle_t
clocksource_mmio_readl_up(struct clocksource *c)
+
u64
clocksource_mmio_readl_up(struct clocksource *c)
{
{
- return (
cycle_t
)readl_relaxed(to_mmio_clksrc(c)->reg);
+ return (
u64
)readl_relaxed(to_mmio_clksrc(c)->reg);
}
}
-
cycle_t
clocksource_mmio_readl_down(struct clocksource *c)
+
u64
clocksource_mmio_readl_down(struct clocksource *c)
{
{
- return ~(
cycle_t
)readl_relaxed(to_mmio_clksrc(c)->reg) & c->mask;
+ return ~(
u64
)readl_relaxed(to_mmio_clksrc(c)->reg) & c->mask;
}
}
-
cycle_t
clocksource_mmio_readw_up(struct clocksource *c)
+
u64
clocksource_mmio_readw_up(struct clocksource *c)
{
{
- return (
cycle_t
)readw_relaxed(to_mmio_clksrc(c)->reg);
+ return (
u64
)readw_relaxed(to_mmio_clksrc(c)->reg);
}
}
-
cycle_t
clocksource_mmio_readw_down(struct clocksource *c)
+
u64
clocksource_mmio_readw_down(struct clocksource *c)
{
{
- return ~(
cycle_t
)readw_relaxed(to_mmio_clksrc(c)->reg) & c->mask;
+ return ~(
u64
)readw_relaxed(to_mmio_clksrc(c)->reg) & c->mask;
}
/**
}
/**
@@
-51,7
+51,7
@@
cycle_t clocksource_mmio_readw_down(struct clocksource *c)
*/
int __init clocksource_mmio_init(void __iomem *base, const char *name,
unsigned long hz, int rating, unsigned bits,
*/
int __init clocksource_mmio_init(void __iomem *base, const char *name,
unsigned long hz, int rating, unsigned bits,
-
cycle_t
(*read)(struct clocksource *))
+
u64
(*read)(struct clocksource *))
{
struct clocksource_mmio *cs;
{
struct clocksource_mmio *cs;
diff --git
a/drivers/clocksource/mxs_timer.c
b/drivers/clocksource/mxs_timer.c
index 0ba0a913b41d113e7459b6dc21e07e00bb0d0648..99b77aff08395e887e824cf28cd373ce3a1e1560 100644
(file)
--- a/
drivers/clocksource/mxs_timer.c
+++ b/
drivers/clocksource/mxs_timer.c
@@
-97,7
+97,7
@@
static void timrot_irq_acknowledge(void)
HW_TIMROT_TIMCTRLn(0) + STMP_OFFSET_REG_CLR);
}
HW_TIMROT_TIMCTRLn(0) + STMP_OFFSET_REG_CLR);
}
-static
cycle_t
timrotv1_get_cycles(struct clocksource *cs)
+static
u64
timrotv1_get_cycles(struct clocksource *cs)
{
return ~((__raw_readl(mxs_timrot_base + HW_TIMROT_TIMCOUNTn(1))
& 0xffff0000) >> 16);
{
return ~((__raw_readl(mxs_timrot_base + HW_TIMROT_TIMCOUNTn(1))
& 0xffff0000) >> 16);
diff --git
a/drivers/clocksource/qcom-timer.c
b/drivers/clocksource/qcom-timer.c
index 3283cfa2aa526dd9292fde87529d4b794458e97b..d5d048d890d4e662389a82d7db2ac254962daf17 100644
(file)
--- a/
drivers/clocksource/qcom-timer.c
+++ b/
drivers/clocksource/qcom-timer.c
@@
-89,7
+89,7
@@
static struct clock_event_device __percpu *msm_evt;
static void __iomem *source_base;
static void __iomem *source_base;
-static notrace
cycle_t
msm_read_timer_count(struct clocksource *cs)
+static notrace
u64
msm_read_timer_count(struct clocksource *cs)
{
return readl_relaxed(source_base + TIMER_COUNT_VAL);
}
{
return readl_relaxed(source_base + TIMER_COUNT_VAL);
}
diff --git
a/drivers/clocksource/samsung_pwm_timer.c
b/drivers/clocksource/samsung_pwm_timer.c
index 54565bd0093bfc02673d6f27841315c589b8ad70..0093ece661fe613a1bb325b7df56ce48f246793e 100644
(file)
--- a/
drivers/clocksource/samsung_pwm_timer.c
+++ b/
drivers/clocksource/samsung_pwm_timer.c
@@
-307,7
+307,7
@@
static void samsung_clocksource_resume(struct clocksource *cs)
samsung_time_start(pwm.source_id, true);
}
samsung_time_start(pwm.source_id, true);
}
-static
cycle_t
notrace samsung_clocksource_read(struct clocksource *c)
+static
u64
notrace samsung_clocksource_read(struct clocksource *c)
{
return ~readl_relaxed(pwm.source_reg);
}
{
return ~readl_relaxed(pwm.source_reg);
}
diff --git
a/drivers/clocksource/scx200_hrt.c
b/drivers/clocksource/scx200_hrt.c
index 64f9e829443405e86bfdf154db3bceb53791d766..a46660bf65888d36d16ad6635b790ddd46789250 100644
(file)
--- a/
drivers/clocksource/scx200_hrt.c
+++ b/
drivers/clocksource/scx200_hrt.c
@@
-43,10
+43,10
@@
MODULE_PARM_DESC(ppm, "+-adjust to actual XO freq (ppm)");
/* The base timer frequency, * 27 if selected */
#define HRT_FREQ 1000000
/* The base timer frequency, * 27 if selected */
#define HRT_FREQ 1000000
-static
cycle_t
read_hrt(struct clocksource *cs)
+static
u64
read_hrt(struct clocksource *cs)
{
/* Read the timer value */
{
/* Read the timer value */
- return (
cycle_t
) inl(scx200_cb_base + SCx200_TIMER_OFFSET);
+ return (
u64
) inl(scx200_cb_base + SCx200_TIMER_OFFSET);
}
static struct clocksource cs_hrt = {
}
static struct clocksource cs_hrt = {
diff --git
a/drivers/clocksource/sh_cmt.c
b/drivers/clocksource/sh_cmt.c
index 103c49362c68f66f830587a6504e33ad428a1c14..28757edf6aca8ae8943bb01a02e4008b44efd6f1 100644
(file)
--- a/
drivers/clocksource/sh_cmt.c
+++ b/
drivers/clocksource/sh_cmt.c
@@
-612,7
+612,7
@@
static struct sh_cmt_channel *cs_to_sh_cmt(struct clocksource *cs)
return container_of(cs, struct sh_cmt_channel, cs);
}
return container_of(cs, struct sh_cmt_channel, cs);
}
-static
cycle_t
sh_cmt_clocksource_read(struct clocksource *cs)
+static
u64
sh_cmt_clocksource_read(struct clocksource *cs)
{
struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);
unsigned long flags, raw;
{
struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);
unsigned long flags, raw;
diff --git
a/drivers/clocksource/sh_tmu.c
b/drivers/clocksource/sh_tmu.c
index 469e776ec17a5a2cf4528cc41c58d5542b9a0d53..1fbf2aadcfd41875751c57b73024ca541a430852 100644
(file)
--- a/
drivers/clocksource/sh_tmu.c
+++ b/
drivers/clocksource/sh_tmu.c
@@
-255,7
+255,7
@@
static struct sh_tmu_channel *cs_to_sh_tmu(struct clocksource *cs)
return container_of(cs, struct sh_tmu_channel, cs);
}
return container_of(cs, struct sh_tmu_channel, cs);
}
-static
cycle_t
sh_tmu_clocksource_read(struct clocksource *cs)
+static
u64
sh_tmu_clocksource_read(struct clocksource *cs)
{
struct sh_tmu_channel *ch = cs_to_sh_tmu(cs);
{
struct sh_tmu_channel *ch = cs_to_sh_tmu(cs);
diff --git
a/drivers/clocksource/tcb_clksrc.c
b/drivers/clocksource/tcb_clksrc.c
index 4da2af9694a23b267cebdfa52da624e9f43b61fe..d4ca9962a7595a0206710a0dd4a95656f426ae8e 100644
(file)
--- a/
drivers/clocksource/tcb_clksrc.c
+++ b/
drivers/clocksource/tcb_clksrc.c
@@
-41,7
+41,7
@@
static void __iomem *tcaddr;
static void __iomem *tcaddr;
-static
cycle_t
tc_get_cycles(struct clocksource *cs)
+static
u64
tc_get_cycles(struct clocksource *cs)
{
unsigned long flags;
u32 lower, upper;
{
unsigned long flags;
u32 lower, upper;
@@
-56,7
+56,7
@@
static cycle_t tc_get_cycles(struct clocksource *cs)
return (upper << 16) | lower;
}
return (upper << 16) | lower;
}
-static
cycle_t
tc_get_cycles32(struct clocksource *cs)
+static
u64
tc_get_cycles32(struct clocksource *cs)
{
return __raw_readl(tcaddr + ATMEL_TC_REG(0, CV));
}
{
return __raw_readl(tcaddr + ATMEL_TC_REG(0, CV));
}
diff --git
a/drivers/clocksource/time-pistachio.c
b/drivers/clocksource/time-pistachio.c
index a8e6c7df853d2c64914c04af5785f61a51d56880..3710e4d9dcba065117e9b435e0f7428dea0d1f23 100644
(file)
--- a/
drivers/clocksource/time-pistachio.c
+++ b/
drivers/clocksource/time-pistachio.c
@@
-67,7
+67,7
@@
static inline void gpt_writel(void __iomem *base, u32 value, u32 offset,
writel(value, base + 0x20 * gpt_id + offset);
}
writel(value, base + 0x20 * gpt_id + offset);
}
-static
cycle_t
notrace
+static
u64
notrace
pistachio_clocksource_read_cycles(struct clocksource *cs)
{
struct pistachio_clocksource *pcs = to_pistachio_clocksource(cs);
pistachio_clocksource_read_cycles(struct clocksource *cs)
{
struct pistachio_clocksource *pcs = to_pistachio_clocksource(cs);
@@
-84,7
+84,7
@@
pistachio_clocksource_read_cycles(struct clocksource *cs)
counter = gpt_readl(pcs->base, TIMER_CURRENT_VALUE, 0);
raw_spin_unlock_irqrestore(&pcs->lock, flags);
counter = gpt_readl(pcs->base, TIMER_CURRENT_VALUE, 0);
raw_spin_unlock_irqrestore(&pcs->lock, flags);
- return (
cycle_t
)~counter;
+ return (
u64
)~counter;
}
static u64 notrace pistachio_read_sched_clock(void)
}
static u64 notrace pistachio_read_sched_clock(void)
diff --git
a/drivers/clocksource/timer-atlas7.c
b/drivers/clocksource/timer-atlas7.c
index 4334e0330ada48729cd63a7033eacc45fc84c8f1..db0f21e7d7d25ee02a15b0acb74786c021637149 100644
(file)
--- a/
drivers/clocksource/timer-atlas7.c
+++ b/
drivers/clocksource/timer-atlas7.c
@@
-85,7
+85,7
@@
static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id)
}
/* read 64-bit timer counter */
}
/* read 64-bit timer counter */
-static
cycle_t
sirfsoc_timer_read(struct clocksource *cs)
+static
u64
sirfsoc_timer_read(struct clocksource *cs)
{
u64 cycles;
{
u64 cycles;
diff --git
a/drivers/clocksource/timer-atmel-pit.c
b/drivers/clocksource/timer-atmel-pit.c
index 6555821bbdaec2c9f833bdd59dadf0498483dcab..c0b5df3167a0357cfd8f2df315a97426159acbfc 100644
(file)
--- a/
drivers/clocksource/timer-atmel-pit.c
+++ b/
drivers/clocksource/timer-atmel-pit.c
@@
-73,7
+73,7
@@
static inline void pit_write(void __iomem *base, unsigned int reg_offset, unsign
* Clocksource: just a monotonic counter of MCK/16 cycles.
* We don't care whether or not PIT irqs are enabled.
*/
* Clocksource: just a monotonic counter of MCK/16 cycles.
* We don't care whether or not PIT irqs are enabled.
*/
-static
cycle_t
read_pit_clk(struct clocksource *cs)
+static
u64
read_pit_clk(struct clocksource *cs)
{
struct pit_data *data = clksrc_to_pit_data(cs);
unsigned long flags;
{
struct pit_data *data = clksrc_to_pit_data(cs);
unsigned long flags;
diff --git
a/drivers/clocksource/timer-atmel-st.c
b/drivers/clocksource/timer-atmel-st.c
index e90ab5b63a9068ec3901b85cab9b230db67a837c..be4ac76041364fec5d7a5597dd52a286a2cccef3 100644
(file)
--- a/
drivers/clocksource/timer-atmel-st.c
+++ b/
drivers/clocksource/timer-atmel-st.c
@@
-92,7
+92,7
@@
static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id)
return IRQ_NONE;
}
return IRQ_NONE;
}
-static
cycle_t
read_clk32k(struct clocksource *cs)
+static
u64
read_clk32k(struct clocksource *cs)
{
return read_CRTR();
}
{
return read_CRTR();
}
diff --git
a/drivers/clocksource/timer-nps.c
b/drivers/clocksource/timer-nps.c
index 8da5e93b681041f6e1a26585f614b7c6b3b71a5c..da1f7986e477eb18a2a7cd8bef365cc72d07808c 100644
(file)
--- a/
drivers/clocksource/timer-nps.c
+++ b/
drivers/clocksource/timer-nps.c
@@
-77,11
+77,11
@@
static int __init nps_get_timer_clk(struct device_node *node,
return 0;
}
return 0;
}
-static
cycle_t
nps_clksrc_read(struct clocksource *clksrc)
+static
u64
nps_clksrc_read(struct clocksource *clksrc)
{
int cluster = raw_smp_processor_id() >> NPS_CLUSTER_OFFSET;
{
int cluster = raw_smp_processor_id() >> NPS_CLUSTER_OFFSET;
- return (
cycle_t
)ioread32be(nps_msu_reg_low_addr[cluster]);
+ return (
u64
)ioread32be(nps_msu_reg_low_addr[cluster]);
}
static int __init nps_setup_clocksource(struct device_node *node)
}
static int __init nps_setup_clocksource(struct device_node *node)
diff --git
a/drivers/clocksource/timer-prima2.c
b/drivers/clocksource/timer-prima2.c
index c32148ec7a384dc58921c40515786491033ff5e8..bfa981ac1eaf5908c14614d40e714634e867c4b8 100644
(file)
--- a/
drivers/clocksource/timer-prima2.c
+++ b/
drivers/clocksource/timer-prima2.c
@@
-72,7
+72,7
@@
static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id)
}
/* read 64-bit timer counter */
}
/* read 64-bit timer counter */
-static
cycle_t
notrace sirfsoc_timer_read(struct clocksource *cs)
+static
u64
notrace sirfsoc_timer_read(struct clocksource *cs)
{
u64 cycles;
{
u64 cycles;
diff --git
a/drivers/clocksource/timer-sun5i.c
b/drivers/clocksource/timer-sun5i.c
index 4f87f3e76d8328ec6ca462882f873a51b2f72995..a3e662b15964ef9be3669884f45b739a828edf47 100644
(file)
--- a/
drivers/clocksource/timer-sun5i.c
+++ b/
drivers/clocksource/timer-sun5i.c
@@
-152,7
+152,7
@@
static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static
cycle_t
sun5i_clksrc_read(struct clocksource *clksrc)
+static
u64
sun5i_clksrc_read(struct clocksource *clksrc)
{
struct sun5i_timer_clksrc *cs = to_sun5i_timer_clksrc(clksrc);
{
struct sun5i_timer_clksrc *cs = to_sun5i_timer_clksrc(clksrc);
diff --git
a/drivers/clocksource/timer-ti-32k.c
b/drivers/clocksource/timer-ti-32k.c
index cf5b14e442e43beac3a799a679cd863ca1a314fe..624067712ef0383b8805b39d164f33c42014a044 100644
(file)
--- a/
drivers/clocksource/timer-ti-32k.c
+++ b/
drivers/clocksource/timer-ti-32k.c
@@
-65,11
+65,11
@@
static inline struct ti_32k *to_ti_32k(struct clocksource *cs)
return container_of(cs, struct ti_32k, cs);
}
return container_of(cs, struct ti_32k, cs);
}
-static
cycle_t
notrace ti_32k_read_cycles(struct clocksource *cs)
+static
u64
notrace ti_32k_read_cycles(struct clocksource *cs)
{
struct ti_32k *ti = to_ti_32k(cs);
{
struct ti_32k *ti = to_ti_32k(cs);
- return (
cycle_t
)readl_relaxed(ti->counter);
+ return (
u64
)readl_relaxed(ti->counter);
}
static struct ti_32k ti_32k_timer = {
}
static struct ti_32k ti_32k_timer = {
diff --git
a/drivers/clocksource/vt8500_timer.c
b/drivers/clocksource/vt8500_timer.c
index b15069483fbde1b655fa0932b10a6d6be4fa3d44..d02b51075ad1d2bf1c0cf87bb0bf4eb3da960af4 100644
(file)
--- a/
drivers/clocksource/vt8500_timer.c
+++ b/
drivers/clocksource/vt8500_timer.c
@@
-53,7
+53,7
@@
static void __iomem *regbase;
static void __iomem *regbase;
-static
cycle_t
vt8500_timer_read(struct clocksource *cs)
+static
u64
vt8500_timer_read(struct clocksource *cs)
{
int loops = msecs_to_loops(10);
writel(3, regbase + TIMER_CTRL_VAL);
{
int loops = msecs_to_loops(10);
writel(3, regbase + TIMER_CTRL_VAL);
@@
-75,7
+75,7
@@
static int vt8500_timer_set_next_event(unsigned long cycles,
struct clock_event_device *evt)
{
int loops = msecs_to_loops(10);
struct clock_event_device *evt)
{
int loops = msecs_to_loops(10);
-
cycle_t
alarm = clocksource.read(&clocksource) + cycles;
+
u64
alarm = clocksource.read(&clocksource) + cycles;
while ((readl(regbase + TIMER_AS_VAL) & TIMER_MATCH_W_ACTIVE)
&& --loops)
cpu_relax();
while ((readl(regbase + TIMER_AS_VAL) & TIMER_MATCH_W_ACTIVE)
&& --loops)
cpu_relax();
diff --git
a/drivers/hv/hv.c
b/drivers/hv/hv.c
index 446802ae8f1bc6b72f41b468ee9e32c145378fb3..b44b32f21e61db00a2db56db81c4e4a1a04053db 100644
(file)
--- a/
drivers/hv/hv.c
+++ b/
drivers/hv/hv.c
@@
-135,9
+135,9
@@
u64 hv_do_hypercall(u64 control, void *input, void *output)
EXPORT_SYMBOL_GPL(hv_do_hypercall);
#ifdef CONFIG_X86_64
EXPORT_SYMBOL_GPL(hv_do_hypercall);
#ifdef CONFIG_X86_64
-static
cycle_t
read_hv_clock_tsc(struct clocksource *arg)
+static
u64
read_hv_clock_tsc(struct clocksource *arg)
{
{
-
cycle_t
current_tick;
+
u64
current_tick;
struct ms_hyperv_tsc_page *tsc_pg = hv_context.tsc_page;
if (tsc_pg->tsc_sequence != 0) {
struct ms_hyperv_tsc_page *tsc_pg = hv_context.tsc_page;
if (tsc_pg->tsc_sequence != 0) {
@@
-146,7
+146,7
@@
static cycle_t read_hv_clock_tsc(struct clocksource *arg)
*/
while (1) {
*/
while (1) {
-
cycle_t
tmp;
+
u64
tmp;
u32 sequence = tsc_pg->tsc_sequence;
u64 cur_tsc;
u64 scale = tsc_pg->tsc_scale;
u32 sequence = tsc_pg->tsc_sequence;
u64 cur_tsc;
u64 scale = tsc_pg->tsc_scale;
@@
-350,7
+350,7
@@
int hv_post_message(union hv_connection_id connection_id,
static int hv_ce_set_next_event(unsigned long delta,
struct clock_event_device *evt)
{
static int hv_ce_set_next_event(unsigned long delta,
struct clock_event_device *evt)
{
-
cycle_t
current_tick;
+
u64
current_tick;
WARN_ON(!clockevent_state_oneshot(evt));
WARN_ON(!clockevent_state_oneshot(evt));
diff --git
a/drivers/irqchip/irq-mips-gic.c
b/drivers/irqchip/irq-mips-gic.c
index c0178a1229402b6e2185d67d3481922ad4994916..c01c09e9916d3f87a6bdbdae79bebeb0f9fffd39 100644
(file)
--- a/
drivers/irqchip/irq-mips-gic.c
+++ b/
drivers/irqchip/irq-mips-gic.c
@@
-152,12
+152,12
@@
static inline void gic_map_to_vpe(unsigned int intr, unsigned int vpe)
}
#ifdef CONFIG_CLKSRC_MIPS_GIC
}
#ifdef CONFIG_CLKSRC_MIPS_GIC
-
cycle_t
gic_read_count(void)
+
u64
gic_read_count(void)
{
unsigned int hi, hi2, lo;
if (mips_cm_is64)
{
unsigned int hi, hi2, lo;
if (mips_cm_is64)
- return (
cycle_t
)gic_read(GIC_REG(SHARED, GIC_SH_COUNTER));
+ return (
u64
)gic_read(GIC_REG(SHARED, GIC_SH_COUNTER));
do {
hi = gic_read32(GIC_REG(SHARED, GIC_SH_COUNTER_63_32));
do {
hi = gic_read32(GIC_REG(SHARED, GIC_SH_COUNTER_63_32));
@@
-165,7
+165,7
@@
cycle_t gic_read_count(void)
hi2 = gic_read32(GIC_REG(SHARED, GIC_SH_COUNTER_63_32));
} while (hi2 != hi);
hi2 = gic_read32(GIC_REG(SHARED, GIC_SH_COUNTER_63_32));
} while (hi2 != hi);
- return (((
cycle_t
) hi) << 32) + lo;
+ return (((
u64
) hi) << 32) + lo;
}
unsigned int gic_get_count_width(void)
}
unsigned int gic_get_count_width(void)
@@
-179,7
+179,7
@@
unsigned int gic_get_count_width(void)
return bits;
}
return bits;
}
-void gic_write_compare(
cycle_t
cnt)
+void gic_write_compare(
u64
cnt)
{
if (mips_cm_is64) {
gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE), cnt);
{
if (mips_cm_is64) {
gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE), cnt);
@@
-191,7
+191,7
@@
void gic_write_compare(cycle_t cnt)
}
}
}
}
-void gic_write_cpu_compare(
cycle_t
cnt, int cpu)
+void gic_write_cpu_compare(
u64
cnt, int cpu)
{
unsigned long flags;
{
unsigned long flags;
@@
-211,17
+211,17
@@
void gic_write_cpu_compare(cycle_t cnt, int cpu)
local_irq_restore(flags);
}
local_irq_restore(flags);
}
-
cycle_t
gic_read_compare(void)
+
u64
gic_read_compare(void)
{
unsigned int hi, lo;
if (mips_cm_is64)
{
unsigned int hi, lo;
if (mips_cm_is64)
- return (
cycle_t
)gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE));
+ return (
u64
)gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE));
hi = gic_read32(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_HI));
lo = gic_read32(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_LO));
hi = gic_read32(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_HI));
lo = gic_read32(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_LO));
- return (((
cycle_t
) hi) << 32) + lo;
+ return (((
u64
) hi) << 32) + lo;
}
void gic_start_count(void)
}
void gic_start_count(void)
diff --git
a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
index b03e4f58d02ea550b4a19d7e4f7113ec3b48e4e0..a533a6cc2d530258c3875150565d35aa6fa55fc5 100644
(file)
--- a/
drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
+++ b/
drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
@@
-122,7
+122,7
@@
#include "xgbe.h"
#include "xgbe-common.h"
#include "xgbe.h"
#include "xgbe-common.h"
-static
cycle_t
xgbe_cc_read(const struct cyclecounter *cc)
+static
u64
xgbe_cc_read(const struct cyclecounter *cc)
{
struct xgbe_prv_data *pdata = container_of(cc,
struct xgbe_prv_data,
{
struct xgbe_prv_data *pdata = container_of(cc,
struct xgbe_prv_data,
diff --git
a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 688617ac8c29b5b3db2d6ade057d3a79c360d998..d8d06fdfc42b9d685244513c1542b69bd78d7ca9 100644
(file)
--- a/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@
-15223,7
+15223,7
@@
void bnx2x_set_rx_ts(struct bnx2x *bp, struct sk_buff *skb)
}
/* Read the PHC */
}
/* Read the PHC */
-static
cycle_t
bnx2x_cyclecounter_read(const struct cyclecounter *cc)
+static
u64
bnx2x_cyclecounter_read(const struct cyclecounter *cc)
{
struct bnx2x *bp = container_of(cc, struct bnx2x, cyclecounter);
int port = BP_PORT(bp);
{
struct bnx2x *bp = container_of(cc, struct bnx2x, cyclecounter);
int port = BP_PORT(bp);
diff --git
a/drivers/net/ethernet/freescale/fec_ptp.c
b/drivers/net/ethernet/freescale/fec_ptp.c
index f9e74461bdc0b089c64b751571e8a999a050433b..6ebad3fac81d17e3513de1f7c3d9eec31e56b71e 100644
(file)
--- a/
drivers/net/ethernet/freescale/fec_ptp.c
+++ b/
drivers/net/ethernet/freescale/fec_ptp.c
@@
-230,7
+230,7
@@
static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable)
* cyclecounter structure used to construct a ns counter from the
* arbitrary fixed point registers
*/
* cyclecounter structure used to construct a ns counter from the
* arbitrary fixed point registers
*/
-static
cycle_t
fec_ptp_read(const struct cyclecounter *cc)
+static
u64
fec_ptp_read(const struct cyclecounter *cc)
{
struct fec_enet_private *fep =
container_of(cc, struct fec_enet_private, cc);
{
struct fec_enet_private *fep =
container_of(cc, struct fec_enet_private, cc);
diff --git
a/drivers/net/ethernet/intel/e1000e/netdev.c
b/drivers/net/ethernet/intel/e1000e/netdev.c
index ffcf35af48814f44312561536090635a69473230..eccf1da9356badc85df416cca1a519bb1ec417bc 100644
(file)
--- a/
drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/
drivers/net/ethernet/intel/e1000e/netdev.c
@@
-4305,24
+4305,24
@@
void e1000e_reinit_locked(struct e1000_adapter *adapter)
/**
* e1000e_sanitize_systim - sanitize raw cycle counter reads
* @hw: pointer to the HW structure
/**
* e1000e_sanitize_systim - sanitize raw cycle counter reads
* @hw: pointer to the HW structure
- * @systim:
cycle_t
value read, sanitized and returned
+ * @systim:
time
value read, sanitized and returned
*
* Errata for 82574/82583 possible bad bits read from SYSTIMH/L:
* check to see that the time is incrementing at a reasonable
* rate and is a multiple of incvalue.
**/
*
* Errata for 82574/82583 possible bad bits read from SYSTIMH/L:
* check to see that the time is incrementing at a reasonable
* rate and is a multiple of incvalue.
**/
-static
cycle_t e1000e_sanitize_systim(struct e1000_hw *hw, cycle_t
systim)
+static
u64 e1000e_sanitize_systim(struct e1000_hw *hw, u64
systim)
{
u64 time_delta, rem, temp;
{
u64 time_delta, rem, temp;
-
cycle_t
systim_next;
+
u64
systim_next;
u32 incvalue;
int i;
incvalue = er32(TIMINCA) & E1000_TIMINCA_INCVALUE_MASK;
for (i = 0; i < E1000_MAX_82574_SYSTIM_REREADS; i++) {
/* latch SYSTIMH on read of SYSTIML */
u32 incvalue;
int i;
incvalue = er32(TIMINCA) & E1000_TIMINCA_INCVALUE_MASK;
for (i = 0; i < E1000_MAX_82574_SYSTIM_REREADS; i++) {
/* latch SYSTIMH on read of SYSTIML */
- systim_next = (
cycle_t
)er32(SYSTIML);
- systim_next |= (
cycle_t
)er32(SYSTIMH) << 32;
+ systim_next = (
u64
)er32(SYSTIML);
+ systim_next |= (
u64
)er32(SYSTIMH) << 32;
time_delta = systim_next - systim;
temp = time_delta;
time_delta = systim_next - systim;
temp = time_delta;
@@
-4342,13
+4342,13
@@
static cycle_t e1000e_sanitize_systim(struct e1000_hw *hw, cycle_t systim)
* e1000e_cyclecounter_read - read raw cycle counter (used by time counter)
* @cc: cyclecounter structure
**/
* e1000e_cyclecounter_read - read raw cycle counter (used by time counter)
* @cc: cyclecounter structure
**/
-static
cycle_t
e1000e_cyclecounter_read(const struct cyclecounter *cc)
+static
u64
e1000e_cyclecounter_read(const struct cyclecounter *cc)
{
struct e1000_adapter *adapter = container_of(cc, struct e1000_adapter,
cc);
struct e1000_hw *hw = &adapter->hw;
u32 systimel, systimeh;
{
struct e1000_adapter *adapter = container_of(cc, struct e1000_adapter,
cc);
struct e1000_hw *hw = &adapter->hw;
u32 systimel, systimeh;
-
cycle_t
systim;
+
u64
systim;
/* SYSTIMH latching upon SYSTIML read does not work well.
* This means that if SYSTIML overflows after we read it but before
* we read SYSTIMH, the value of SYSTIMH has been incremented and we
/* SYSTIMH latching upon SYSTIML read does not work well.
* This means that if SYSTIML overflows after we read it but before
* we read SYSTIMH, the value of SYSTIMH has been incremented and we
@@
-4368,8
+4368,8
@@
static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc)
systimel = systimel_2;
}
}
systimel = systimel_2;
}
}
- systim = (
cycle_t
)systimel;
- systim |= (
cycle_t
)systimeh << 32;
+ systim = (
u64
)systimel;
+ systim |= (
u64
)systimeh << 32;
if (adapter->flags2 & FLAG2_CHECK_SYSTIM_OVERFLOW)
systim = e1000e_sanitize_systim(hw, systim);
if (adapter->flags2 & FLAG2_CHECK_SYSTIM_OVERFLOW)
systim = e1000e_sanitize_systim(hw, systim);
diff --git
a/drivers/net/ethernet/intel/e1000e/ptp.c
b/drivers/net/ethernet/intel/e1000e/ptp.c
index ad03763e009ae4d1e6796c78b865a9bdda6b8489..34cc3be0df8ed7a44e56d4187aef2747dd2620bd 100644
(file)
--- a/
drivers/net/ethernet/intel/e1000e/ptp.c
+++ b/
drivers/net/ethernet/intel/e1000e/ptp.c
@@
-127,8
+127,8
@@
static int e1000e_phc_get_syncdevicetime(ktime_t *device,
unsigned long flags;
int i;
u32 tsync_ctrl;
unsigned long flags;
int i;
u32 tsync_ctrl;
-
cycle_t
dev_cycles;
-
cycle_t
sys_cycles;
+
u64
dev_cycles;
+
u64
sys_cycles;
tsync_ctrl = er32(TSYNCTXCTL);
tsync_ctrl |= E1000_TSYNCTXCTL_START_SYNC |
tsync_ctrl = er32(TSYNCTXCTL);
tsync_ctrl |= E1000_TSYNCTXCTL_START_SYNC |
diff --git
a/drivers/net/ethernet/intel/igb/igb_ptp.c
b/drivers/net/ethernet/intel/igb/igb_ptp.c
index c30eea8399a7dfb4de23717d33e8169e054cd600..c4477552ce9ef2e153eb1678c783ff9e9fb08eb8 100644
(file)
--- a/
drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/
drivers/net/ethernet/intel/igb/igb_ptp.c
@@
-77,7
+77,7
@@
static void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter);
/* SYSTIM read access for the 82576 */
static void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter);
/* SYSTIM read access for the 82576 */
-static
cycle_t
igb_ptp_read_82576(const struct cyclecounter *cc)
+static
u64
igb_ptp_read_82576(const struct cyclecounter *cc)
{
struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
struct e1000_hw *hw = &igb->hw;
{
struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
struct e1000_hw *hw = &igb->hw;
@@
-94,7
+94,7
@@
static cycle_t igb_ptp_read_82576(const struct cyclecounter *cc)
}
/* SYSTIM read access for the 82580 */
}
/* SYSTIM read access for the 82580 */
-static
cycle_t
igb_ptp_read_82580(const struct cyclecounter *cc)
+static
u64
igb_ptp_read_82580(const struct cyclecounter *cc)
{
struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
struct e1000_hw *hw = &igb->hw;
{
struct igb_adapter *igb = container_of(cc, struct igb_adapter, cc);
struct e1000_hw *hw = &igb->hw;
diff --git
a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index a92277683a649b4bf7f42987a7d0ecdad311f04c..1efb404431e95bb97752935b3061aca852133820 100644
(file)
--- a/
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@
-245,7
+245,7
@@
static void ixgbe_ptp_setup_sdp_x540(struct ixgbe_adapter *adapter)
* result of SYSTIME is 32bits of "billions of cycles" and 32 bits of
* "cycles", rather than seconds and nanoseconds.
*/
* result of SYSTIME is 32bits of "billions of cycles" and 32 bits of
* "cycles", rather than seconds and nanoseconds.
*/
-static
cycle_t
ixgbe_ptp_read_X550(const struct cyclecounter *hw_cc)
+static
u64
ixgbe_ptp_read_X550(const struct cyclecounter *hw_cc)
{
struct ixgbe_adapter *adapter =
container_of(hw_cc, struct ixgbe_adapter, hw_cc);
{
struct ixgbe_adapter *adapter =
container_of(hw_cc, struct ixgbe_adapter, hw_cc);
@@
-282,7
+282,7
@@
static cycle_t ixgbe_ptp_read_X550(const struct cyclecounter *hw_cc)
* cyclecounter structure used to construct a ns counter from the
* arbitrary fixed point registers
*/
* cyclecounter structure used to construct a ns counter from the
* arbitrary fixed point registers
*/
-static
cycle_t
ixgbe_ptp_read_82599(const struct cyclecounter *cc)
+static
u64
ixgbe_ptp_read_82599(const struct cyclecounter *cc)
{
struct ixgbe_adapter *adapter =
container_of(cc, struct ixgbe_adapter, hw_cc);
{
struct ixgbe_adapter *adapter =
container_of(cc, struct ixgbe_adapter, hw_cc);
diff --git
a/drivers/net/ethernet/mellanox/mlx4/en_clock.c
b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
index a5fc46bbcbe224373b768633f600f3d66d4865d5..015198c14fa8531589f4443cb770989d629f51e6 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx4/en_clock.c
+++ b/
drivers/net/ethernet/mellanox/mlx4/en_clock.c
@@
-38,7
+38,7
@@
/* mlx4_en_read_clock - read raw cycle counter (to be used by time counter)
*/
/* mlx4_en_read_clock - read raw cycle counter (to be used by time counter)
*/
-static
cycle_t
mlx4_en_read_clock(const struct cyclecounter *tc)
+static
u64
mlx4_en_read_clock(const struct cyclecounter *tc)
{
struct mlx4_en_dev *mdev =
container_of(tc, struct mlx4_en_dev, cycles);
{
struct mlx4_en_dev *mdev =
container_of(tc, struct mlx4_en_dev, cycles);
diff --git
a/drivers/net/ethernet/mellanox/mlx4/main.c
b/drivers/net/ethernet/mellanox/mlx4/main.c
index b2ca8a635b2e0b4e974acf649ba6c9be9cae00e2..5e7840a7a33b55e9dc89efa43b349823d5b2e003 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/
drivers/net/ethernet/mellanox/mlx4/main.c
@@
-1823,10
+1823,10
@@
static void unmap_bf_area(struct mlx4_dev *dev)
io_mapping_free(mlx4_priv(dev)->bf_mapping);
}
io_mapping_free(mlx4_priv(dev)->bf_mapping);
}
-
cycle_t
mlx4_read_clock(struct mlx4_dev *dev)
+
u64
mlx4_read_clock(struct mlx4_dev *dev)
{
u32 clockhi, clocklo, clockhi1;
{
u32 clockhi, clocklo, clockhi1;
-
cycle_t
cycles;
+
u64
cycles;
int i;
struct mlx4_priv *priv = mlx4_priv(dev);
int i;
struct mlx4_priv *priv = mlx4_priv(dev);
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c
b/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c
index 2cd8e56a573be122a1568687fe436ead5e75ceda..746a92c1364435da17275527f8a2c06f6f48624b 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/en_clock.c
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/en_clock.c
@@
-49,7
+49,7
@@
void mlx5e_fill_hwstamp(struct mlx5e_tstamp *tstamp, u64 timestamp,
hwts->hwtstamp = ns_to_ktime(nsec);
}
hwts->hwtstamp = ns_to_ktime(nsec);
}
-static
cycle_t
mlx5e_read_internal_timer(const struct cyclecounter *cc)
+static
u64
mlx5e_read_internal_timer(const struct cyclecounter *cc)
{
struct mlx5e_tstamp *tstamp = container_of(cc, struct mlx5e_tstamp,
cycles);
{
struct mlx5e_tstamp *tstamp = container_of(cc, struct mlx5e_tstamp,
cycles);
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/main.c
b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 7b4c339a8a9a233edd0be5b4dd04a09b975810fa..54e5a786f1915deadf3eb181beeef0bf325a178e 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/main.c
@@
-557,7
+557,7
@@
int mlx5_core_disable_hca(struct mlx5_core_dev *dev, u16 func_id)
return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
}
return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
}
-
cycle_t
mlx5_read_internal_timer(struct mlx5_core_dev *dev)
+
u64
mlx5_read_internal_timer(struct mlx5_core_dev *dev)
{
u32 timer_h, timer_h1, timer_l;
{
u32 timer_h, timer_h1, timer_l;
@@
-567,7
+567,7
@@
cycle_t mlx5_read_internal_timer(struct mlx5_core_dev *dev)
if (timer_h != timer_h1) /* wrap around */
timer_l = ioread32be(&dev->iseg->internal_timer_l);
if (timer_h != timer_h1) /* wrap around */
timer_l = ioread32be(&dev->iseg->internal_timer_l);
- return (
cycle_t)timer_l | (cycle_t
)timer_h1 << 32;
+ return (
u64)timer_l | (u64
)timer_h1 << 32;
}
static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
}
static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
index e0a8fbdd1446829e883352ad4cacb3c19f6ad7be..d4a99c9757cbef7bd0a102da9e5277088ef31720 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
@@
-106,7
+106,7
@@
int mlx5_modify_scheduling_element_cmd(struct mlx5_core_dev *dev, u8 hierarchy,
int mlx5_destroy_scheduling_element_cmd(struct mlx5_core_dev *dev, u8 hierarchy,
u32 element_id);
int mlx5_wait_for_vf_pages(struct mlx5_core_dev *dev);
int mlx5_destroy_scheduling_element_cmd(struct mlx5_core_dev *dev, u8 hierarchy,
u32 element_id);
int mlx5_wait_for_vf_pages(struct mlx5_core_dev *dev);
-
cycle_t
mlx5_read_internal_timer(struct mlx5_core_dev *dev);
+
u64
mlx5_read_internal_timer(struct mlx5_core_dev *dev);
u32 mlx5_get_msix_vec(struct mlx5_core_dev *dev, int vecidx);
struct mlx5_eq *mlx5_eqn2eq(struct mlx5_core_dev *dev, int eqn);
void mlx5_cq_tasklet_cb(unsigned long data);
u32 mlx5_get_msix_vec(struct mlx5_core_dev *dev, int vecidx);
struct mlx5_eq *mlx5_eqn2eq(struct mlx5_core_dev *dev, int eqn);
void mlx5_cq_tasklet_cb(unsigned long data);
diff --git
a/drivers/net/ethernet/ti/cpts.c
b/drivers/net/ethernet/ti/cpts.c
index 0c0d48e5bea4ee709764a3cecb22e2490ec0694a..32279d21c8363d4976c6d313599fbc0e015e6a36 100644
(file)
--- a/
drivers/net/ethernet/ti/cpts.c
+++ b/
drivers/net/ethernet/ti/cpts.c
@@
-121,7
+121,7
@@
static int cpts_fifo_read(struct cpts *cpts, int match)
return type == match ? 0 : -1;
}
return type == match ? 0 : -1;
}
-static
cycle_t
cpts_systim_read(const struct cyclecounter *cc)
+static
u64
cpts_systim_read(const struct cyclecounter *cc)
{
u64 val = 0;
struct cpts_event *event;
{
u64 val = 0;
struct cpts_event *event;
diff --git
a/include/kvm/arm_arch_timer.h
b/include/kvm/arm_arch_timer.h
index dda39d8fa189b50d897c7c59bbba5b1f8bdab649..b717ed9d2b755255cfafa76553b3823449f594c2 100644
(file)
--- a/
include/kvm/arm_arch_timer.h
+++ b/
include/kvm/arm_arch_timer.h
@@
-25,13
+25,13
@@
struct arch_timer_kvm {
/* Virtual offset */
struct arch_timer_kvm {
/* Virtual offset */
-
cycle_t
cntvoff;
+
u64
cntvoff;
};
struct arch_timer_cpu {
/* Registers: control register, timer value */
u32 cntv_ctl; /* Saved/restored */
};
struct arch_timer_cpu {
/* Registers: control register, timer value */
u32 cntv_ctl; /* Saved/restored */
-
cycle_t
cntv_cval; /* Saved/restored */
+
u64
cntv_cval; /* Saved/restored */
/*
* Anything that is not used directly from assembly code goes
/*
* Anything that is not used directly from assembly code goes
diff --git
a/include/linux/clocksource.h
b/include/linux/clocksource.h
index 65602d395a52a0b83aaeab8c42384f1a775afc44..e315d04a2fd91ceb94948949d3affd8e12d25748 100644
(file)
--- a/
include/linux/clocksource.h
+++ b/
include/linux/clocksource.h
@@
-75,8
+75,8
@@
struct module;
* structure.
*/
struct clocksource {
* structure.
*/
struct clocksource {
-
cycle_t
(*read)(struct clocksource *cs);
-
cycle_t
mask;
+
u64
(*read)(struct clocksource *cs);
+
u64
mask;
u32 mult;
u32 shift;
u64 max_idle_ns;
u32 mult;
u32 shift;
u64 max_idle_ns;
@@
-98,8
+98,8
@@
struct clocksource {
#ifdef CONFIG_CLOCKSOURCE_WATCHDOG
/* Watchdog related data, used by the framework */
struct list_head wd_list;
#ifdef CONFIG_CLOCKSOURCE_WATCHDOG
/* Watchdog related data, used by the framework */
struct list_head wd_list;
-
cycle_t
cs_last;
-
cycle_t
wd_last;
+
u64
cs_last;
+
u64
wd_last;
#endif
struct module *owner;
};
#endif
struct module *owner;
};
@@
-117,7
+117,7
@@
struct clocksource {
#define CLOCK_SOURCE_RESELECT 0x100
/* simplify initialization of mask field */
#define CLOCK_SOURCE_RESELECT 0x100
/* simplify initialization of mask field */
-#define CLOCKSOURCE_MASK(bits) (
cycle_t
)((bits) < 64 ? ((1ULL<<(bits))-1) : -1)
+#define CLOCKSOURCE_MASK(bits) (
u64
)((bits) < 64 ? ((1ULL<<(bits))-1) : -1)
static inline u32 clocksource_freq2mult(u32 freq, u32 shift_constant, u64 from)
{
static inline u32 clocksource_freq2mult(u32 freq, u32 shift_constant, u64 from)
{
@@
-176,7
+176,7
@@
static inline u32 clocksource_hz2mult(u32 hz, u32 shift_constant)
*
* XXX - This could use some mult_lxl_ll() asm optimization
*/
*
* XXX - This could use some mult_lxl_ll() asm optimization
*/
-static inline s64 clocksource_cyc2ns(
cycle_t
cycles, u32 mult, u32 shift)
+static inline s64 clocksource_cyc2ns(
u64
cycles, u32 mult, u32 shift)
{
return ((u64) cycles * mult) >> shift;
}
{
return ((u64) cycles * mult) >> shift;
}
@@
-236,13
+236,13
@@
static inline void __clocksource_update_freq_khz(struct clocksource *cs, u32 khz
extern int timekeeping_notify(struct clocksource *clock);
extern int timekeeping_notify(struct clocksource *clock);
-extern
cycle_t
clocksource_mmio_readl_up(struct clocksource *);
-extern
cycle_t
clocksource_mmio_readl_down(struct clocksource *);
-extern
cycle_t
clocksource_mmio_readw_up(struct clocksource *);
-extern
cycle_t
clocksource_mmio_readw_down(struct clocksource *);
+extern
u64
clocksource_mmio_readl_up(struct clocksource *);
+extern
u64
clocksource_mmio_readl_down(struct clocksource *);
+extern
u64
clocksource_mmio_readw_up(struct clocksource *);
+extern
u64
clocksource_mmio_readw_down(struct clocksource *);
extern int clocksource_mmio_init(void __iomem *, const char *,
extern int clocksource_mmio_init(void __iomem *, const char *,
- unsigned long, int, unsigned,
cycle_t
(*)(struct clocksource *));
+ unsigned long, int, unsigned,
u64
(*)(struct clocksource *));
extern int clocksource_i8253_init(void);
extern int clocksource_i8253_init(void);
diff --git
a/include/linux/dw_apb_timer.h
b/include/linux/dw_apb_timer.h
index 1f79b20918b1eed2b9b1598cf8a6ccf545b23952..4334106f44c3272c3c8622934c626a8147b136ff 100644
(file)
--- a/
include/linux/dw_apb_timer.h
+++ b/
include/linux/dw_apb_timer.h
@@
-50,6
+50,6
@@
dw_apb_clocksource_init(unsigned rating, const char *name, void __iomem *base,
unsigned long freq);
void dw_apb_clocksource_register(struct dw_apb_clocksource *dw_cs);
void dw_apb_clocksource_start(struct dw_apb_clocksource *dw_cs);
unsigned long freq);
void dw_apb_clocksource_register(struct dw_apb_clocksource *dw_cs);
void dw_apb_clocksource_start(struct dw_apb_clocksource *dw_cs);
-
cycle_t
dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs);
+
u64
dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs);
#endif /* __DW_APB_TIMER_H__ */
#endif /* __DW_APB_TIMER_H__ */
diff --git
a/include/linux/irqchip/mips-gic.h
b/include/linux/irqchip/mips-gic.h
index 81f930b0bca97daf7a05ca5b94c70f77a4fd3b2a..7b49c71c968ba0935a5482afb71055107563542b 100644
(file)
--- a/
include/linux/irqchip/mips-gic.h
+++ b/
include/linux/irqchip/mips-gic.h
@@
-259,11
+259,11
@@
extern void gic_init(unsigned long gic_base_addr,
unsigned long gic_addrspace_size, unsigned int cpu_vec,
unsigned int irqbase);
extern void gic_clocksource_init(unsigned int);
unsigned long gic_addrspace_size, unsigned int cpu_vec,
unsigned int irqbase);
extern void gic_clocksource_init(unsigned int);
-extern
cycle_t
gic_read_count(void);
+extern
u64
gic_read_count(void);
extern unsigned int gic_get_count_width(void);
extern unsigned int gic_get_count_width(void);
-extern
cycle_t
gic_read_compare(void);
-extern void gic_write_compare(
cycle_t
cnt);
-extern void gic_write_cpu_compare(
cycle_t
cnt, int cpu);
+extern
u64
gic_read_compare(void);
+extern void gic_write_compare(
u64
cnt);
+extern void gic_write_cpu_compare(
u64
cnt, int cpu);
extern void gic_start_count(void);
extern void gic_stop_count(void);
extern int gic_get_c0_compare_int(void);
extern void gic_start_count(void);
extern void gic_stop_count(void);
extern int gic_get_c0_compare_int(void);
diff --git
a/include/linux/mlx4/device.h
b/include/linux/mlx4/device.h
index c9f379689dd068beadbdb828fe8f09b521b28f12..93bdb3485192ff7f4094a649f6f98f4cdad02f51 100644
(file)
--- a/
include/linux/mlx4/device.h
+++ b/
include/linux/mlx4/device.h
@@
-1460,7
+1460,7
@@
int mlx4_get_roce_gid_from_slave(struct mlx4_dev *dev, int port, int slave_id,
int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn,
u32 max_range_qpn);
int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn,
u32 max_range_qpn);
-
cycle_t
mlx4_read_clock(struct mlx4_dev *dev);
+
u64
mlx4_read_clock(struct mlx4_dev *dev);
struct mlx4_active_ports {
DECLARE_BITMAP(ports, MLX4_MAX_PORTS);
struct mlx4_active_ports {
DECLARE_BITMAP(ports, MLX4_MAX_PORTS);
diff --git
a/include/linux/timecounter.h
b/include/linux/timecounter.h
index 4382035a75bbcdc65d8099a9b3d2d384e31815ff..2496ad4cfc99d14ca609bd1c9c123f9de6d3b2e0 100644
(file)
--- a/
include/linux/timecounter.h
+++ b/
include/linux/timecounter.h
@@
-20,7
+20,7
@@
#include <linux/types.h>
/* simplify initialization of mask field */
#include <linux/types.h>
/* simplify initialization of mask field */
-#define CYCLECOUNTER_MASK(bits) (
cycle_t
)((bits) < 64 ? ((1ULL<<(bits))-1) : -1)
+#define CYCLECOUNTER_MASK(bits) (
u64
)((bits) < 64 ? ((1ULL<<(bits))-1) : -1)
/**
* struct cyclecounter - hardware abstraction for a free running counter
/**
* struct cyclecounter - hardware abstraction for a free running counter
@@
-37,8
+37,8
@@
* @shift: cycle to nanosecond divisor (power of two)
*/
struct cyclecounter {
* @shift: cycle to nanosecond divisor (power of two)
*/
struct cyclecounter {
-
cycle_t
(*read)(const struct cyclecounter *cc);
-
cycle_t
mask;
+
u64
(*read)(const struct cyclecounter *cc);
+
u64
mask;
u32 mult;
u32 shift;
};
u32 mult;
u32 shift;
};
@@
-63,7
+63,7
@@
struct cyclecounter {
*/
struct timecounter {
const struct cyclecounter *cc;
*/
struct timecounter {
const struct cyclecounter *cc;
-
cycle_t
cycle_last;
+
u64
cycle_last;
u64 nsec;
u64 mask;
u64 frac;
u64 nsec;
u64 mask;
u64 frac;
@@
-77,7
+77,7
@@
struct timecounter {
* @frac: pointer to storage for the fractional nanoseconds.
*/
static inline u64 cyclecounter_cyc2ns(const struct cyclecounter *cc,
* @frac: pointer to storage for the fractional nanoseconds.
*/
static inline u64 cyclecounter_cyc2ns(const struct cyclecounter *cc,
-
cycle_t
cycles, u64 mask, u64 *frac)
+
u64
cycles, u64 mask, u64 *frac)
{
u64 ns = (u64) cycles;
{
u64 ns = (u64) cycles;
@@
-134,6
+134,6
@@
extern u64 timecounter_read(struct timecounter *tc);
* in the past.
*/
extern u64 timecounter_cyc2time(struct timecounter *tc,
* in the past.
*/
extern u64 timecounter_cyc2time(struct timecounter *tc,
-
cycle_t
cycle_tstamp);
+
u64
cycle_tstamp);
#endif
#endif
diff --git
a/include/linux/timekeeper_internal.h
b/include/linux/timekeeper_internal.h
index e88005459035e760cb2c3cf1dc8966a958191ef6..110f4532188c7b6c50cf1ce4dcd5dc525beae9a1 100644
(file)
--- a/
include/linux/timekeeper_internal.h
+++ b/
include/linux/timekeeper_internal.h
@@
-29,9
+29,9
@@
*/
struct tk_read_base {
struct clocksource *clock;
*/
struct tk_read_base {
struct clocksource *clock;
-
cycle_t
(*read)(struct clocksource *cs);
-
cycle_t
mask;
-
cycle_t
cycle_last;
+
u64
(*read)(struct clocksource *cs);
+
u64
mask;
+
u64
cycle_last;
u32 mult;
u32 shift;
u64 xtime_nsec;
u32 mult;
u32 shift;
u64 xtime_nsec;
@@
-97,7
+97,7
@@
struct timekeeper {
struct timespec64 raw_time;
/* The following members are for timekeeping internal use */
struct timespec64 raw_time;
/* The following members are for timekeeping internal use */
-
cycle_t
cycle_interval;
+
u64
cycle_interval;
u64 xtime_interval;
s64 xtime_remainder;
u32 raw_interval;
u64 xtime_interval;
s64 xtime_remainder;
u32 raw_interval;
@@
-136,7
+136,7
@@
extern void update_vsyscall_tz(void);
extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
struct clocksource *c, u32 mult,
extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
struct clocksource *c, u32 mult,
-
cycle_t
cycle_last);
+
u64
cycle_last);
extern void update_vsyscall_tz(void);
#else
extern void update_vsyscall_tz(void);
#else
diff --git
a/include/linux/timekeeping.h
b/include/linux/timekeeping.h
index 361f8bf1429dfe28e63ad32d12561fab51c9e959..d2e804e15c3e46059b3401bed5dedfec3bd5dc2a 100644
(file)
--- a/
include/linux/timekeeping.h
+++ b/
include/linux/timekeeping.h
@@
-293,7
+293,7
@@
extern void ktime_get_raw_and_real_ts64(struct timespec64 *ts_raw,
* @cs_was_changed_seq: The sequence number of clocksource change events
*/
struct system_time_snapshot {
* @cs_was_changed_seq: The sequence number of clocksource change events
*/
struct system_time_snapshot {
-
cycle_t
cycles;
+
u64
cycles;
ktime_t real;
ktime_t raw;
unsigned int clock_was_set_seq;
ktime_t real;
ktime_t raw;
unsigned int clock_was_set_seq;
@@
-321,7
+321,7
@@
struct system_device_crosststamp {
* timekeeping code to verify comparibility of two cycle values
*/
struct system_counterval_t {
* timekeeping code to verify comparibility of two cycle values
*/
struct system_counterval_t {
-
cycle_t
cycles;
+
u64
cycles;
struct clocksource *cs;
};
struct clocksource *cs;
};
diff --git
a/include/linux/types.h
b/include/linux/types.h
index d501ad3ba2478c6ef23e01c3449bb129c5b181aa..1e7bd24848fcb54cae26bdd10597f6ea80afd46f 100644
(file)
--- a/
include/linux/types.h
+++ b/
include/linux/types.h
@@
-228,8
+228,5
@@
struct callback_head {
typedef void (*rcu_callback_t)(struct rcu_head *head);
typedef void (*call_rcu_func_t)(struct rcu_head *head, rcu_callback_t func);
typedef void (*rcu_callback_t)(struct rcu_head *head);
typedef void (*call_rcu_func_t)(struct rcu_head *head, rcu_callback_t func);
-/* clocksource cycle base type */
-typedef u64 cycle_t;
-
#endif /* __ASSEMBLY__ */
#endif /* _LINUX_TYPES_H */
#endif /* __ASSEMBLY__ */
#endif /* _LINUX_TYPES_H */
diff --git
a/kernel/time/clocksource.c
b/kernel/time/clocksource.c
index 150242ccfcd201a14e633357589d4c4f3327207e..665985b0a89afe88486fed0e2571771bdd4d94b5 100644
(file)
--- a/
kernel/time/clocksource.c
+++ b/
kernel/time/clocksource.c
@@
-170,7
+170,7
@@
void clocksource_mark_unstable(struct clocksource *cs)
static void clocksource_watchdog(unsigned long data)
{
struct clocksource *cs;
static void clocksource_watchdog(unsigned long data)
{
struct clocksource *cs;
-
cycle_t
csnow, wdnow, cslast, wdlast, delta;
+
u64
csnow, wdnow, cslast, wdlast, delta;
int64_t wd_nsec, cs_nsec;
int next_cpu, reset_pending;
int64_t wd_nsec, cs_nsec;
int next_cpu, reset_pending;
diff --git
a/kernel/time/jiffies.c
b/kernel/time/jiffies.c
index 555e21f7b966c789f48ee4aa5fece85cc7db6768..a4a0e478e44d16208d4333248995bbac610fc75b 100644
(file)
--- a/
kernel/time/jiffies.c
+++ b/
kernel/time/jiffies.c
@@
-59,9
+59,9
@@
#define JIFFIES_SHIFT 8
#endif
#define JIFFIES_SHIFT 8
#endif
-static
cycle_t
jiffies_read(struct clocksource *cs)
+static
u64
jiffies_read(struct clocksource *cs)
{
{
- return (
cycle_t
) jiffies;
+ return (
u64
) jiffies;
}
static struct clocksource clocksource_jiffies = {
}
static struct clocksource clocksource_jiffies = {
diff --git
a/kernel/time/timecounter.c
b/kernel/time/timecounter.c
index 4687b3104baec19d578bf7d6aa3c06322dbea9f9..8afd78932bdf145d5609ed12494c72b924c351cd 100644
(file)
--- a/
kernel/time/timecounter.c
+++ b/
kernel/time/timecounter.c
@@
-43,7
+43,7
@@
EXPORT_SYMBOL_GPL(timecounter_init);
*/
static u64 timecounter_read_delta(struct timecounter *tc)
{
*/
static u64 timecounter_read_delta(struct timecounter *tc)
{
-
cycle_t
cycle_now, cycle_delta;
+
u64
cycle_now, cycle_delta;
u64 ns_offset;
/* read cycle counter: */
u64 ns_offset;
/* read cycle counter: */
@@
-80,7
+80,7
@@
EXPORT_SYMBOL_GPL(timecounter_read);
* time previous to the time stored in the cycle counter.
*/
static u64 cc_cyc2ns_backwards(const struct cyclecounter *cc,
* time previous to the time stored in the cycle counter.
*/
static u64 cc_cyc2ns_backwards(const struct cyclecounter *cc,
-
cycle_t
cycles, u64 mask, u64 frac)
+
u64
cycles, u64 mask, u64 frac)
{
u64 ns = (u64) cycles;
{
u64 ns = (u64) cycles;
@@
-90,7
+90,7
@@
static u64 cc_cyc2ns_backwards(const struct cyclecounter *cc,
}
u64 timecounter_cyc2time(struct timecounter *tc,
}
u64 timecounter_cyc2time(struct timecounter *tc,
-
cycle_t
cycle_tstamp)
+
u64
cycle_tstamp)
{
u64 delta = (cycle_tstamp - tc->cycle_last) & tc->cc->mask;
u64 nsec = tc->nsec, frac = tc->frac;
{
u64 delta = (cycle_tstamp - tc->cycle_last) & tc->cc->mask;
u64 nsec = tc->nsec, frac = tc->frac;
diff --git
a/kernel/time/timekeeping.c
b/kernel/time/timekeeping.c
index da233cdf89b0447efe2bce0a4a53ce87f87acb8c..f4152a69277f02fce9f4247f4c189c92b85a83d0 100644
(file)
--- a/
kernel/time/timekeeping.c
+++ b/
kernel/time/timekeeping.c
@@
-119,10
+119,10
@@
static inline void tk_update_sleep_time(struct timekeeper *tk, ktime_t delta)
#ifdef CONFIG_DEBUG_TIMEKEEPING
#define WARNING_FREQ (HZ*300) /* 5 minute rate-limiting */
#ifdef CONFIG_DEBUG_TIMEKEEPING
#define WARNING_FREQ (HZ*300) /* 5 minute rate-limiting */
-static void timekeeping_check_update(struct timekeeper *tk,
cycle_t
offset)
+static void timekeeping_check_update(struct timekeeper *tk,
u64
offset)
{
{
-
cycle_t
max_cycles = tk->tkr_mono.clock->max_cycles;
+
u64
max_cycles = tk->tkr_mono.clock->max_cycles;
const char *name = tk->tkr_mono.clock->name;
if (offset > max_cycles) {
const char *name = tk->tkr_mono.clock->name;
if (offset > max_cycles) {
@@
-158,10
+158,10
@@
static void timekeeping_check_update(struct timekeeper *tk, cycle_t offset)
}
}
}
}
-static inline
cycle_t
timekeeping_get_delta(struct tk_read_base *tkr)
+static inline
u64
timekeeping_get_delta(struct tk_read_base *tkr)
{
struct timekeeper *tk = &tk_core.timekeeper;
{
struct timekeeper *tk = &tk_core.timekeeper;
-
cycle_t
now, last, mask, max, delta;
+
u64
now, last, mask, max, delta;
unsigned int seq;
/*
unsigned int seq;
/*
@@
-199,12
+199,12
@@
static inline cycle_t timekeeping_get_delta(struct tk_read_base *tkr)
return delta;
}
#else
return delta;
}
#else
-static inline void timekeeping_check_update(struct timekeeper *tk,
cycle_t
offset)
+static inline void timekeeping_check_update(struct timekeeper *tk,
u64
offset)
{
}
{
}
-static inline
cycle_t
timekeeping_get_delta(struct tk_read_base *tkr)
+static inline
u64
timekeeping_get_delta(struct tk_read_base *tkr)
{
{
-
cycle_t
cycle_now, delta;
+
u64
cycle_now, delta;
/* read clocksource */
cycle_now = tkr->read(tkr->clock);
/* read clocksource */
cycle_now = tkr->read(tkr->clock);
@@
-229,7
+229,7
@@
static inline cycle_t timekeeping_get_delta(struct tk_read_base *tkr)
*/
static void tk_setup_internals(struct timekeeper *tk, struct clocksource *clock)
{
*/
static void tk_setup_internals(struct timekeeper *tk, struct clocksource *clock)
{
-
cycle_t
interval;
+
u64
interval;
u64 tmp, ntpinterval;
struct clocksource *old_clock;
u64 tmp, ntpinterval;
struct clocksource *old_clock;
@@
-254,7
+254,7
@@
static void tk_setup_internals(struct timekeeper *tk, struct clocksource *clock)
if (tmp == 0)
tmp = 1;
if (tmp == 0)
tmp = 1;
- interval = (
cycle_t
) tmp;
+ interval = (
u64
) tmp;
tk->cycle_interval = interval;
/* Go back from cycles -> shifted ns */
tk->cycle_interval = interval;
/* Go back from cycles -> shifted ns */
@@
-298,8
+298,7
@@
u32 (*arch_gettimeoffset)(void) = default_arch_gettimeoffset;
static inline u32 arch_gettimeoffset(void) { return 0; }
#endif
static inline u32 arch_gettimeoffset(void) { return 0; }
#endif
-static inline u64 timekeeping_delta_to_ns(struct tk_read_base *tkr,
- cycle_t delta)
+static inline u64 timekeeping_delta_to_ns(struct tk_read_base *tkr, u64 delta)
{
u64 nsec;
{
u64 nsec;
@@
-312,16
+311,15
@@
static inline u64 timekeeping_delta_to_ns(struct tk_read_base *tkr,
static inline u64 timekeeping_get_ns(struct tk_read_base *tkr)
{
static inline u64 timekeeping_get_ns(struct tk_read_base *tkr)
{
-
cycle_t
delta;
+
u64
delta;
delta = timekeeping_get_delta(tkr);
return timekeeping_delta_to_ns(tkr, delta);
}
delta = timekeeping_get_delta(tkr);
return timekeeping_delta_to_ns(tkr, delta);
}
-static inline u64 timekeeping_cycles_to_ns(struct tk_read_base *tkr,
- cycle_t cycles)
+static inline u64 timekeeping_cycles_to_ns(struct tk_read_base *tkr, u64 cycles)
{
{
-
cycle_t
delta;
+
u64
delta;
/* calculate the delta since the last update_wall_time */
delta = clocksource_delta(cycles, tkr->cycle_last, tkr->mask);
/* calculate the delta since the last update_wall_time */
delta = clocksource_delta(cycles, tkr->cycle_last, tkr->mask);
@@
-454,9
+452,9
@@
u64 notrace ktime_get_boot_fast_ns(void)
EXPORT_SYMBOL_GPL(ktime_get_boot_fast_ns);
/* Suspend-time cycles value for halted fast timekeeper. */
EXPORT_SYMBOL_GPL(ktime_get_boot_fast_ns);
/* Suspend-time cycles value for halted fast timekeeper. */
-static
cycle_t
cycles_at_suspend;
+static
u64
cycles_at_suspend;
-static
cycle_t
dummy_clock_read(struct clocksource *cs)
+static
u64
dummy_clock_read(struct clocksource *cs)
{
return cycles_at_suspend;
}
{
return cycles_at_suspend;
}
@@
-650,7
+648,7
@@
static void timekeeping_update(struct timekeeper *tk, unsigned int action)
static void timekeeping_forward_now(struct timekeeper *tk)
{
struct clocksource *clock = tk->tkr_mono.clock;
static void timekeeping_forward_now(struct timekeeper *tk)
{
struct clocksource *clock = tk->tkr_mono.clock;
-
cycle_t
cycle_now, delta;
+
u64
cycle_now, delta;
u64 nsec;
cycle_now = tk->tkr_mono.read(clock);
u64 nsec;
cycle_now = tk->tkr_mono.read(clock);
@@
-923,7
+921,7
@@
void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot)
ktime_t base_real;
u64 nsec_raw;
u64 nsec_real;
ktime_t base_real;
u64 nsec_raw;
u64 nsec_real;
-
cycle_t
now;
+
u64
now;
WARN_ON_ONCE(timekeeping_suspended);
WARN_ON_ONCE(timekeeping_suspended);
@@
-982,8
+980,8
@@
static int scale64_check_overflow(u64 mult, u64 div, u64 *base)
* interval is partial_history_cycles.
*/
static int adjust_historical_crosststamp(struct system_time_snapshot *history,
* interval is partial_history_cycles.
*/
static int adjust_historical_crosststamp(struct system_time_snapshot *history,
-
cycle_t
partial_history_cycles,
-
cycle_t
total_history_cycles,
+
u64
partial_history_cycles,
+
u64
total_history_cycles,
bool discontinuity,
struct system_device_crosststamp *ts)
{
bool discontinuity,
struct system_device_crosststamp *ts)
{
@@
-1047,7
+1045,7
@@
static int adjust_historical_crosststamp(struct system_time_snapshot *history,
/*
* cycle_between - true if test occurs chronologically between before and after
*/
/*
* cycle_between - true if test occurs chronologically between before and after
*/
-static bool cycle_between(
cycle_t before, cycle_t test, cycle_t
after)
+static bool cycle_between(
u64 before, u64 test, u64
after)
{
if (test > before && test < after)
return true;
{
if (test > before && test < after)
return true;
@@
-1077,7
+1075,7
@@
int get_device_system_crosststamp(int (*get_time_fn)
{
struct system_counterval_t system_counterval;
struct timekeeper *tk = &tk_core.timekeeper;
{
struct system_counterval_t system_counterval;
struct timekeeper *tk = &tk_core.timekeeper;
-
cycle_t
cycles, now, interval_start;
+
u64
cycles, now, interval_start;
unsigned int clock_was_set_seq = 0;
ktime_t base_real, base_raw;
u64 nsec_real, nsec_raw;
unsigned int clock_was_set_seq = 0;
ktime_t base_real, base_raw;
u64 nsec_real, nsec_raw;
@@
-1138,7
+1136,7
@@
int get_device_system_crosststamp(int (*get_time_fn)
* current interval
*/
if (do_interp) {
* current interval
*/
if (do_interp) {
-
cycle_t
partial_history_cycles, total_history_cycles;
+
u64
partial_history_cycles, total_history_cycles;
bool discontinuity;
/*
bool discontinuity;
/*
@@
-1644,7
+1642,7
@@
void timekeeping_resume(void)
struct clocksource *clock = tk->tkr_mono.clock;
unsigned long flags;
struct timespec64 ts_new, ts_delta;
struct clocksource *clock = tk->tkr_mono.clock;
unsigned long flags;
struct timespec64 ts_new, ts_delta;
-
cycle_t
cycle_now;
+
u64
cycle_now;
sleeptime_injected = false;
read_persistent_clock64(&ts_new);
sleeptime_injected = false;
read_persistent_clock64(&ts_new);
@@
-2010,11
+2008,10
@@
static inline unsigned int accumulate_nsecs_to_secs(struct timekeeper *tk)
*
* Returns the unconsumed cycles.
*/
*
* Returns the unconsumed cycles.
*/
-static cycle_t logarithmic_accumulation(struct timekeeper *tk, cycle_t offset,
- u32 shift,
- unsigned int *clock_set)
+static u64 logarithmic_accumulation(struct timekeeper *tk, u64 offset,
+ u32 shift, unsigned int *clock_set)
{
{
-
cycle_t
interval = tk->cycle_interval << shift;
+
u64
interval = tk->cycle_interval << shift;
u64 raw_nsecs;
/* If the offset is smaller than a shifted interval, do nothing */
u64 raw_nsecs;
/* If the offset is smaller than a shifted interval, do nothing */
@@
-2055,7
+2052,7
@@
void update_wall_time(void)
{
struct timekeeper *real_tk = &tk_core.timekeeper;
struct timekeeper *tk = &shadow_timekeeper;
{
struct timekeeper *real_tk = &tk_core.timekeeper;
struct timekeeper *tk = &shadow_timekeeper;
-
cycle_t
offset;
+
u64
offset;
int shift = 0, maxshift;
unsigned int clock_set = 0;
unsigned long flags;
int shift = 0, maxshift;
unsigned int clock_set = 0;
unsigned long flags;
diff --git
a/kernel/time/timekeeping_internal.h
b/kernel/time/timekeeping_internal.h
index 5be76270ec4a8f155574aabe2812f9edefb80aec..9a18f121f3990b3a635c350506ada940e0c7f922 100644
(file)
--- a/
kernel/time/timekeeping_internal.h
+++ b/
kernel/time/timekeeping_internal.h
@@
-13,9
+13,9
@@
extern void tk_debug_account_sleep_time(struct timespec64 *t);
#endif
#ifdef CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE
#endif
#ifdef CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE
-static inline
cycle_t clocksource_delta(cycle_t now, cycle_t last, cycle_t
mask)
+static inline
u64 clocksource_delta(u64 now, u64 last, u64
mask)
{
{
-
cycle_t
ret = (now - last) & mask;
+
u64
ret = (now - last) & mask;
/*
* Prevent time going backwards by checking the MSB of mask in
/*
* Prevent time going backwards by checking the MSB of mask in
@@
-24,7
+24,7
@@
static inline cycle_t clocksource_delta(cycle_t now, cycle_t last, cycle_t mask)
return ret & ~(mask >> 1) ? 0 : ret;
}
#else
return ret & ~(mask >> 1) ? 0 : ret;
}
#else
-static inline
cycle_t clocksource_delta(cycle_t now, cycle_t last, cycle_t
mask)
+static inline
u64 clocksource_delta(u64 now, u64 last, u64
mask)
{
return (now - last) & mask;
}
{
return (now - last) & mask;
}
diff --git
a/kernel/trace/ftrace.c
b/kernel/trace/ftrace.c
index 1f0f547c54da2fee935a89316e6e2e74df7e6f34..eb230f06ba4123a1dc75dafb508789f6cd7afd25 100644
(file)
--- a/
kernel/trace/ftrace.c
+++ b/
kernel/trace/ftrace.c
@@
-2847,7
+2847,7
@@
static void ftrace_shutdown_sysctl(void)
}
}
}
}
-static
cycle_t
ftrace_update_time;
+static
u64
ftrace_update_time;
unsigned long ftrace_update_tot_cnt;
static inline int ops_traces_mod(struct ftrace_ops *ops)
unsigned long ftrace_update_tot_cnt;
static inline int ops_traces_mod(struct ftrace_ops *ops)
@@
-2894,7
+2894,7
@@
static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
{
struct ftrace_page *pg;
struct dyn_ftrace *p;
{
struct ftrace_page *pg;
struct dyn_ftrace *p;
-
cycle_t
start, stop;
+
u64
start, stop;
unsigned long update_cnt = 0;
unsigned long rec_flags = 0;
int i;
unsigned long update_cnt = 0;
unsigned long rec_flags = 0;
int i;
diff --git
a/kernel/trace/trace.c
b/kernel/trace/trace.c
index 66f829c47bec77c0dbfc1b9d45c92f303e21e5b3..d7449783987a2bee7dea147e02530f36ff23dfba 100644
(file)
--- a/
kernel/trace/trace.c
+++ b/
kernel/trace/trace.c
@@
-236,7
+236,7
@@
static int __init set_tracepoint_printk(char *str)
}
__setup("tp_printk", set_tracepoint_printk);
}
__setup("tp_printk", set_tracepoint_printk);
-unsigned long long ns2usecs(
cycle_t
nsec)
+unsigned long long ns2usecs(
u64
nsec)
{
nsec += 500;
do_div(nsec, 1000);
{
nsec += 500;
do_div(nsec, 1000);
@@
-573,7
+573,7
@@
int trace_pid_write(struct trace_pid_list *filtered_pids,
return read;
}
return read;
}
-static
cycle_t
buffer_ftrace_now(struct trace_buffer *buf, int cpu)
+static
u64
buffer_ftrace_now(struct trace_buffer *buf, int cpu)
{
u64 ts;
{
u64 ts;
@@
-587,7
+587,7
@@
static cycle_t buffer_ftrace_now(struct trace_buffer *buf, int cpu)
return ts;
}
return ts;
}
-
cycle_t
ftrace_now(int cpu)
+
u64
ftrace_now(int cpu)
{
return buffer_ftrace_now(&global_trace.trace_buffer, cpu);
}
{
return buffer_ftrace_now(&global_trace.trace_buffer, cpu);
}
diff --git
a/kernel/trace/trace.h
b/kernel/trace/trace.h
index c2234494f40c1c95e83414d1d50417cb5db2a416..1ea51ab53edf372924692e78c692f52302280bc1 100644
(file)
--- a/
kernel/trace/trace.h
+++ b/
kernel/trace/trace.h
@@
-159,7
+159,7
@@
struct trace_array_cpu {
unsigned long policy;
unsigned long rt_priority;
unsigned long skipped_entries;
unsigned long policy;
unsigned long rt_priority;
unsigned long skipped_entries;
-
cycle_t
preempt_timestamp;
+
u64
preempt_timestamp;
pid_t pid;
kuid_t uid;
char comm[TASK_COMM_LEN];
pid_t pid;
kuid_t uid;
char comm[TASK_COMM_LEN];
@@
-177,7
+177,7
@@
struct trace_buffer {
struct trace_array *tr;
struct ring_buffer *buffer;
struct trace_array_cpu __percpu *data;
struct trace_array *tr;
struct ring_buffer *buffer;
struct trace_array_cpu __percpu *data;
-
cycle_t
time_start;
+
u64
time_start;
int cpu;
};
int cpu;
};
@@
-689,7
+689,7
@@
static inline void __trace_stack(struct trace_array *tr, unsigned long flags,
}
#endif /* CONFIG_STACKTRACE */
}
#endif /* CONFIG_STACKTRACE */
-extern
cycle_t
ftrace_now(int cpu);
+extern
u64
ftrace_now(int cpu);
extern void trace_find_cmdline(int pid, char comm[]);
extern void trace_event_follow_fork(struct trace_array *tr, bool enable);
extern void trace_find_cmdline(int pid, char comm[]);
extern void trace_event_follow_fork(struct trace_array *tr, bool enable);
@@
-736,7
+736,7
@@
extern int trace_selftest_startup_branch(struct tracer *trace,
#endif /* CONFIG_FTRACE_STARTUP_TEST */
extern void *head_page(struct trace_array_cpu *data);
#endif /* CONFIG_FTRACE_STARTUP_TEST */
extern void *head_page(struct trace_array_cpu *data);
-extern unsigned long long ns2usecs(
cycle_t
nsec);
+extern unsigned long long ns2usecs(
u64
nsec);
extern int
trace_vbprintk(unsigned long ip, const char *fmt, va_list args);
extern int
extern int
trace_vbprintk(unsigned long ip, const char *fmt, va_list args);
extern int
diff --git
a/kernel/trace/trace_irqsoff.c
b/kernel/trace/trace_irqsoff.c
index 86654d7e1afe26737cf68f2bfdd80f50cc73f9fd..7758bc0617cb15d8731defbc67912b5eb46246c2 100644
(file)
--- a/
kernel/trace/trace_irqsoff.c
+++ b/
kernel/trace/trace_irqsoff.c
@@
-298,7
+298,7
@@
static void irqsoff_print_header(struct seq_file *s)
/*
* Should this new latency be reported/recorded?
*/
/*
* Should this new latency be reported/recorded?
*/
-static bool report_latency(struct trace_array *tr,
cycle_t
delta)
+static bool report_latency(struct trace_array *tr,
u64
delta)
{
if (tracing_thresh) {
if (delta < tracing_thresh)
{
if (tracing_thresh) {
if (delta < tracing_thresh)
@@
-316,7
+316,7
@@
check_critical_timing(struct trace_array *tr,
unsigned long parent_ip,
int cpu)
{
unsigned long parent_ip,
int cpu)
{
-
cycle_t
T0, T1, delta;
+
u64
T0, T1, delta;
unsigned long flags;
int pc;
unsigned long flags;
int pc;
diff --git
a/kernel/trace/trace_sched_wakeup.c
b/kernel/trace/trace_sched_wakeup.c
index 5d0bb025bb21313dd15546f714a9fa4b1e3bc4e0..ddec53b6764617e8fe431d93bf9f970a5015b4be 100644
(file)
--- a/
kernel/trace/trace_sched_wakeup.c
+++ b/
kernel/trace/trace_sched_wakeup.c
@@
-358,7
+358,7
@@
static void wakeup_print_header(struct seq_file *s)
/*
* Should this new latency be reported/recorded?
*/
/*
* Should this new latency be reported/recorded?
*/
-static bool report_latency(struct trace_array *tr,
cycle_t
delta)
+static bool report_latency(struct trace_array *tr,
u64
delta)
{
if (tracing_thresh) {
if (delta < tracing_thresh)
{
if (tracing_thresh) {
if (delta < tracing_thresh)
@@
-440,7
+440,7
@@
probe_wakeup_sched_switch(void *ignore, bool preempt,
struct task_struct *prev, struct task_struct *next)
{
struct trace_array_cpu *data;
struct task_struct *prev, struct task_struct *next)
{
struct trace_array_cpu *data;
-
cycle_t
T0, T1, delta;
+
u64
T0, T1, delta;
unsigned long flags;
long disabled;
int cpu;
unsigned long flags;
long disabled;
int cpu;
diff --git
a/sound/hda/hdac_stream.c
b/sound/hda/hdac_stream.c
index 38990a77d7b780081167fa14ded35745025553c1..c6994ebb4567bf7f6120f9d94405ce1b557a0970 100644
(file)
--- a/
sound/hda/hdac_stream.c
+++ b/
sound/hda/hdac_stream.c
@@
-465,7
+465,7
@@
int snd_hdac_stream_set_params(struct hdac_stream *azx_dev,
}
EXPORT_SYMBOL_GPL(snd_hdac_stream_set_params);
}
EXPORT_SYMBOL_GPL(snd_hdac_stream_set_params);
-static
cycle_t
azx_cc_read(const struct cyclecounter *cc)
+static
u64
azx_cc_read(const struct cyclecounter *cc)
{
struct hdac_stream *azx_dev = container_of(cc, struct hdac_stream, cc);
{
struct hdac_stream *azx_dev = container_of(cc, struct hdac_stream, cc);
@@
-473,7
+473,7
@@
static cycle_t azx_cc_read(const struct cyclecounter *cc)
}
static void azx_timecounter_init(struct hdac_stream *azx_dev,
}
static void azx_timecounter_init(struct hdac_stream *azx_dev,
- bool force,
cycle_t
last)
+ bool force,
u64
last)
{
struct timecounter *tc = &azx_dev->tc;
struct cyclecounter *cc = &azx_dev->cc;
{
struct timecounter *tc = &azx_dev->tc;
struct cyclecounter *cc = &azx_dev->cc;
@@
-523,7
+523,7
@@
void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,
struct snd_pcm_runtime *runtime = azx_dev->substream->runtime;
struct hdac_stream *s;
bool inited = false;
struct snd_pcm_runtime *runtime = azx_dev->substream->runtime;
struct hdac_stream *s;
bool inited = false;
-
cycle_t
cycle_last = 0;
+
u64
cycle_last = 0;
int i = 0;
list_for_each_entry(s, &bus->stream_list, list) {
int i = 0;
list_for_each_entry(s, &bus->stream_list, list) {
diff --git
a/virt/kvm/arm/arch_timer.c
b/virt/kvm/arm/arch_timer.c
index ae95fc0e32143083b1e5aa34286cb6e771f043dc..97b657adb3bdd870543fd61c4429f00039ac8f51 100644
(file)
--- a/
virt/kvm/arm/arch_timer.c
+++ b/
virt/kvm/arm/arch_timer.c
@@
-39,7
+39,7
@@
void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu)
vcpu->arch.timer_cpu.active_cleared_last = false;
}
vcpu->arch.timer_cpu.active_cleared_last = false;
}
-static
cycle_t
kvm_phys_timer_read(void)
+static
u64
kvm_phys_timer_read(void)
{
return timecounter->cc->read(timecounter->cc);
}
{
return timecounter->cc->read(timecounter->cc);
}
@@
-102,7
+102,7
@@
static void kvm_timer_inject_irq_work(struct work_struct *work)
static u64 kvm_timer_compute_delta(struct kvm_vcpu *vcpu)
{
static u64 kvm_timer_compute_delta(struct kvm_vcpu *vcpu)
{
-
cycle_t
cval, now;
+
u64
cval, now;
cval = vcpu->arch.timer_cpu.cntv_cval;
now = kvm_phys_timer_read() - vcpu->kvm->arch.timer.cntvoff;
cval = vcpu->arch.timer_cpu.cntv_cval;
now = kvm_phys_timer_read() - vcpu->kvm->arch.timer.cntvoff;
@@
-155,7
+155,7
@@
static bool kvm_timer_irq_can_fire(struct kvm_vcpu *vcpu)
bool kvm_timer_should_fire(struct kvm_vcpu *vcpu)
{
struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
bool kvm_timer_should_fire(struct kvm_vcpu *vcpu)
{
struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
-
cycle_t
cval, now;
+
u64
cval, now;
if (!kvm_timer_irq_can_fire(vcpu))
return false;
if (!kvm_timer_irq_can_fire(vcpu))
return false;