Added ability to declare local per CPU variables
[akaros.git] / kern / include / colored_page_alloc.h
index 5cbed43..4ec1fa9 100644 (file)
@@ -7,23 +7,22 @@
  * @author Kevin Klues <klueska@cs.berkeley.edu>
  */
  
-#ifndef ROS_KERN_COLORED_PAGE_ALLOC_H
-#define ROS_KERN_COLORED_PAGE_ALLOC_H
+#pragma once
 
 #include <colored_caches.h>
 #include <arch/colored_page_alloc.h>
 #include <stdio.h>
        
 #define DECLARE_CACHE_COLORED_PAGE_LINK(_cache)                               \
-       page_list_entry_t _cache##_cache_colored_page_link;
+       page_list_entry_t _cache##_cache_colored_pg_link;
        
 #define DECLARE_CACHE_COLORED_PAGE_FREE_LIST(_cache)                          \
        uint8_t _cache##_num_colors = 0;                                          \
-       page_list_t *COUNT(_cache##_num_colors) _cache##_cache_colored_page_list = NULL;
+       page_list_t *_cache##_cache_colored_page_list = NULL;
        
 #define DECLARE_EXTERN_CACHE_COLORED_PAGE_FREE_LIST(_cache)                   \
     extern uint8_t _cache##_num_colors;                                       \
-       extern page_list_t *COUNT(_cache##_num_colors) _cache##_cache_colored_page_list;
+       extern page_list_t *_cache##_cache_colored_page_list;
        
 #define DECLARE_CACHE_COLORED_PAGE_ALLOC_FUNCTION(_cache)                     \
 error_t _cache##_page_alloc(page_t** page, size_t color)                      \
@@ -55,7 +54,7 @@ error_t _cache##_page_alloc(page_t** page, size_t color)                      \
 
 #define REMOVE_CACHE_COLORING_PAGE_FROM_FREE_LIST(_page, _cache)              \
        if(available_caches._cache == TRUE)                                       \
-               LIST_REMOVE(*(_page), _cache##_cache_colored_page_link);
+               LIST_REMOVE(*(_page), _cache##_cache_colored_pg_link);
 
 
 #define INSERT_CACHE_COLORING_PAGE_ONTO_FREE_LIST(_page, _cache)              \
@@ -64,8 +63,6 @@ error_t _cache##_page_alloc(page_t** page, size_t color)                      \
                   &(_cache##_cache_colored_page_list                                 \
                         [get_page_color(page2ppn((_page)), &(_cache))]),             \
                   (_page),                                                           \
-                  _cache##_cache_colored_page_link                                   \
+                  _cache##_cache_colored_pg_link                                   \
                );                                                                    \
        }
-
-#endif // ROS_KERN_COLORED_PAGE_ALLOC_H