[PATCH] S390: Replace calls to __get_free_pages() with __get_dma_pages().
From: Robert P. J. Day
Date: Tue Jun 05 2007 - 16:54:58 EST
Replace a number of calls to __get_free_pages() with the corresponding
calls to __get_dma_pages().
Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
---
once the __GFP_DMA argument is removed, it does look weird to see
the first argument of just 0. should that be filled in with
GFP_ATOMIC as christopher lameter suggested?
*not* compile tested.
drivers/s390/block/dasd.c | 2 +-
drivers/s390/char/tty3270.c | 2 +-
drivers/s390/cio/cmf.c | 3 +--
drivers/s390/net/claw.c | 22 +++++++++++-----------
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index bfeca57..7e0f71d 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -77,7 +77,7 @@ dasd_alloc_device(void)
atomic_set(&device->open_count, -1);
/* Get two pages for normal block device operations. */
- device->ccw_mem = (void *) __get_free_pages(GFP_ATOMIC | GFP_DMA, 1);
+ device->ccw_mem = (void *) __get_dma_pages(GFP_ATOMIC, 1);
if (device->ccw_mem == NULL) {
kfree(device);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index bc33068..4fae5e2 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -699,7 +699,7 @@ tty3270_alloc_view(void)
INIT_LIST_HEAD(&tp->freemem);
for (pages = 0; pages < TTY3270_STRING_PAGES; pages++) {
tp->freemem_pages[pages] = (void *)
- __get_free_pages(GFP_KERNEL|GFP_DMA, 0);
+ __get_dma_pages(GFP_KERNEL, 0);
if (!tp->freemem_pages[pages])
goto out_pages;
add_string_memory(&tp->freemem,
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 28abd69..4371224 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -585,8 +585,7 @@ alloc_cmb (struct ccw_device *cdev)
WARN_ON(!list_empty(&cmb_area.list));
spin_unlock(&cmb_area.lock);
- mem = (void*)__get_free_pages(GFP_KERNEL | GFP_DMA,
- get_order(size));
+ mem = (void*)__get_dma_pages(GFP_KERNEL, get_order(size));
spin_lock(&cmb_area.lock);
if (cmb_area.mem) {
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 6dd64d0..67ec924 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2193,11 +2193,11 @@ init_ccw_bk(struct net_device *dev)
*/
if (privptr->p_buff_ccw==NULL) {
privptr->p_buff_ccw=
- (void *)__get_free_pages(__GFP_DMA,
+ (void *)__get_dma_pages(0,
(int)pages_to_order_of_mag(ccw_pages_required ));
if (privptr->p_buff_ccw==NULL) {
printk(KERN_INFO "%s: %s() "
- "__get_free_pages for CCWs failed : "
+ "__get_dma_pages for CCWs failed : "
"pages is %d\n",
dev->name,__FUNCTION__,
ccw_pages_required );
@@ -2349,10 +2349,10 @@ init_ccw_bk(struct net_device *dev)
if (privptr->p_buff_write==NULL) {
if (privptr->p_env->write_size < PAGE_SIZE) {
privptr->p_buff_write=
- (void *)__get_free_pages(__GFP_DMA,
+ (void *)__get_dma_pages(0,
(int)pages_to_order_of_mag(claw_write_pages ));
if (privptr->p_buff_write==NULL) {
- printk(KERN_INFO "%s: %s() __get_free_pages for write"
+ printk(KERN_INFO "%s: %s() __get_dma_pages for write"
" bufs failed : get is for %d pages\n",
dev->name,__FUNCTION__,claw_write_pages );
free_pages((unsigned long)privptr->p_buff_ccw,
@@ -2408,17 +2408,17 @@ init_ccw_bk(struct net_device *dev)
{
privptr->p_write_free_chain=NULL;
for (i = 0; i< privptr->p_env->write_buffers ; i++) {
- p_buff=(void *)__get_free_pages(__GFP_DMA,
+ p_buff=(void *)__get_dma_pages(0,
(int)pages_to_order_of_mag(
privptr->p_buff_pages_perwrite) );
#ifdef IOTRACE
- printk(KERN_INFO "%s:%s __get_free_pages "
+ printk(KERN_INFO "%s:%s __get_dma_pages "
"for writes buf: get for %d pages\n",
dev->name,__FUNCTION__,
privptr->p_buff_pages_perwrite);
#endif
if (p_buff==NULL) {
- printk(KERN_INFO "%s:%s __get_free_pages"
+ printk(KERN_INFO "%s:%s __get_dma_pages"
"for writes buf failed : get is for %d pages\n",
dev->name,
__FUNCTION__,
@@ -2484,11 +2484,11 @@ init_ccw_bk(struct net_device *dev)
if (privptr->p_buff_read==NULL) {
if (privptr->p_env->read_size < PAGE_SIZE) {
privptr->p_buff_read=
- (void *)__get_free_pages(__GFP_DMA,
+ (void *)__get_dma_pages(0,
(int)pages_to_order_of_mag(claw_read_pages) );
if (privptr->p_buff_read==NULL) {
printk(KERN_INFO "%s: %s() "
- "__get_free_pages for read buf failed : "
+ "__get_dma_pages for read buf failed : "
"get is for %d pages\n",
dev->name,__FUNCTION__,claw_read_pages );
free_pages((unsigned long)privptr->p_buff_ccw,
@@ -2598,10 +2598,10 @@ init_ccw_bk(struct net_device *dev)
dev->name,__FUNCTION__);
#endif
for (i=0 ; i< privptr->p_env->read_buffers ; i++) {
- p_buff = (void *)__get_free_pages(__GFP_DMA,
+ p_buff = (void *)__get_dma_pages(0,
(int)pages_to_order_of_mag(privptr->p_buff_pages_perread) );
if (p_buff==NULL) {
- printk(KERN_INFO "%s: %s() __get_free_pages for read "
+ printk(KERN_INFO "%s: %s() __get_dma_pages for read "
"buf failed : get is for %d pages\n",
dev->name,__FUNCTION__,
privptr->p_buff_pages_perread );
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA
http://fsdev.net/wiki/index.php?title=Main_Page
========================================================================
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/