Changeset 58775d30 in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2003739

Parents:

6069061 (diff), 795e2bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

• kernel/generic/src/mm/frame.c (modified) (2 diffs)

kernel/generic/src/mm/frame.c

@@ -61 +61 @@
 #include <config.h>
 #include <str.h>
+#include <proc/thread.h> /* THREAD */
 
 zones_t zones;
@@ -72 +73 @@
 static size_t mem_avail_req = 0;  /**< Number of frames requested. */
 static size_t mem_avail_gen = 0;  /**< Generation counter. */
-
-/********************/
-/* Helper functions */
-/********************/
-
-NO_TRACE static inline size_t frame_index(zone_t *zone, frame_t *frame)
-{
-        return (size_t) (frame - zone->frames);
-}
-
-NO_TRACE static inline size_t frame_index_abs(zone_t *zone, frame_t *frame)
-{
-        return (size_t) (frame - zone->frames) + zone->base;
-}
-
-NO_TRACE static inline bool frame_index_valid(zone_t *zone, size_t index)
-{
-        return (index < zone->count);
-}
 
 /** Initialize frame structure.