From dcb4b13816df76ee6bfb28751cbe7ff19092ad15 Mon Sep 17 00:00:00 2001 From: Elliott Mitchell Date: Sun, 5 Feb 2023 10:41:14 -0700 Subject: [PATCH] xen/timer: rename "timer.c" to "xen_timer.c" The better to avoid conflicting with other files given how "timer.c" isn't a very unique name. ARM and RISC-V both have timer.c files. Reviewed by: royger, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/609 Differential Revision: https://reviews.freebsd.org/D36258 --- sys/conf/files | 2 +- sys/dev/xen/timer/{timer.c => xen_timer.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sys/dev/xen/timer/{timer.c => xen_timer.c} (99%) diff --git a/sys/conf/files b/sys/conf/files index 08966a9b46e..9171b434a7b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3527,7 +3527,7 @@ dev/xen/efi/pvefi.c optional xenhvm efirt dev/xen/grant_table/grant_table.c optional xenhvm dev/xen/netback/netback.c optional xenhvm dev/xen/netfront/netfront.c optional xenhvm -dev/xen/timer/timer.c optional xenhvm xentimer +dev/xen/timer/xen_timer.c optional xenhvm xentimer dev/xen/xenpci/xenpci.c optional xenpci dev/xen/xenstore/xenstore.c optional xenhvm dev/xen/xenstore/xenstore_dev.c optional xenhvm diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/xen_timer.c similarity index 99% rename from sys/dev/xen/timer/timer.c rename to sys/dev/xen/timer/xen_timer.c index 815e3338f32..ef524e2e6d5 100644 --- a/sys/dev/xen/timer/timer.c +++ b/sys/dev/xen/timer/xen_timer.c @@ -29,7 +29,7 @@ */ /** - * \file dev/xen/timer/timer.c + * \file dev/xen/timer/xen_timer.c * \brief A timer driver for the Xen hypervisor's PV clock. */