diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-18 13:34:30 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-18 13:34:30 +1000 |
| commit | 11a55f2274bf0d719e4dd05f4ac5e89a15740211 (patch) | |
| tree | 0886a988b43e280fe00e529155f8cd796e7edcc8 /arch/powerpc/lib/rheap.c | |
| parent | 858c52d15f186e055dc33a1872f5b45a66d42296 (diff) | |
| parent | 1a9ebc0cd2b3bb4450834e564722630fbc40611b (diff) | |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/powerpc/lib/rheap.c')
| -rw-r--r-- | arch/powerpc/lib/rheap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c index 22c3b4f53de..29b2941cada 100644 --- a/arch/powerpc/lib/rheap.c +++ b/arch/powerpc/lib/rheap.c @@ -54,7 +54,7 @@ static int grow(rh_info_t * info, int max_blocks) new_blocks = max_blocks - info->max_blocks; - block = kmalloc(sizeof(rh_block_t) * max_blocks, GFP_KERNEL); + block = kmalloc(sizeof(rh_block_t) * max_blocks, GFP_ATOMIC); if (block == NULL) return -ENOMEM; @@ -258,7 +258,7 @@ rh_info_t *rh_create(unsigned int alignment) if ((alignment & (alignment - 1)) != 0) return ERR_PTR(-EINVAL); - info = kmalloc(sizeof(*info), GFP_KERNEL); + info = kmalloc(sizeof(*info), GFP_ATOMIC); if (info == NULL) return ERR_PTR(-ENOMEM); |