diff options
| author | Niklas Cassel <nks@flawful.org> | 2016-09-22 16:08:38 +0200 |
|---|---|---|
| committer | Jesper Nilsson <jespern@axis.com> | 2016-09-22 16:11:18 +0200 |
| commit | 506823f6e7a349ba3f26f03f162733af64c300cc (patch) | |
| tree | d9774b4190b87811c9496f23591892959d518298 /arch | |
| parent | 9d74179a226c83dd610c487a27ac6082b768b074 (diff) | |
| download | linux-506823f6e7a349ba3f26f03f162733af64c300cc.tar.gz linux-506823f6e7a349ba3f26f03f162733af64c300cc.tar.bz2 linux-506823f6e7a349ba3f26f03f162733af64c300cc.zip | |
cris: intmem: fix pointer comparison compile warning
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 != &intmem_allocations) &&
^
arch/cris/arch-v32/mm/intmem.c:123:14: warning: comparison of distinct pointer types lacks a cast
if ((next != &intmem_allocations) &&
^
Signed-off-by: Niklas Cassel <nks@flawful.org>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/arch-v32/mm/intmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/mm/intmem.c b/arch/cris/arch-v32/mm/intmem.c index bad735d46c51..c80728401487 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 != &intmem_allocations) && + if ((&prev->entry != &intmem_allocations) && (prev->status == STATUS_FREE)) { prev->size += allocation->size; list_del(&allocation->entry); kfree(allocation); allocation = prev; } - if ((next != &intmem_allocations) && + if ((&next->entry != &intmem_allocations) && (next->status == STATUS_FREE)) { allocation->size += next->size; list_del(&next->entry); |