mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-22 22:11:38 +08:00
autofs4: fix kernel includes
autofs_dev-ioctl.h is included by both the kernel module and user space tools and it includes two kernel header files. Compiles work if the kernel headers are installed but fail otherwise. Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
8f63aaa8b9
commit
79955898f9
@ -10,8 +10,13 @@
|
|||||||
#ifndef _LINUX_AUTO_DEV_IOCTL_H
|
#ifndef _LINUX_AUTO_DEV_IOCTL_H
|
||||||
#define _LINUX_AUTO_DEV_IOCTL_H
|
#define _LINUX_AUTO_DEV_IOCTL_H
|
||||||
|
|
||||||
|
#include <linux/auto_fs.h>
|
||||||
|
|
||||||
|
#ifdef __KERNEL__
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/types.h>
|
#else
|
||||||
|
#include <string.h>
|
||||||
|
#endif /* __KERNEL__ */
|
||||||
|
|
||||||
#define AUTOFS_DEVICE_NAME "autofs"
|
#define AUTOFS_DEVICE_NAME "autofs"
|
||||||
|
|
||||||
|
@ -17,10 +17,12 @@
|
|||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/limits.h>
|
#include <linux/limits.h>
|
||||||
#include <asm/types.h>
|
#include <linux/types.h>
|
||||||
#endif /* __KERNEL__ */
|
|
||||||
|
|
||||||
#include <linux/ioctl.h>
|
#include <linux/ioctl.h>
|
||||||
|
#else
|
||||||
|
#include <asm/types.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#endif /* __KERNEL__ */
|
||||||
|
|
||||||
/* This file describes autofs v3 */
|
/* This file describes autofs v3 */
|
||||||
#define AUTOFS_PROTO_VERSION 3
|
#define AUTOFS_PROTO_VERSION 3
|
||||||
|
Loading…
Reference in New Issue
Block a user