diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-04-30 21:12:13 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-04-30 21:16:49 +0200 |
commit | 3c56999eec7acc105a31b4546c94aad2fb844b13 (patch) | |
tree | 293aef41f1441875323541cbc4f790c291b83679 /fs | |
parent | bad760089c1ef7fe525c0f268a4078b9cb483903 (diff) | |
parent | 12d161147f828192b5bcc33166f468a827832767 (diff) | |
download | op-kernel-dev-3c56999eec7acc105a31b4546c94aad2fb844b13.zip op-kernel-dev-3c56999eec7acc105a31b4546c94aad2fb844b13.tar.gz |
Merge branch 'core/signal' into perfcounters/core
This is necessary to avoid the conflict of syscall numbers.
Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
Fixes up the borked syscall numbers of perfcounters versus
preadv/pwritev as well.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ecryptfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 93bc0f8..2f0945d 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -667,7 +667,7 @@ ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz) lower_buf = kmalloc(lower_bufsiz, GFP_KERNEL); if (lower_buf == NULL) { printk(KERN_ERR "%s: Out of memory whilst attempting to " - "kmalloc [%d] bytes\n", __func__, lower_bufsiz); + "kmalloc [%zd] bytes\n", __func__, lower_bufsiz); rc = -ENOMEM; goto out; } @@ -690,7 +690,7 @@ ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz) } /* Check for bufsiz <= 0 done in sys_readlinkat() */ rc = copy_to_user(buf, plaintext_name, - min((unsigned) bufsiz, plaintext_name_size)); + min((size_t) bufsiz, plaintext_name_size)); if (rc) rc = -EFAULT; else |