diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /arch/ia64/kernel/perfmon.c | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 3aaede0d6981..e2321536ee4c 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -2302,7 +2302,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, pfm_context_t *ctx, unsigned lon | |||
| 2302 | DPRINT(("smpl_buf @%p\n", smpl_buf)); | 2302 | DPRINT(("smpl_buf @%p\n", smpl_buf)); |
| 2303 | 2303 | ||
| 2304 | /* allocate vma */ | 2304 | /* allocate vma */ |
| 2305 | vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 2305 | vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
| 2306 | if (!vma) { | 2306 | if (!vma) { |
| 2307 | DPRINT(("Cannot allocate vma\n")); | 2307 | DPRINT(("Cannot allocate vma\n")); |
| 2308 | goto error_kmem; | 2308 | goto error_kmem; |