Commit ecf223fc authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'autofs-fix' of...

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)
parents a0e5056e 4f4ffc3a
...@@ -28,25 +28,16 @@ ...@@ -28,25 +28,16 @@
#define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION #define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION
/* /*
* Architectures where both 32- and 64-bit binaries can be executed * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed
* on 64-bit kernels need this. This keeps the structure format * back to the kernel via ioctl from userspace. On architectures where 32- and
* uniform, and makes sure the wait_queue_token isn't too big to be * 64-bit userspace binaries can be executed it's important that the size of
* passed back down to the kernel. * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we
* * do not break the binary ABI interface by changing the structure size.
* This assumes that on these architectures:
* mode 32 bit 64 bit
* -------------------------
* int 32 bit 32 bit
* long 32 bit 64 bit
*
* If so, 32-bit user-space code should be backwards compatible.
*/ */
#if defined(__ia64__) || defined(__alpha__) /* pure 64bit architectures */
#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \
|| defined(__powerpc__) || defined(__s390__)
typedef unsigned int autofs_wqt_t;
#else
typedef unsigned long autofs_wqt_t; typedef unsigned long autofs_wqt_t;
#else
typedef unsigned int autofs_wqt_t;
#endif #endif
/* Packet types */ /* Packet types */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment