From 9f786b6af7bead1c60ed5e497dfc0a6fc0bc2930 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 9 Dec 2025 15:41:47 -0500
Subject: [PATCH] Rename "headers/private/utils" to "util".

This undoes some changes from cf930b7e6c1ec2b0fef6815a3cf1a5f1d6652c9d.

Nearly all the other utility directories in the tree are named "util"
not "utils", so let's be consistent.
---
 headers/private/{utils => util}/BitUtils.h                | 0
 src/add-ons/input_server/devices/mouse/movement_maker.cpp | 2 +-
 src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp   | 3 +--
 src/add-ons/kernel/file_systems/ramfs/DataContainer.cpp   | 3 +--
 src/libs/compat/freebsd_network/malloc.cpp                | 2 +-
 src/system/kernel/arch/x86/arch_cpu.cpp                   | 3 +--
 src/system/kernel/util/Bitmap.cpp                         | 2 +-
 src/system/kernel/vm/vm.cpp                               | 3 +--
 8 files changed, 7 insertions(+), 11 deletions(-)
 rename headers/private/{utils => util}/BitUtils.h (100%)

diff --git a/headers/private/utils/BitUtils.h b/headers/private/util/BitUtils.h
similarity index 100%
rename from headers/private/utils/BitUtils.h
rename to headers/private/util/BitUtils.h
diff --git a/src/add-ons/input_server/devices/mouse/movement_maker.cpp b/src/add-ons/input_server/devices/mouse/movement_maker.cpp
index e7739ddfdf..f101071502 100644
--- a/src/add-ons/input_server/devices/mouse/movement_maker.cpp
+++ b/src/add-ons/input_server/devices/mouse/movement_maker.cpp
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include <private/utils/BitUtils.h>
+#include <util/BitUtils.h>
 
 //#define TRACE_MOVEMENT_MAKER
 
diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
index 63d5697033..0bd81b0e34 100644
--- a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
+++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp
@@ -11,8 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <new>
-
-#include <utils/BitUtils.h>
+#include <util/BitUtils.h>
 
 #define TRACE(a...) dprintf("ahci: " a)
 #define FLOW(a...)	dprintf("ahci: " a)
diff --git a/src/add-ons/kernel/file_systems/ramfs/DataContainer.cpp b/src/add-ons/kernel/file_systems/ramfs/DataContainer.cpp
index 3ec34fb04a..6d34268803 100644
--- a/src/add-ons/kernel/file_systems/ramfs/DataContainer.cpp
+++ b/src/add-ons/kernel/file_systems/ramfs/DataContainer.cpp
@@ -8,12 +8,11 @@
 
 #include <StackOrHeapArray.h>
 #include <util/AutoLock.h>
+#include <util/BitUtils.h>
 #include <slab/Slab.h>
 #include <thread.h>
 #include <vfs.h>
 
-#include <utils/BitUtils.h>
-
 #include <vm/VMCache.h>
 #include <vm/vm_page.h>
 #include "VMAnonymousNoSwapCache.h"
diff --git a/src/libs/compat/freebsd_network/malloc.cpp b/src/libs/compat/freebsd_network/malloc.cpp
index 54e4a11d8d..c64deeee5d 100644
--- a/src/libs/compat/freebsd_network/malloc.cpp
+++ b/src/libs/compat/freebsd_network/malloc.cpp
@@ -11,7 +11,7 @@ extern "C" {
 #include <stdio.h>
 #include <string.h>
 
-#include <utils/BitUtils.h>
+#include <util/BitUtils.h>
 
 #include <kernel/heap.h>
 #include <kernel/vm/vm.h>
diff --git a/src/system/kernel/arch/x86/arch_cpu.cpp b/src/system/kernel/arch/x86/arch_cpu.cpp
index 1fc5eaf3dc..c9fea50cdc 100644
--- a/src/system/kernel/arch/x86/arch_cpu.cpp
+++ b/src/system/kernel/arch/x86/arch_cpu.cpp
@@ -26,12 +26,11 @@
 #include <elf.h>
 #include <safemode.h>
 #include <smp.h>
+#include <util/BitUtils.h>
 #include <vm/vm.h>
 #include <vm/vm_types.h>
 #include <vm/VMAddressSpace.h>
 
-#include <utils/BitUtils.h>
-
 #include <arch_system_info.h>
 #include <arch/x86/apic.h>
 #include <boot/kernel_args.h>
diff --git a/src/system/kernel/util/Bitmap.cpp b/src/system/kernel/util/Bitmap.cpp
index 5485cb6b17..0a11af94b5 100644
--- a/src/system/kernel/util/Bitmap.cpp
+++ b/src/system/kernel/util/Bitmap.cpp
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <utils/BitUtils.h>
+#include <util/BitUtils.h>
 
 
 namespace BKernel {
diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index 24fe6ae9ed..d88ccad476 100644
--- a/src/system/kernel/vm/vm.cpp
+++ b/src/system/kernel/vm/vm.cpp
@@ -47,6 +47,7 @@
 #include <team.h>
 #include <tracing.h>
 #include <util/AutoLock.h>
+#include <util/BitUtils.h>
 #include <util/ThreadAutoLock.h>
 #include <vm/vm_page.h>
 #include <vm/vm_priv.h>
@@ -54,8 +55,6 @@
 #include <vm/VMArea.h>
 #include <vm/VMCache.h>
 
-#include <utils/BitUtils.h>
-
 #include "VMAddressSpaceLocking.h"
 #include "VMAnonymousCache.h"
 #include "VMAnonymousNoSwapCache.h"