Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

[linux-block.git] / kernel / bounds.c

diff --git a/kernel/bounds.c b/kernel/bounds.c
index 578782ef6ae19c636e282af5e1592aaf0540126c..9fd4246b04b8298ec608dbba4d9ee9997e105fbc 100644 (file)
--- a/kernel/bounds.c
+++ b/kernel/bounds.c
@@ -11,7 +11,7 @@
 #include <linux/kbuild.h>
 #include <linux/page_cgroup.h>
 #include <linux/log2.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 
 void foo(void)
 {
@@ -22,6 +22,6 @@ void foo(void)
 #ifdef CONFIG_SMP
        DEFINE(NR_CPUS_BITS, ilog2(CONFIG_NR_CPUS));
 #endif
-       DEFINE(BLOATED_SPINLOCKS, sizeof(spinlock_t) > sizeof(int));
+       DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t));
        /* End of constants */
 }