Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'autofs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux into akpm
Pull hp parisc automounter fix from Helge Deller:
"This unbreaks automounter support for the parisc architecture (and
probably aarch64 as well).""
* 'autofs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
unbreak automounter support on 64-bit kernel with 32-bit userspace (v2)
+8
-17
+8
-17
include/uapi/linux/auto_fs.h
+8
-17
include/uapi/linux/auto_fs.h
···
28
28
#define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION
29
29
30
30
/*
31
-
* Architectures where both 32- and 64-bit binaries can be executed
32
-
* on 64-bit kernels need this. This keeps the structure format
33
-
* uniform, and makes sure the wait_queue_token isn't too big to be
34
-
* passed back down to the kernel.
35
-
*
36
-
* This assumes that on these architectures:
37
-
* mode 32 bit 64 bit
38
-
* -------------------------
39
-
* int 32 bit 32 bit
40
-
* long 32 bit 64 bit
41
-
*
42
-
* If so, 32-bit user-space code should be backwards compatible.
31
+
* The wait_queue_token (autofs_wqt_t) is part of a structure which is passed
32
+
* back to the kernel via ioctl from userspace. On architectures where 32- and
33
+
* 64-bit userspace binaries can be executed it's important that the size of
34
+
* autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we
35
+
* do not break the binary ABI interface by changing the structure size.
43
36
*/
44
-
45
-
#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \
46
-
|| defined(__powerpc__) || defined(__s390__)
47
-
typedef unsigned int autofs_wqt_t;
48
-
#else
37
+
#if defined(__ia64__) || defined(__alpha__) /* pure 64bit architectures */
49
38
typedef unsigned long autofs_wqt_t;
39
+
#else
40
+
typedef unsigned int autofs_wqt_t;
50
41
#endif
51
42
52
43
/* Packet types */