---

yaml --- r: 163140 b: refs/heads/master c: d3d381c h: refs/heads/master v: v3
git-mirror · Sep 2, 2009 · fdb87d3 · fdb87d3
1 parent 3ed6550
commit fdb87d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fcc81a38b699a81e47fdd655cf514c789576554
+refs/heads/master: d3d381c6365ef5b06c4184a3fe047cf027533970
diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c
@@ -665,7 +665,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm)
 	if (!pwrdm->pwrsts)
 		return 0;
 
-	pwrst = kmalloc(sizeof(struct power_state), GFP_KERNEL);
+	pwrst = kmalloc(sizeof(struct power_state), GFP_ATOMIC);
 	if (!pwrst)
 		return -ENOMEM;
 	pwrst->pwrdm = pwrdm;