diff options
author | Tomohiro Kusumi <kusumi.tomohiro@gmail.com> | 2016-10-11 16:53:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-11 18:06:31 -0400 |
commit | f58b3c91f6786c66483fc18fd8b82a74cbf96d19 (patch) | |
tree | 19b33c49bd3ff7a50c12e62dfe0a0ca600790772 | |
parent | 390855547c3d20cda0646dc7ac83110208303dd6 (diff) |
autofs: move inclusion of linux/limits.h to uapi
linux/limits.h should be included by uapi instead of linux/auto_fs.h
so as not to cause compile error in userspace.
# cat << EOF > ./test1.c
> #include <stdio.h>
> #include <linux/auto_fs.h>
> int main(void) {
> return 0;
> }
> EOF
# gcc -Wall -g ./test1.c
In file included from ./test1.c:2:0:
/usr/include/linux/auto_fs.h:54:12: error: 'NAME_MAX' undeclared here (not in a function)
char name[NAME_MAX+1];
^
Link: http://lkml.kernel.org/r/20160812024856.12352.24092.stgit@pluto.themaw.net
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Signed-off-by: Ian Kent <ikent@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/auto_fs.h | 1 | ||||
-rw-r--r-- | include/uapi/linux/auto_fs.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h index b4066bb89083..b8f814c95cf5 100644 --- a/include/linux/auto_fs.h +++ b/include/linux/auto_fs.h | |||
@@ -10,7 +10,6 @@ | |||
10 | #define _LINUX_AUTO_FS_H | 10 | #define _LINUX_AUTO_FS_H |
11 | 11 | ||
12 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
13 | #include <linux/limits.h> | ||
14 | #include <linux/ioctl.h> | 13 | #include <linux/ioctl.h> |
15 | #include <uapi/linux/auto_fs.h> | 14 | #include <uapi/linux/auto_fs.h> |
16 | #endif /* _LINUX_AUTO_FS_H */ | 15 | #endif /* _LINUX_AUTO_FS_H */ |
diff --git a/include/uapi/linux/auto_fs.h b/include/uapi/linux/auto_fs.h index 9175a1b4dc69..1bfc3ed8b284 100644 --- a/include/uapi/linux/auto_fs.h +++ b/include/uapi/linux/auto_fs.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #define _UAPI_LINUX_AUTO_FS_H | 12 | #define _UAPI_LINUX_AUTO_FS_H |
13 | 13 | ||
14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
15 | #include <linux/limits.h> | ||
15 | #ifndef __KERNEL__ | 16 | #ifndef __KERNEL__ |
16 | #include <sys/ioctl.h> | 17 | #include <sys/ioctl.h> |
17 | #endif /* __KERNEL__ */ | 18 | #endif /* __KERNEL__ */ |