Merge branches 'release', 'dmi' and 'misc' into release

[linux-2.6-omap-h63xx.git] / fs / xfs / support / ktrace.h

diff --git a/fs/xfs/support/ktrace.h b/fs/xfs/support/ktrace.h
index 0d73216287c06b3cd1b08b3600869277d19e8f43..56e72b40a859a42471fc685ad84bb164bed78f56 100644 (file)
--- a/fs/xfs/support/ktrace.h
+++ b/fs/xfs/support/ktrace.h
@@ -18,8 +18,6 @@
 #ifndef __XFS_SUPPORT_KTRACE_H__
 #define __XFS_SUPPORT_KTRACE_H__
 
-#include <spin.h>
-
 /*
  * Trace buffer entry structure.
  */
@@ -31,7 +29,6 @@ typedef struct ktrace_entry {
  * Trace buffer header structure.
  */
 typedef struct ktrace {
-       lock_t          kt_lock;        /* mutex to guard counters */
        int             kt_nentries;    /* number of entries in trace buf */
        int             kt_index;       /* current index in entries */
        int             kt_rollover;