diff --git a/[refs] b/[refs]
index 395bbb4cc57c..4708a5b8c51f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1d7ae24a23f1f366d6c5408f1ad11db69a748c6
+refs/heads/master: d8fd66aaea7fe3e4f1ea044a563f129e3b9f05ff
diff --git a/trunk/include/linux/jbd.h b/trunk/include/linux/jbd.h
index 59b94c3e6c24..b18fd3b9b835 100644
--- a/trunk/include/linux/jbd.h
+++ b/trunk/include/linux/jbd.h
@@ -33,7 +33,6 @@
 #include <linux/lockdep.h>
 
 #include <asm/semaphore.h>
-#endif
 
 #define journal_oom_retry 1
 
@@ -84,7 +83,6 @@ static inline void jbd_free(void *ptr, size_t size)
 
 #define JFS_MIN_JOURNAL_BLOCKS 1024
 
-#ifdef __KERNEL__
 
 /**
  * typedef handle_t - The handle_t type represents a single atomic update being performed by some process.