admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.10-fixes' into mips-for-linux-next

Browse Source 
This that should have been fixed but weren't, way to much, intrusive
and late.
This commit is contained in:
Ralf Baechle
2013-07-02 17:19:04 +02:00
parent 704e6460ab 3f90b82df1
commit 6ac5310e64
45 changed files with 507 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/include/uapi/asm/fcntl.h
View File

@@ -8,6 +8,7 @@
#ifndef _UAPI_ASM_FCNTL_H
#define _UAPI_ASM_FCNTL_H
#include <asm/sgidefs.h>
#define O_APPEND 0x0008
#define O_DSYNC 0x0010 /* used to be O_SYNC, see below */
@@ -55,7 +56,8 @@
* contain all the same fields as struct flock.
*/
#ifdef CONFIG_32BIT
#if _MIPS_SIM != _MIPS_SIM_ABI64
#include <linux/types.h>
struct flock {
@@ -70,7 +72,7 @@ struct flock {
#define HAVE_ARCH_STRUCT_FLOCK
#endif /* CONFIG_32BIT */
#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
#include <asm-generic/fcntl.h>