Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / ehea / ehea_qmr.c

diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index 49d766ebbcf4e630d91cf8c245e50e96322be360..3747457f5e69441a14d91932b3ac3aca18a5c879 100644 (file)
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -1005,7 +1005,7 @@ void ehea_error_data(struct ehea_adapter *adapter, u64 res_handle)
        unsigned long ret;
        u64 *rblock;
 
-       rblock = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       rblock = (void *)get_zeroed_page(GFP_KERNEL);
        if (!rblock) {
                ehea_error("Cannot allocate rblock memory.");
                return;
@@ -1022,5 +1022,5 @@ void ehea_error_data(struct ehea_adapter *adapter, u64 res_handle)
        else
                ehea_error("Error data could not be fetched: %llX", res_handle);
 
-       kfree(rblock);
+       free_page((unsigned long)rblock);
 }