Merge branch 'master' of https://github.com/Atmosphere-NX/Atmosphere

libraries/libmesosphere/include/mesosphere/kern_k_linked_list.hpp

@@ -122,6 +122,16 @@ namespace ams::kern {
         public:
             constexpr KLinkedList() : BaseList() { /* ... */ }
 
+            ~KLinkedList() {
+                /* Erase all elements. */
+                for (auto it = this->begin(); it != this->end(); it = this->erase(it)) {
+                    /* ... */
+                }
+
+                /* Ensure we succeeded. */
+                MESOSPHERE_ASSERT(this->empty());
+            }
+
             /* Iterator accessors. */
             iterator begin() {
                 return iterator(BaseList::begin());

libraries/libvapours/include/vapours/svc/svc_types_common.hpp

@@ -192,10 +192,10 @@ namespace ams::svc {
     };
 
     enum CodeMemoryOperation : u32 {
-        CodeMemoryOperation_MapOwner   = 0,
-        CodeMemoryOperation_MapSlave   = 1,
-        CodeMemoryOperation_UnmapOwner = 2,
-        CodeMemoryOperation_UnmapSlave = 3,
+        CodeMemoryOperation_Map            = 0,
+        CodeMemoryOperation_MapToOwner     = 1,
+        CodeMemoryOperation_Unmap          = 2,
+        CodeMemoryOperation_UnmapFromOwner = 3,
     };
 
     /* Synchronization types. */