diff options
| author | Richard Braun <rbraun@sceen.net> | 2016-01-23 21:30:07 +0100 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2016-01-23 21:30:07 +0100 |
| commit | 8bde80c03f475f06b62962905dc6766f5bc28c4c (patch) | |
| tree | 28c0dd9f3b460b09ce1d9f8e7926b02bb93576b1 /linux/dev/glue | |
| parent | bee3f0799656116cee095f79f6aa91d18157c0f0 (diff) | |
| parent | e835160b6b95f3b904fbc429392a63be1e4ed6b8 (diff) | |
Merge branch 'rbraun/vm_page'
Diffstat (limited to 'linux/dev/glue')
| -rw-r--r-- | linux/dev/glue/glue.h | 4 | ||||
| -rw-r--r-- | linux/dev/glue/kmem.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/linux/dev/glue/glue.h b/linux/dev/glue/glue.h index 5d4f6d8..8cb118c 100644 --- a/linux/dev/glue/glue.h +++ b/linux/dev/glue/glue.h @@ -25,8 +25,8 @@ extern int linux_auto_config; extern int linux_intr_pri; -extern void *alloc_contig_mem (unsigned, unsigned, unsigned, vm_page_t *); -extern void free_contig_mem (vm_page_t); +extern unsigned long alloc_contig_mem (unsigned, unsigned, unsigned, vm_page_t *); +extern void free_contig_mem (vm_page_t, unsigned); extern void init_IRQ (void); extern void restore_IRQ (void); extern void linux_kmem_init (void); diff --git a/linux/dev/glue/kmem.c b/linux/dev/glue/kmem.c index ff052ff..ed57610 100644 --- a/linux/dev/glue/kmem.c +++ b/linux/dev/glue/kmem.c @@ -111,10 +111,8 @@ linux_kmem_init () for (p = pages, j = 0; j < MEM_CHUNK_SIZE - PAGE_SIZE; j += PAGE_SIZE) { assert (p->phys_addr < MEM_DMA_LIMIT); - assert (p->phys_addr + PAGE_SIZE - == ((vm_page_t) p->pageq.next)->phys_addr); - - p = (vm_page_t) p->pageq.next; + assert (p->phys_addr + PAGE_SIZE == (p + 1)->phys_addr); + p++; } pages_free[i].end = pages_free[i].start + MEM_CHUNK_SIZE; |