From 40f83922da1df1fdb0a1ab9f9112c4b3d739706b Mon Sep 17 00:00:00 2001
From: Max Wash <mbswash@gmail.com>
Date: Fri, 3 Feb 2023 20:43:38 +0000
Subject: [PATCH] sandbox: moved all sources to main kernel tree

---
 {sandbox/btree => ds}/btree.c                          | 0
 {sandbox/queue => ds}/queue.c                          | 0
 {sandbox/btree/include => include}/socks/btree.h       | 0
 {sandbox/locks/include => include}/socks/locks.h       | 0
 {sandbox/memblock/include => include}/socks/memblock.h | 0
 {sandbox/queue/include => include}/socks/queue.h       | 0
 {sandbox/base/include => include}/socks/types.h        | 0
 {sandbox/util/include => include}/socks/util.h         | 0
 {sandbox/vm/include => include}/socks/vm.h             | 0
 {sandbox/locks => kernel}/spinlock.c                   | 0
 sandbox/base/include/socks/status.h                    | 9 ---------
 {sandbox/util => util}/data_size.c                     | 0
 {sandbox/vm => vm}/bootstrap.c                         | 0
 {sandbox/vm => vm}/cache.c                             | 0
 {sandbox/vm => vm}/kmalloc.c                           | 0
 {sandbox/memblock => vm}/memblock.c                    | 0
 {sandbox/vm => vm}/page.c                              | 0
 {sandbox/vm => vm}/zone.c                              | 0
 18 files changed, 9 deletions(-)
 rename {sandbox/btree => ds}/btree.c (100%)
 rename {sandbox/queue => ds}/queue.c (100%)
 rename {sandbox/btree/include => include}/socks/btree.h (100%)
 rename {sandbox/locks/include => include}/socks/locks.h (100%)
 rename {sandbox/memblock/include => include}/socks/memblock.h (100%)
 rename {sandbox/queue/include => include}/socks/queue.h (100%)
 rename {sandbox/base/include => include}/socks/types.h (100%)
 rename {sandbox/util/include => include}/socks/util.h (100%)
 rename {sandbox/vm/include => include}/socks/vm.h (100%)
 rename {sandbox/locks => kernel}/spinlock.c (100%)
 delete mode 100644 sandbox/base/include/socks/status.h
 rename {sandbox/util => util}/data_size.c (100%)
 rename {sandbox/vm => vm}/bootstrap.c (100%)
 rename {sandbox/vm => vm}/cache.c (100%)
 rename {sandbox/vm => vm}/kmalloc.c (100%)
 rename {sandbox/memblock => vm}/memblock.c (100%)
 rename {sandbox/vm => vm}/page.c (100%)
 rename {sandbox/vm => vm}/zone.c (100%)

diff --git a/sandbox/btree/btree.c b/ds/btree.c
similarity index 100%
rename from sandbox/btree/btree.c
rename to ds/btree.c
diff --git a/sandbox/queue/queue.c b/ds/queue.c
similarity index 100%
rename from sandbox/queue/queue.c
rename to ds/queue.c
diff --git a/sandbox/btree/include/socks/btree.h b/include/socks/btree.h
similarity index 100%
rename from sandbox/btree/include/socks/btree.h
rename to include/socks/btree.h
diff --git a/sandbox/locks/include/socks/locks.h b/include/socks/locks.h
similarity index 100%
rename from sandbox/locks/include/socks/locks.h
rename to include/socks/locks.h
diff --git a/sandbox/memblock/include/socks/memblock.h b/include/socks/memblock.h
similarity index 100%
rename from sandbox/memblock/include/socks/memblock.h
rename to include/socks/memblock.h
diff --git a/sandbox/queue/include/socks/queue.h b/include/socks/queue.h
similarity index 100%
rename from sandbox/queue/include/socks/queue.h
rename to include/socks/queue.h
diff --git a/sandbox/base/include/socks/types.h b/include/socks/types.h
similarity index 100%
rename from sandbox/base/include/socks/types.h
rename to include/socks/types.h
diff --git a/sandbox/util/include/socks/util.h b/include/socks/util.h
similarity index 100%
rename from sandbox/util/include/socks/util.h
rename to include/socks/util.h
diff --git a/sandbox/vm/include/socks/vm.h b/include/socks/vm.h
similarity index 100%
rename from sandbox/vm/include/socks/vm.h
rename to include/socks/vm.h
diff --git a/sandbox/locks/spinlock.c b/kernel/spinlock.c
similarity index 100%
rename from sandbox/locks/spinlock.c
rename to kernel/spinlock.c
diff --git a/sandbox/base/include/socks/status.h b/sandbox/base/include/socks/status.h
deleted file mode 100644
index 6783f49..0000000
--- a/sandbox/base/include/socks/status.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef SOCKS_STATUS_H_
-#define SOCKS_STATUS_H_
-
-typedef unsigned int kern_status_t;
-
-#define KERN_OK			(0)
-#define KERN_ERR_UNIMPLEMENTED	(1)
-
-#endif
diff --git a/sandbox/util/data_size.c b/util/data_size.c
similarity index 100%
rename from sandbox/util/data_size.c
rename to util/data_size.c
diff --git a/sandbox/vm/bootstrap.c b/vm/bootstrap.c
similarity index 100%
rename from sandbox/vm/bootstrap.c
rename to vm/bootstrap.c
diff --git a/sandbox/vm/cache.c b/vm/cache.c
similarity index 100%
rename from sandbox/vm/cache.c
rename to vm/cache.c
diff --git a/sandbox/vm/kmalloc.c b/vm/kmalloc.c
similarity index 100%
rename from sandbox/vm/kmalloc.c
rename to vm/kmalloc.c
diff --git a/sandbox/memblock/memblock.c b/vm/memblock.c
similarity index 100%
rename from sandbox/memblock/memblock.c
rename to vm/memblock.c
diff --git a/sandbox/vm/page.c b/vm/page.c
similarity index 100%
rename from sandbox/vm/page.c
rename to vm/page.c
diff --git a/sandbox/vm/zone.c b/vm/zone.c
similarity index 100%
rename from sandbox/vm/zone.c
rename to vm/zone.c