diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
| commit | 973a971d5a5ef0d6a60e5c9b0df675fef6be3383 (patch) | |
| tree | d49729a4bff6fd5bdacfcc57e7ba44911fd8812c /kernel/resource.c | |
| parent | f4bafd5dc0d4f03f6dc4466d233a4601c54d40b3 (diff) | |
| parent | a75952b72a0fff3031124003e62118111aed42c1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmk-next
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 6aac5c60b25..4337063663e 100644 --- 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; |