Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Feb 2023 17:53:24 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: dcb4b13816df - main - xen/timer: rename "timer.c" to "xen_timer.c"
Message-ID:  <202302051753.315HrO7x016843@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=dcb4b13816df76ee6bfb28751cbe7ff19092ad15

commit dcb4b13816df76ee6bfb28751cbe7ff19092ad15
Author:     Elliott Mitchell <ehem+freebsd@m5p.com>
AuthorDate: 2023-02-05 17:41:14 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-02-05 17:50:50 +0000

    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(-)

diff --git a/sys/conf/files b/sys/conf/files
index 08966a9b46e4..9171b434a7bf 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 815e3338f320..ef524e2e6d51 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.
  */
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302051753.315HrO7x016843>