Changeset 3bacee1 in mainline for kernel/generic/src/mm

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (2 diffs)
• backend_user.c (modified) (1 diff)
• frame.c (modified) (4 diffs)

kernel/generic/src/mm/as.c

@@ -1006 +1006 @@
                                 pte_t pte;
                                 bool found = page_mapping_find(as,
-                                     ptr + P2SZ(size), false, &pte);
+                                    ptr + P2SZ(size), false, &pte);
 
                                 assert(found);
@@ -2196 +2196 @@
                 backend = &user_backend;
                 if (copy_from_uspace(&backend_data.pager_info, pager_info,
-                        sizeof(as_area_pager_info_t)) != EOK) {
+                    sizeof(as_area_pager_info_t)) != EOK) {
                         return (sysarg_t) AS_MAP_FAILED;
                 }

kernel/generic/src/mm/backend_user.c

@@ -118 +118 @@
         as_area_pager_info_t *pager_info = &area->backend_data.pager_info;
 
-        ipc_data_t data = {};
+        ipc_data_t data = { };
         IPC_SET_IMETHOD(data, IPC_M_PAGE_IN);
         IPC_SET_ARG1(data, upage - area->base);

kernel/generic/src/mm/frame.c

@@ -198 +198 @@
         size_t i = hint;
         do {
-                if ((zones.info[i].base <= frame)
-                    && (zones.info[i].base + zones.info[i].count >= frame + count))
+                if ((zones.info[i].base <= frame) &&
+                    (zones.info[i].base + zones.info[i].count >= frame + count))
                         return i;
 
@@ -551 +551 @@
 
         pfn_t cframes = SIZE2FRAMES(zone_conf_size(
-            zones.info[z2].base - zones.info[z1].base
-            + zones.info[z2].count));
+            zones.info[z2].base - zones.info[z1].base +
+            zones.info[z2].count));
 
         /* Allocate merged zone data inside one of the zones */
@@ -704 +704 @@
                  * the assert
                  */
-                assert(confframe != ADDR2PFN((uintptr_t ) NULL));
+                assert(confframe != ADDR2PFN((uintptr_t) NULL));
 
                 /* Update the known end of physical memory. */
@@ -1206 +1206 @@
         size_t free_highprio = 0;
 
-        for (size_t i = 0;; i++) {
+        for (size_t i = 0; ; i++) {
                 irq_spinlock_lock(&zones.lock, true);