joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2024-11-27 14:11:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'autofs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux into akpm

Browse Source 
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)
This commit is contained in:
Linus Torvalds 2013-02-12 16:20:07 -08:00
commit ecf223fc0d
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/uapi/linux/auto_fs.h
View File

@ -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 */