[PATCH 2/4] cris: intmem: fix pointer comparison compile warning

2015-11-28 Thread Niklas Cassel
The code previously depended on list_head being defined
as the first item in struct intmem_allocation.

arch/cris/arch-v32/mm/intmem.c: In function ‘crisv32_intmem_free’:
arch/cris/arch-v32/mm/intmem.c:116:14: warning: comparison of distinct pointer 
types lacks a cast
if ((prev != _allocations) &&
  ^
arch/cris/arch-v32/mm/intmem.c:123:14: warning: comparison of distinct pointer 
types lacks a cast
if ((next != _allocations) &&
  ^

Signed-off-by: Niklas Cassel 
---
 arch/cris/arch-v32/mm/intmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/cris/arch-v32/mm/intmem.c b/arch/cris/arch-v32/mm/intmem.c
index bad735d..c807284 100644
--- a/arch/cris/arch-v32/mm/intmem.c
+++ b/arch/cris/arch-v32/mm/intmem.c
@@ -113,14 +113,14 @@ void crisv32_intmem_free(void* addr)
 
allocation->status = STATUS_FREE;
/* Join with prev and/or next if also free */
-   if ((prev != _allocations) &&
+   if ((>entry != _allocations) &&
(prev->status == STATUS_FREE)) {
prev->size += allocation->size;
list_del(>entry);
kfree(allocation);
allocation = prev;
}
-   if ((next != _allocations) &&
+   if ((>entry != _allocations) &&
(next->status == STATUS_FREE)) {
allocation->size += next->size;
list_del(>entry);
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 2/4] cris: intmem: fix pointer comparison compile warning

2015-11-28 Thread Niklas Cassel
The code previously depended on list_head being defined
as the first item in struct intmem_allocation.

arch/cris/arch-v32/mm/intmem.c: In function ‘crisv32_intmem_free’:
arch/cris/arch-v32/mm/intmem.c:116:14: warning: comparison of distinct pointer 
types lacks a cast
if ((prev != _allocations) &&
  ^
arch/cris/arch-v32/mm/intmem.c:123:14: warning: comparison of distinct pointer 
types lacks a cast
if ((next != _allocations) &&
  ^

Signed-off-by: Niklas Cassel 
---
 arch/cris/arch-v32/mm/intmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/cris/arch-v32/mm/intmem.c b/arch/cris/arch-v32/mm/intmem.c
index bad735d..c807284 100644
--- a/arch/cris/arch-v32/mm/intmem.c
+++ b/arch/cris/arch-v32/mm/intmem.c
@@ -113,14 +113,14 @@ void crisv32_intmem_free(void* addr)
 
allocation->status = STATUS_FREE;
/* Join with prev and/or next if also free */
-   if ((prev != _allocations) &&
+   if ((>entry != _allocations) &&
(prev->status == STATUS_FREE)) {
prev->size += allocation->size;
list_del(>entry);
kfree(allocation);
allocation = prev;
}
-   if ((next != _allocations) &&
+   if ((>entry != _allocations) &&
(next->status == STATUS_FREE)) {
allocation->size += next->size;
list_del(>entry);
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/