diff options
Diffstat (limited to 'meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-update-kernel-include-files.patch')
-rw-r--r-- | meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-update-kernel-include-files.patch | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-update-kernel-include-files.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-update-kernel-include-files.patch new file mode 100644 index 000000000..3b6bb926a --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-update-kernel-include-files.patch | |||
@@ -0,0 +1,92 @@ | |||
1 | autofs-5.0.7 - update kernel include files | ||
2 | |||
3 | From: Ian Kent <raven@themaw.net> | ||
4 | |||
5 | Update autofs include files to include the latest changes. | ||
6 | --- | ||
7 | include/linux/auto_fs.h | 33 ++++++++++----------------------- | ||
8 | include/linux/auto_fs4.h | 3 ++- | ||
9 | 2 files changed, 12 insertions(+), 24 deletions(-) | ||
10 | |||
11 | diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h | ||
12 | index 91d414f..64df1a6 100644 | ||
13 | --- a/include/linux/auto_fs.h | ||
14 | +++ b/include/linux/auto_fs.h | ||
15 | @@ -14,13 +14,8 @@ | ||
16 | #ifndef _LINUX_AUTO_FS_H | ||
17 | #define _LINUX_AUTO_FS_H | ||
18 | |||
19 | -#ifdef __KERNEL__ | ||
20 | -#include <linux/fs.h> | ||
21 | -#include <linux/limits.h> | ||
22 | #include <linux/types.h> | ||
23 | -#include <linux/ioctl.h> | ||
24 | -#else | ||
25 | -#include <asm/types.h> | ||
26 | +#ifndef __KERNEL__ | ||
27 | #include <sys/ioctl.h> | ||
28 | #endif /* __KERNEL__ */ | ||
29 | |||
30 | @@ -32,25 +27,16 @@ | ||
31 | #define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION | ||
32 | |||
33 | /* | ||
34 | - * Architectures where both 32- and 64-bit binaries can be executed | ||
35 | - * on 64-bit kernels need this. This keeps the structure format | ||
36 | - * uniform, and makes sure the wait_queue_token isn't too big to be | ||
37 | - * passed back down to the kernel. | ||
38 | - * | ||
39 | - * This assumes that on these architectures: | ||
40 | - * mode 32 bit 64 bit | ||
41 | - * ------------------------- | ||
42 | - * int 32 bit 32 bit | ||
43 | - * long 32 bit 64 bit | ||
44 | - * | ||
45 | - * If so, 32-bit user-space code should be backwards compatible. | ||
46 | + * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed | ||
47 | + * back to the kernel via ioctl from userspace. On architectures where 32- and | ||
48 | + * 64-bit userspace binaries can be executed it's important that the size of | ||
49 | + * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we | ||
50 | + * do not break the binary ABI interface by changing the structure size. | ||
51 | */ | ||
52 | - | ||
53 | -#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \ | ||
54 | - || defined(__powerpc__) || defined(__s390__) | ||
55 | -typedef unsigned int autofs_wqt_t; | ||
56 | -#else | ||
57 | +#if defined(__ia64__) || defined(__alpha__) /* pure 64bit architectures */ | ||
58 | typedef unsigned long autofs_wqt_t; | ||
59 | +#else | ||
60 | +typedef unsigned int autofs_wqt_t; | ||
61 | #endif | ||
62 | |||
63 | /* Packet types */ | ||
64 | @@ -81,6 +67,7 @@ struct autofs_packet_expire { | ||
65 | #define AUTOFS_IOC_FAIL _IO(0x93,0x61) | ||
66 | #define AUTOFS_IOC_CATATONIC _IO(0x93,0x62) | ||
67 | #define AUTOFS_IOC_PROTOVER _IOR(0x93,0x63,int) | ||
68 | +#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93,0x64,compat_ulong_t) | ||
69 | #define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93,0x64,unsigned long) | ||
70 | #define AUTOFS_IOC_EXPIRE _IOR(0x93,0x65,struct autofs_packet_expire) | ||
71 | |||
72 | diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h | ||
73 | index 55fa478..e02982f 100644 | ||
74 | --- a/include/linux/auto_fs4.h | ||
75 | +++ b/include/linux/auto_fs4.h | ||
76 | @@ -12,6 +12,7 @@ | ||
77 | #define _LINUX_AUTO_FS4_H | ||
78 | |||
79 | /* Include common v3 definitions */ | ||
80 | +#include <linux/types.h> | ||
81 | #include <linux/auto_fs.h> | ||
82 | |||
83 | /* autofs v4 definitions */ | ||
84 | @@ -23,7 +24,7 @@ | ||
85 | #define AUTOFS_MIN_PROTO_VERSION 3 | ||
86 | #define AUTOFS_MAX_PROTO_VERSION 5 | ||
87 | |||
88 | -#define AUTOFS_PROTO_SUBVERSION 1 | ||
89 | +#define AUTOFS_PROTO_SUBVERSION 2 | ||
90 | |||
91 | /* Mask for expire behaviour */ | ||
92 | #define AUTOFS_EXP_IMMEDIATE 1 | ||