git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
sh
/
mm
/
consistent.c
diff --git
a/arch/sh/mm/consistent.c
b/arch/sh/mm/consistent.c
index
1f7af0c
..
ee73e30
100644
(file)
--- a/
arch/sh/mm/consistent.c
+++ b/
arch/sh/mm/consistent.c
@@
-11,7
+11,7
@@
#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <linux/dma-mapping.h>
#include <asm/io.h>
-void *consistent_alloc(
in
t gfp, size_t size, dma_addr_t *handle)
+void *consistent_alloc(
gfp_
t gfp, size_t size, dma_addr_t *handle)
{
struct page *page, *end, *free;
void *ret;
{
struct page *page, *end, *free;
void *ret;
@@
-23,6
+23,7
@@
void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle)
page = alloc_pages(gfp, order);
if (!page)
return NULL;
page = alloc_pages(gfp, order);
if (!page)
return NULL;
+ split_page(page, order);
ret = page_address(page);
*handle = virt_to_phys(ret);
ret = page_address(page);
*handle = virt_to_phys(ret);
@@
-37,8
+38,6
@@
void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle)
end = page + (1 << order);
while (++page < end) {
end = page + (1 << order);
while (++page < end) {
- set_page_count(page, 1);
-
/* Free any unused pages */
if (page >= free) {
__free_page(page);
/* Free any unused pages */
if (page >= free) {
__free_page(page);