diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2005-12-05 22:52:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 14:52:45 +1100 |
| commit | d88cfffac0002c56c1a7a813cb885fa6b5fdcd0e (patch) | |
| tree | 13e4e65d3275a275913b14b12b49dbe987789334 | |
| parent | 39c73c332c8264c0a3a1ce58aa3eae52d17af025 (diff) | |
| download | blackbird-op-linux-d88cfffac0002c56c1a7a813cb885fa6b5fdcd0e.tar.gz blackbird-op-linux-d88cfffac0002c56c1a7a813cb885fa6b5fdcd0e.zip | |
[PATCH] spufs: fix local store page refcounting
With the new rules for reserved pages, the spufs now
needs working page reference counting.
I should probably look into converting to vm_insert_page,
but for now this patch makes spufs work again.
Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/file.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 56273e56cbfb..c41a6e2e2c30 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c @@ -114,7 +114,7 @@ static void __init cell_spuprop_present(struct device_node *spe, for (pfn = start_pfn; pfn < end_pfn; pfn++) { struct page *page = pfn_to_page(pfn); set_page_links(page, ZONE_DMA, node_id, pfn); - set_page_count(page, 0); + set_page_count(page, 1); reset_page_mapcount(page); SetPageReserved(page); INIT_LIST_HEAD(&page->lru); diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c index 786fdb1a1cc1..0fe1feccc02d 100644 --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c @@ -23,6 +23,7 @@ #include <linux/fs.h> #include <linux/ioctl.h> #include <linux/module.h> +#include <linux/pagemap.h> #include <linux/poll.h> #include <asm/io.h> @@ -106,6 +107,7 @@ spufs_mem_mmap_nopage(struct vm_area_struct *vma, if (type) *type = VM_FAULT_MINOR; + page_cache_get(page); return page; } @@ -120,7 +122,6 @@ spufs_mem_mmap(struct file *file, struct vm_area_struct *vma) return -EINVAL; /* FIXME: */ - vma->vm_flags |= VM_RESERVED; vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot) | _PAGE_NO_CACHE); |
