From c4ec8534b194218c2d52f5d157c5fd5c0665c293 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Fri, 17 Oct 2008 12:02:31 +1100 Subject: [PATCH] --- yaml --- r: 116917 b: refs/heads/master c: 837ef884b702edd1c4514eaed1dbecd48721bd22 h: refs/heads/master i: 116915: 5a74228287be661b1b8f1667c9d657345e7f49ae v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/spufs/file.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a2c29cc15191..877774dab3eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f027faa231f38c02e949352735eac76f29090809 +refs/heads/master: 837ef884b702edd1c4514eaed1dbecd48721bd22 diff --git a/trunk/arch/powerpc/platforms/cell/spufs/file.c b/trunk/arch/powerpc/platforms/cell/spufs/file.c index b6f7b917b56c..b73c369cc6f1 100644 --- a/trunk/arch/powerpc/platforms/cell/spufs/file.c +++ b/trunk/arch/powerpc/platforms/cell/spufs/file.c @@ -2442,7 +2442,7 @@ static int spufs_switch_log_open(struct inode *inode, struct file *file) goto out; } - ctx->switch_log = kzalloc(sizeof(struct switch_log) + + ctx->switch_log = kmalloc(sizeof(struct switch_log) + SWITCH_LOG_BUFSIZE * sizeof(struct switch_log_entry), GFP_KERNEL); @@ -2451,6 +2451,7 @@ static int spufs_switch_log_open(struct inode *inode, struct file *file) goto out; } + ctx->switch_log->head = ctx->switch_log->tail = 0; init_waitqueue_head(&ctx->switch_log->wait); rc = 0;