Patchwork [for,2.6.27?,05/10] ehea: fix DLPAR memory handling

login
register
mail settings
Submitter Andrew Morton
Date Sept. 22, 2008, 9:10 p.m.
Message ID <200809222110.m8MLAJJ8029885@imap1.linux-foundation.org>
Download mbox | patch
Permalink /patch/948/
State Accepted
Delegated to: Jeff Garzik
Headers show

Comments

Andrew Morton - Sept. 22, 2008, 9:10 p.m.
From: Hannes Hering <hannes.hering@gmx.de>

The ehea busmap must be allocated only once in the first of many calls of the
ehea_create_busmap_callback.

Signed-off-by: Hannes Hering <hering2@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ehea/ehea_qmr.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

diff -puN drivers/net/ehea/ehea_qmr.c~ehea-fix-dlpar-memory-handling drivers/net/ehea/ehea_qmr.c
--- a/drivers/net/ehea/ehea_qmr.c~ehea-fix-dlpar-memory-handling
+++ a/drivers/net/ehea/ehea_qmr.c
@@ -595,7 +595,8 @@  static int ehea_create_busmap_callback(u
 	end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE);
 	mr_len = *(unsigned long *)arg;
 
-	ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);
+	if (!ehea_bmap)
+		ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);
 	if (!ehea_bmap)
 		return -ENOMEM;