diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 23:15:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 23:15:45 -0400 |
commit | a3470171d69d5526a01c31f1ce4a1e8090b6e5d9 (patch) | |
tree | a4a69bb1bcf84ca90749e835c50e38f3de1e7fd2 /arch | |
parent | cf8dc57cbac0fe089308f57c333ab763c36782ff (diff) | |
parent | 6f6b3940ed326eed58074d777ab92fda3a60a382 (diff) |
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
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 2 |
1 files changed, 2 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 | |||
45 | __dbe_table : { *(__dbe_table) } | 45 | __dbe_table : { *(__dbe_table) } |
46 | __stop___dbe_table = .; | 46 | __stop___dbe_table = .; |
47 | 47 | ||
48 | NOTES | ||
49 | |||
48 | RODATA | 50 | RODATA |
49 | 51 | ||
50 | /* writeable */ | 52 | /* writeable */ |