From a2aab4792490ca2a33161bd3dd2308c00b6886f0 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Fri, 24 Aug 2007 01:40:26 +0200 Subject: [PATCH] --- yaml --- r: 64691 b: refs/heads/master c: 1aac0b5739ae192ee812eee09625ebfc08c2d760 h: refs/heads/master i: 64689: 49e5eb8aed3a394e981dc53b11be864ebb6560a0 64687: 01668980be8d9250119cdd0af1275f02f06f7690 v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index df65b213394e..9cc379b36b53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f740e6c9c55cac6ab0a7d44a464b54467cca4f4f +refs/heads/master: 1aac0b5739ae192ee812eee09625ebfc08c2d760 diff --git a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c index df8d5bed6119..1a8e49607f11 100644 --- a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c @@ -66,7 +66,8 @@ static int sn_hwperf_enum_objects(int *nobj, struct sn_hwperf_object_info **ret) } sz = sn_hwperf_obj_cnt * sizeof(struct sn_hwperf_object_info); - if ((objbuf = (struct sn_hwperf_object_info *) vmalloc(sz)) == NULL) { + objbuf = vmalloc(sz); + if (objbuf == NULL) { printk("sn_hwperf_enum_objects: vmalloc(%d) failed\n", (int)sz); e = -ENOMEM; goto out;