aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/sn
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-26 09:24:23 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-26 09:24:23 +0200
commit9a13150109fb418c50fa400c012f90d0ce6f67c3 (patch)
tree237d8ee3b8b87984776b5aa0f05b92f84d372a1d /arch/ia64/sn
parent3ccf79f4570acacfefc51772e8f9207895b35ad7 (diff)
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff)
downloadkernel_samsung_aries-9a13150109fb418c50fa400c012f90d0ce6f67c3.zip
kernel_samsung_aries-9a13150109fb418c50fa400c012f90d0ce6f67c3.tar.gz
kernel_samsung_aries-9a13150109fb418c50fa400c012f90d0ce6f67c3.tar.bz2
Merge commit 'v2.6.26-rc8' into core/rcu
Diffstat (limited to 'arch/ia64/sn')
-rw-r--r--arch/ia64/sn/kernel/sn2/sn2_smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index 6dd886c..e585f9a 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -512,7 +512,7 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si
int cpu;
char optstr[64];
- if (count > sizeof(optstr))
+ if (count == 0 || count > sizeof(optstr))
return -EINVAL;
if (copy_from_user(optstr, user, count))
return -EFAULT;