diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 08:15:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 08:15:30 -0800 |
| commit | eea2078eaf2bcd4e5e8b2e08798071efedac5e17 (patch) | |
| tree | e8b9f7ea55f098c6c73d4bdca2794f40ce619476 /fs/xfs/support/debug.c | |
| parent | ea991f06d851d58268eac6ce5c2152397757c958 (diff) | |
| parent | 050e714eb2bc662e9df6bf048ce86b4fbdd9bcd3 (diff) | |
Merge git://oss.sgi.com:8090/xfs/xfs-2.6
* git://oss.sgi.com:8090/xfs/xfs-2.6:
[XFS] Remove KERNEL_VERSION macros from xfs_dmapi.h
[XFS] Prevent a deadlock when xfslogd unpins inodes.
[XFS] Clean up i_flags and i_flags_lock handling.
[XFS] 956664: dm_read_invis() changes i_atime
[XFS] rename uio_read() to xfs_uio_read()
[XFS] Keep lockdep happy.
[XFS] 956618: Linux crashes on boot with XFS-DMAPI filesystem when
Diffstat (limited to 'fs/xfs/support/debug.c')
| -rw-r--r-- | fs/xfs/support/debug.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c index c75f68361e3..4363512d2f9 100644 --- a/fs/xfs/support/debug.c +++ b/fs/xfs/support/debug.c @@ -15,11 +15,9 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <xfs.h> #include "debug.h" #include "spin.h" -#include <asm/page.h> -#include <linux/sched.h> -#include <linux/kernel.h> static char message[256]; /* keep it off the stack */ static DEFINE_SPINLOCK(xfs_err_lock); |