From d4dfc527bdd57eb3ef16286f67122c77ec7d85ec Mon Sep 17 00:00:00 2001
From: NISHIMOTO Hiroki <nishimoto.hiroki@renesas.com>
Date: Fri, 15 Jan 2010 08:25:00 +0900
Subject: [PATCH] --- yaml --- r: 179292 b: refs/heads/master c:
 ea4407834118405ef419e9b07794ceacadc01bae h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/sh/boards/mach-ecovec24/setup.c | 8 ++++++++
 trunk/fs/notify/inotify/inotify_fsnotify.c | 2 +-
 trunk/fs/notify/inotify/inotify_user.c     | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 69d22eede622..796863d7a883 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 976ae32be45a736acd49215a7e4771ff91f161c3
+refs/heads/master: ea4407834118405ef419e9b07794ceacadc01bae
diff --git a/trunk/arch/sh/boards/mach-ecovec24/setup.c b/trunk/arch/sh/boards/mach-ecovec24/setup.c
index 6a8861b39f05..5c246289b4f0 100644
--- a/trunk/arch/sh/boards/mach-ecovec24/setup.c
+++ b/trunk/arch/sh/boards/mach-ecovec24/setup.c
@@ -353,6 +353,10 @@ static struct i2c_board_info i2c1_devices[] = {
 	{
 		I2C_BOARD_INFO("r2025sd", 0x32),
 	},
+	{
+		I2C_BOARD_INFO("lis3lv02d", 0x1c),
+		.irq = 33,
+	}
 };
 
 /* KEYSC */
@@ -1115,6 +1119,10 @@ static int __init arch_setup(void)
 	gpio_direction_output(GPIO_PTU0, 0);
 	mdelay(20);
 
+	/* enable motion sensor */
+	gpio_request(GPIO_FN_INTC_IRQ1, NULL);
+	gpio_direction_input(GPIO_FN_INTC_IRQ1);
+
 	/* enable I2C device */
 	i2c_register_board_info(0, i2c0_devices,
 				ARRAY_SIZE(i2c0_devices));
diff --git a/trunk/fs/notify/inotify/inotify_fsnotify.c b/trunk/fs/notify/inotify/inotify_fsnotify.c
index 1afb0a10229f..c9ee67b442e1 100644
--- a/trunk/fs/notify/inotify/inotify_fsnotify.c
+++ b/trunk/fs/notify/inotify/inotify_fsnotify.c
@@ -121,7 +121,7 @@ static int idr_callback(int id, void *p, void *data)
 	if (warned)
 		return 0;
 
-	warned = true;
+	warned = false;
 	entry = p;
 	ientry = container_of(entry, struct inotify_inode_mark_entry, fsn_entry);
 
diff --git a/trunk/fs/notify/inotify/inotify_user.c b/trunk/fs/notify/inotify/inotify_user.c
index a94e8bd8eb1f..8271cf05c957 100644
--- a/trunk/fs/notify/inotify/inotify_user.c
+++ b/trunk/fs/notify/inotify/inotify_user.c
@@ -552,7 +552,7 @@ static int inotify_new_watch(struct fsnotify_group *group,
 
 	spin_lock(&group->inotify_data.idr_lock);
 	ret = idr_get_new_above(&group->inotify_data.idr, &tmp_ientry->fsn_entry,
-				group->inotify_data.last_wd+1,
+				group->inotify_data.last_wd,
 				&tmp_ientry->wd);
 	spin_unlock(&group->inotify_data.idr_lock);
 	if (ret) {
@@ -632,7 +632,7 @@ static struct fsnotify_group *inotify_new_group(struct user_struct *user, unsign
 
 	spin_lock_init(&group->inotify_data.idr_lock);
 	idr_init(&group->inotify_data.idr);
-	group->inotify_data.last_wd = 0;
+	group->inotify_data.last_wd = 1;
 	group->inotify_data.user = user;
 	group->inotify_data.fa = NULL;