From 03d83d52d2ce66b4af354593e41821130eae76ba Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Mon, 8 Nov 2010 11:20:49 +0900 Subject: [PATCH] --- yaml --- r: 221704 b: refs/heads/master c: 6070bf3596f3b5a54091a08d5b2bc90c143dc264 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/openpromfs/inode.c | 2 +- trunk/include/linux/kernel.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 86258edf4f8c..ecefa44a2d7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e15482566b752718e7225168380904f1d0cdfa3 +refs/heads/master: 6070bf3596f3b5a54091a08d5b2bc90c143dc264 diff --git a/trunk/fs/openpromfs/inode.c b/trunk/fs/openpromfs/inode.c index 911e61f348fc..ddb1f41376e5 100644 --- a/trunk/fs/openpromfs/inode.c +++ b/trunk/fs/openpromfs/inode.c @@ -418,7 +418,7 @@ static int openprom_fill_super(struct super_block *s, void *data, int silent) static struct dentry *openprom_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { - return mount_single(fs_type, flags, data, openprom_fill_super); + return mount_single(fs_type, flags, data, openprom_fill_super) } static struct file_system_type openprom_fs_type = { diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index 450092c1e35f..b526947bdf48 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -60,7 +60,7 @@ extern const char linux_proc_banner[]; #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #define roundup(x, y) ( \ { \ - typeof(y) __y = y; \ + const typeof(y) __y = y; \ (((x) + (__y - 1)) / __y) * __y; \ } \ )