diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 20:15:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 20:15:45 -0700 |
| commit | a3470171d69d5526a01c31f1ce4a1e8090b6e5d9 (patch) | |
| tree | a4a69bb1bcf84ca90749e835c50e38f3de1e7fd2 | |
| parent | cf8dc57cbac0fe089308f57c333ab763c36782ff (diff) | |
| parent | 6f6b3940ed326eed58074d777ab92fda3a60a382 (diff) | |
| download | linux-a3470171d69d5526a01c31f1ce4a1e8090b6e5d9.tar.gz linux-a3470171d69d5526a01c31f1ce4a1e8090b6e5d9.tar.bz2 linux-a3470171d69d5526a01c31f1ce4a1e8090b6e5d9.zip | |
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
| -rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | include/asm-mips/fcntl.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index 60bbaecde187..087ab997487d 100644 --- 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 index 00a50ec1c19f..2a52333a062d 100644 --- 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 */ |