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
git-mirror · Oct 2, 2007 · a347017 · a347017
2 parents cf8dc57 + 6f6b394
commit a347017
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
@@ -45,6 +45,8 @@ SECTIONS
   __dbe_table : { *(__dbe_table) }
   __stop___dbe_table = .;
 
+  NOTES
+
   RODATA
 
   /* writeable */

diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h
@@ -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 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 +45,8 @@ SECTIONS @@
       __dbe_table : { *(__dbe_table) }
       __stop___dbe_table = .;
+      NOTES
       RODATA
       /* writeable */
@@ Expand Down @@