Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / include / linux / stat.h

diff --git a/include/linux/stat.h b/include/linux/stat.h
index 8669291352dba326e952d0f2a02e5e2a552101b8..4f8539ccff6cf8addcf9d3561d58d5ba8b518c26 100644 (file)
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -7,7 +7,7 @@
 
 #endif
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#ifdef __KERNEL__
 
 #define S_IFMT  00170000
 #define S_IFSOCK 0140000
@@ -57,7 +57,7 @@
 #include <linux/time.h>
 
 struct kstat {
-       unsigned long   ino;
+       u64             ino;
        dev_t           dev;
        umode_t         mode;
        unsigned int    nlink;