X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc%2Flib%2Frheap.c;h=31e511856dc58bc2b819e80c32a35840db5bd9ca;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=4d938a062eddd287f44b65279f9f4fb76b9fe05c;hpb=5fc42a6ed0ec81088c37caadb45898ae6cd0ad2c;p=linux-2.6.git

diff --git a/arch/ppc/lib/rheap.c b/arch/ppc/lib/rheap.c
index 4d938a062..31e511856 100644
--- a/arch/ppc/lib/rheap.c
+++ b/arch/ppc/lib/rheap.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/rheap.c
- *
  * A Remote Heap.  Remote means that we don't touch the memory that the
  * heap points to. Normal heap implementations use the memory they manage
  * to place their list. We cannot do that because the memory we manage may
@@ -216,7 +214,7 @@ static void attach_free_block(rh_info_t * info, rh_block_t * blkn)
 
 	/* Grow the after block backwards */
 	if (before == NULL && after != NULL) {
-		(int8_t *) after->start -= size;
+		after->start = (int8_t *)after->start - size;
 		after->size += size;
 		return;
 	}
@@ -254,11 +252,11 @@ rh_info_t *rh_create(unsigned int alignment)
 
 	/* Alignment must be a power of two */
 	if ((alignment & (alignment - 1)) != 0)
-		return NULL;
+		return ERR_PTR(-EINVAL);
 
 	info = kmalloc(sizeof(*info), GFP_KERNEL);
 	if (info == NULL)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	info->alignment = alignment;
 
@@ -366,7 +364,7 @@ void *rh_detach_region(rh_info_t * info, void *start, int size)
 
 	/* Validate size */
 	if (size <= 0)
-		return NULL;
+		return ERR_PTR(-EINVAL);
 
 	/* The region must be aligned */
 	s = (unsigned long)start;
@@ -380,7 +378,7 @@ void *rh_detach_region(rh_info_t * info, void *start, int size)
 	e = e & ~m;
 
 	if (assure_empty(info, 1) < 0)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	blk = NULL;
 	list_for_each(l, &info->free_list) {
@@ -394,7 +392,7 @@ void *rh_detach_region(rh_info_t * info, void *start, int size)
 	}
 
 	if (blk == NULL)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	/* Perfect fit */
 	if (bs == s && be == e) {
@@ -407,7 +405,7 @@ void *rh_detach_region(rh_info_t * info, void *start, int size)
 	/* blk still in free list, with updated start and/or size */
 	if (bs == s || be == e) {
 		if (bs == s)
-			(int8_t *) blk->start += size;
+			blk->start = (int8_t *)blk->start + size;
 		blk->size -= size;
 
 	} else {
@@ -434,13 +432,13 @@ void *rh_alloc(rh_info_t * info, int size, const char *owner)
 
 	/* Validate size */
 	if (size <= 0)
-		return NULL;
+		return ERR_PTR(-EINVAL);
 
 	/* Align to configured alignment */
 	size = (size + (info->alignment - 1)) & ~(info->alignment - 1);
 
 	if (assure_empty(info, 1) < 0)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	blk = NULL;
 	list_for_each(l, &info->free_list) {
@@ -451,7 +449,7 @@ void *rh_alloc(rh_info_t * info, int size, const char *owner)
 	}
 
 	if (blk == NULL)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	/* Just fits */
 	if (blk->size == size) {
@@ -471,7 +469,7 @@ void *rh_alloc(rh_info_t * info, int size, const char *owner)
 	newblk->owner = owner;
 
 	/* blk still in free list, with updated start, size */
-	(int8_t *) blk->start += size;
+	blk->start = (int8_t *)blk->start + size;
 	blk->size -= size;
 
 	start = newblk->start;
@@ -490,7 +488,7 @@ void *rh_alloc_fixed(rh_info_t * info, void *start, int size, const char *owner)
 
 	/* Validate size */
 	if (size <= 0)
-		return NULL;
+		return ERR_PTR(-EINVAL);
 
 	/* The region must be aligned */
 	s = (unsigned long)start;
@@ -504,7 +502,7 @@ void *rh_alloc_fixed(rh_info_t * info, void *start, int size, const char *owner)
 	e = e & ~m;
 
 	if (assure_empty(info, 2) < 0)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	blk = NULL;
 	list_for_each(l, &info->free_list) {
@@ -517,7 +515,7 @@ void *rh_alloc_fixed(rh_info_t * info, void *start, int size, const char *owner)
 	}
 
 	if (blk == NULL)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	/* Perfect fit */
 	if (bs == s && be == e) {
@@ -535,7 +533,7 @@ void *rh_alloc_fixed(rh_info_t * info, void *start, int size, const char *owner)
 	/* blk still in free list, with updated start and/or size */
 	if (bs == s || be == e) {
 		if (bs == s)
-			(int8_t *) blk->start += size;
+			blk->start = (int8_t *)blk->start + size;
 		blk->size -= size;
 
 	} else {
@@ -645,6 +643,7 @@ int rh_set_owner(rh_info_t * info, void *start, const char *owner)
 		return -EINVAL;
 
 	blk->owner = owner;
+	size = blk->size;
 
 	return size;
 }