diff --git a/[refs] b/[refs]
index 43cd6ee580d9..3c120bc6e94e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 128e8db38e30c1786498dfc011d0f9dd7f9f9266
+refs/heads/master: 2a9ad18deb2870a9968f50351a0d4b8cc2a04099
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index f74d2d7aa605..3815ac1d58b2 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -578,6 +578,9 @@ static int static_obj(void *obj)
 	if ((addr >= start) && (addr < end))
 		return 1;
 
+	if (arch_is_kernel_data(addr))
+		return 1;
+
 #ifdef CONFIG_SMP
 	/*
 	 * percpu var?