Index: generic/src/mm/frame.c
===================================================================
--- generic/src/mm/frame.c	(revision 7ee0e2fa610021a3023ca5ce1f183ca5f3f759d2)
+++ generic/src/mm/frame.c	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -70,5 +70,5 @@
 typedef struct {
 	count_t refcount;	/**< tracking of shared frames  */
-	__u8 buddy_order;	/**< buddy system block order */
+	uint8_t buddy_order;	/**< buddy system block order */
 	link_t buddy_link;	/**< link to the next free block inside one order */
 	void *parent;           /**< If allocated by slab, this points there */
@@ -218,5 +218,5 @@
 
 /** @return True if zone can allocate specified order */
-static int zone_can_alloc(zone_t *z, __u8 order)
+static int zone_can_alloc(zone_t *z, uint8_t order)
 {
 	return buddy_system_can_alloc(z->buddy_system, order);
@@ -231,5 +231,5 @@
  * @param pzone Pointer to preferred zone or NULL, on return contains zone number
  */
-static zone_t * find_free_zone_lock(__u8 order, int *pzone)
+static zone_t * find_free_zone_lock(uint8_t order, int *pzone)
 {
 	int i;
@@ -272,5 +272,5 @@
  */
 static link_t *zone_buddy_find_block(buddy_system_t *b, link_t *child,
-				     __u8 order)
+				     uint8_t order)
 {
 	frame_t * frame;
@@ -381,5 +381,5 @@
  * @param order Order to set
  */
-static void zone_buddy_set_order(buddy_system_t *b, link_t * block, __u8 order) {
+static void zone_buddy_set_order(buddy_system_t *b, link_t * block, uint8_t order) {
 	frame_t * frame;
 	frame = list_get_instance(block, frame_t, buddy_link);
@@ -394,5 +394,5 @@
  * @return Order of block
  */
-static __u8 zone_buddy_get_order(buddy_system_t *b, link_t * block) {
+static uint8_t zone_buddy_get_order(buddy_system_t *b, link_t * block) {
 	frame_t * frame;
 	frame = list_get_instance(block, frame_t, buddy_link);
@@ -451,5 +451,5 @@
  *
  */
-static pfn_t zone_frame_alloc(zone_t *zone, __u8 order)
+static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
 {
 	pfn_t v;
@@ -484,5 +484,5 @@
 {
 	frame_t *frame;
-	__u8 order;
+	uint8_t order;
 
 	frame = &zone->frames[frame_idx];
@@ -538,5 +538,5 @@
 static void _zone_merge(zone_t *z, zone_t *z1, zone_t *z2)
 {
-	__u8 max_order;
+	uint8_t max_order;
 	int i, z2idx;
 	pfn_t frame_idx;
@@ -625,5 +625,5 @@
 	int i;
 
-	pfn = ADDR2PFN((__address)KA2PA(oldzone));
+	pfn = ADDR2PFN((uintptr_t)KA2PA(oldzone));
 	cframes = SIZE2FRAMES(zone_conf_size(oldzone->count));
 	
@@ -654,5 +654,5 @@
 {
 	count_t i;
-	__u8 order;
+	uint8_t order;
 	frame_t *frame;
 	
@@ -690,5 +690,5 @@
 	zone_t *zone1, *zone2, *newzone;
 	int cframes;
-	__u8 order;
+	uint8_t order;
 	int i;
 	pfn_t pfn;
@@ -780,5 +780,5 @@
 {
 	int i;
-	__u8 max_order;
+	uint8_t max_order;
 
 	spinlock_initialize(&z->lock, "zone_lock");
@@ -818,5 +818,5 @@
  * @return Size of zone configuration info (in bytes)
  */
-__address zone_conf_size(count_t count)
+uintptr_t zone_conf_size(count_t count)
 {
 	int size = sizeof(zone_t) + count*sizeof(frame_t);
@@ -846,5 +846,5 @@
 {
 	zone_t *z;
-	__address addr;
+	uintptr_t addr;
 	count_t confcount;
 	int i;
@@ -932,5 +932,5 @@
  *
  */
-void * frame_alloc_generic(__u8 order, int flags, int *pzone) 
+void * frame_alloc_generic(uint8_t order, int flags, int *pzone) 
 {
 	ipl_t ipl;
@@ -991,5 +991,5 @@
  * @param Frame Physical Address of of the frame to be freed.
  */
-void frame_free(__address frame)
+void frame_free(uintptr_t frame)
 {
 	ipl_t ipl;
@@ -1100,5 +1100,5 @@
 		zone = zones.info[i];
 		spinlock_lock(&zone->lock);
-		printf("%d: %.*p \t%10zd\t%10zd\n", i, sizeof(__address) * 2, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
+		printf("%d: %.*p \t%10zd\t%10zd\n", i, sizeof(uintptr_t) * 2, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
 		spinlock_unlock(&zone->lock);
 	}
@@ -1132,5 +1132,5 @@
 	spinlock_lock(&zone->lock);
 	printf("Memory zone information\n");
-	printf("Zone base address: %#.*p\n", sizeof(__address) * 2, PFN2ADDR(zone->base));
+	printf("Zone base address: %#.*p\n", sizeof(uintptr_t) * 2, PFN2ADDR(zone->base));
 	printf("Zone size: %zd frames (%zdK)\n", zone->count, ((zone->count) * FRAME_SIZE) >> 10);
 	printf("Allocated space: %zd frames (%zdK)\n", zone->busy_count, (zone->busy_count * FRAME_SIZE) >> 10);