Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3470171 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] vmlinux.lds.S: Handle note sections
  [MIPS] Fix value of O_TRUNC
parents cf8dc57c 6f6b3940

arch/mips/kernel/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ SECTIONS 
  __dbe_table : { *(__dbe_table) }

  __stop___dbe_table = .;



  NOTES



  RODATA



  /* writeable */

include/asm-mips/fcntl.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#define O_SYNC		0x0010

#define O_NONBLOCK	0x0080

#define O_CREAT         0x0100	/* not fcntl */

#define O_TRUNC		0x0200	/* not fcntl */

#define O_EXCL		0x0400	/* not fcntl */

#define O_NOCTTY	0x0800	/* not fcntl */

#define FASYNC		0x1000	/* fcntl, for BSD compatibility */