summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-20 15:12:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-20 15:12:49 -0800
commit15c81026204da897a05424c79263aea861a782cc (patch)
treece0e81d7afe35120135f24510d7577bc6b8f25fd /include/uapi
parentc9cdd9a6ae49704f12a289706551536ec842693f (diff)
parent79dbbc60493f357912d5f1da5a23147ba0c01c7a (diff)
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x32 uapi changes from Peter Anvin: "This is the first few of a set of patches by H.J. Lu to make the kernel uapi headers usable for x32, as required by some non-glibc libcs. These particular patches make the stat and statfs structures usable" * 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, x32: Use __kernel_long_t for __statfs_word x86, x32: Use __kernel_long_t/__kernel_ulong_t in x86-64 stat.h
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/asm-generic/statfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/asm-generic/statfs.h b/include/uapi/asm-generic/statfs.h
index 0999647fca13..cb89cc730f0b 100644
--- a/include/uapi/asm-generic/statfs.h
+++ b/include/uapi/asm-generic/statfs.h
@@ -13,7 +13,7 @@
*/
#ifndef __statfs_word
#if __BITS_PER_LONG == 64
-#define __statfs_word long
+#define __statfs_word __kernel_long_t
#else
#define __statfs_word __u32
#endif