mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-26 00:21:17 +00:00
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Conflicts: arch/parisc/hpux/sys_hpux.c arch/parisc/mm/ioremap.c
This commit is contained in:
commit
e7b3ca0854
30 changed files with 310 additions and 358 deletions
|
@ -933,7 +933,7 @@ static int init_section_ref_ok(const char *name)
|
|||
".opd", /* see comment [OPD] at exit_section_ref_ok() */
|
||||
".toc1", /* used by ppc64 */
|
||||
".stab",
|
||||
".rodata",
|
||||
".data.rel.ro", /* used by parisc64 */
|
||||
".parainstructions",
|
||||
".text.lock",
|
||||
"__bug_table", /* used by powerpc for BUG() */
|
||||
|
@ -956,6 +956,7 @@ static int init_section_ref_ok(const char *name)
|
|||
".eh_frame",
|
||||
".debug",
|
||||
".parainstructions",
|
||||
".rodata",
|
||||
NULL
|
||||
};
|
||||
/* part of section name */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue