diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-15 15:31:11 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-15 15:31:11 +0200 |
| commit | d1b25279c1a3fe99a14b3afc6d590e218f854b10 (patch) | |
| tree | c5bb8bf18477aafe66ed22380846c8967ea21939 /fs/afs/server.c | |
| parent | genirq: Use cpumask_available() for check of cpumask variable (diff) | |
| parent | irqchip/irq-imx-gpcv2: Clear OF_POPULATED flag (diff) | |
| download | linux-d1b25279c1a3fe99a14b3afc6d590e218f854b10.tar.xz linux-d1b25279c1a3fe99a14b3afc6d590e218f854b10.zip | |
Merge tag 'irqchip-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates from Marc Zyngier
- Unify gemini and moxa irqchips under the faraday banner
- Extend mtk-sysirq to deal with multiple MMIO regions
- ACPI/IORT support for GICv3 ITS platform MSI
- ACPI support for mbigen
- Add mtk-cirq wakeup interrupt controller driver
- Atmel aic5 suspend support
- Allow GPCv2 to be probed both as an irqchip and a device
Diffstat (limited to 'fs/afs/server.c')
| -rw-r--r-- | fs/afs/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/afs/server.c b/fs/afs/server.c index d4066ab7dd55..c001b1f2455f 100644 --- a/fs/afs/server.c +++ b/fs/afs/server.c @@ -242,7 +242,7 @@ void afs_put_server(struct afs_server *server) spin_lock(&afs_server_graveyard_lock); if (atomic_read(&server->usage) == 0) { list_move_tail(&server->grave, &afs_server_graveyard); - server->time_of_death = get_seconds(); + server->time_of_death = ktime_get_real_seconds(); queue_delayed_work(afs_wq, &afs_server_reaper, afs_server_timeout * HZ); } @@ -277,9 +277,9 @@ static void afs_reap_server(struct work_struct *work) LIST_HEAD(corpses); struct afs_server *server; unsigned long delay, expiry; - time_t now; + time64_t now; - now = get_seconds(); + now = ktime_get_real_seconds(); spin_lock(&afs_server_graveyard_lock); while (!list_empty(&afs_server_graveyard)) { |