From: Vincenzo Frascino <vincenzo.frascino@arm.com>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: vincenzo.frascino@arm.com, ard.biesheuvel@linaro.org,
ndesaulniers@google.com, catalin.marinas@arm.com,
will@kernel.org, tglx@linutronix.de, luto@kernel.org
Subject: [PATCH v4 5/6] arm64: Remove vdso_datapage.h
Date: Wed, 2 Oct 2019 15:41:55 +0100 [thread overview]
Message-ID: <20191002144156.2174-6-vincenzo.frascino@arm.com> (raw)
In-Reply-To: <20191002144156.2174-1-vincenzo.frascino@arm.com>
vdso_datapage.h was originally removed with the introduction of the
support for Unified vDSOs in arm64 and replaced with the C
implementation.
The file seems again present in the repository due to a side effect of
rebase.
Remove the file again.
Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
---
arch/arm64/include/asm/vdso_datapage.h | 33 --------------------------
1 file changed, 33 deletions(-)
delete mode 100644 arch/arm64/include/asm/vdso_datapage.h
diff --git a/arch/arm64/include/asm/vdso_datapage.h b/arch/arm64/include/asm/vdso_datapage.h
deleted file mode 100644
index 1f38bf330a6e..000000000000
--- a/arch/arm64/include/asm/vdso_datapage.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) 2012 ARM Limited
- */
-#ifndef __ASM_VDSO_DATAPAGE_H
-#define __ASM_VDSO_DATAPAGE_H
-
-#ifndef __ASSEMBLY__
-
-struct vdso_data {
- __u64 cs_cycle_last; /* Timebase at clocksource init */
- __u64 raw_time_sec; /* Raw time */
- __u64 raw_time_nsec;
- __u64 xtime_clock_sec; /* Kernel time */
- __u64 xtime_clock_nsec;
- __u64 xtime_coarse_sec; /* Coarse time */
- __u64 xtime_coarse_nsec;
- __u64 wtm_clock_sec; /* Wall to monotonic time */
- __u64 wtm_clock_nsec;
- __u32 tb_seq_count; /* Timebase sequence counter */
- /* cs_* members must be adjacent and in this order (ldp accesses) */
- __u32 cs_mono_mult; /* NTP-adjusted clocksource multiplier */
- __u32 cs_shift; /* Clocksource shift (mono = raw) */
- __u32 cs_raw_mult; /* Raw clocksource multiplier */
- __u32 tz_minuteswest; /* Whacky timezone stuff */
- __u32 tz_dsttime;
- __u32 use_syscall;
- __u32 hrtimer_res;
-};
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* __ASM_VDSO_DATAPAGE_H */
--
2.23.0
next prev parent reply other threads:[~2019-10-02 14:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 14:41 [PATCH v4 0/6] arm64: vdso32: Address various issues Vincenzo Frascino
2019-10-02 14:41 ` [PATCH v4 1/6] arm64: vdso32: Fix syncconfig errors Vincenzo Frascino
2019-10-03 16:00 ` Catalin Marinas
2019-10-03 16:16 ` Catalin Marinas
2019-10-03 17:03 ` Vincenzo Frascino
2019-10-03 17:40 ` Vincenzo Frascino
2019-10-03 16:20 ` Vincenzo Frascino
2019-10-02 14:41 ` [PATCH v4 2/6] arm64: vdso32: Detect binutils support for dmb ishld Vincenzo Frascino
2019-10-02 14:41 ` [PATCH v4 3/6] arm64: Remove gettimeofday.S Vincenzo Frascino
2019-10-02 14:41 ` [PATCH v4 4/6] arm64: vdso32: Remove jump label config option in Makefile Vincenzo Frascino
2019-10-02 14:41 ` Vincenzo Frascino [this message]
2019-10-02 14:41 ` [PATCH v4 6/6] lib: vdso: Remove CROSS_COMPILE_COMPAT_VDSO Vincenzo Frascino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191002144156.2174-6-vincenzo.frascino@arm.com \
--to=vincenzo.frascino@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=ndesaulniers@google.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).