V4L/DVB (10085): sh_mobile_ceu: add NV16 and NV61 support

[safe/jmp/linux-2.6] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index 6aac5c6..4337063 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -523,7 +523,7 @@ static void __init __reserve_region_with_split(struct resource *root,
 {
        struct resource *parent = root;
        struct resource *conflict;
-       struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
+       struct resource *res = kzalloc(sizeof(*res), GFP_ATOMIC);
 
        if (!res)
                return;