Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/sh/kernel/vmlinux.lds.S
This commit is contained in:
@@ -99,16 +99,8 @@ SECTIONS
|
||||
_ebss = .; /* uClinux MTD sucks */
|
||||
_end = . ;
|
||||
|
||||
/*
|
||||
* When something in the kernel is NOT compiled as a module, the
|
||||
* module cleanup code and data are put into these segments. Both
|
||||
* can then be thrown away, as cleanup code is never called unless
|
||||
* it's a module.
|
||||
*/
|
||||
/DISCARD/ : {
|
||||
EXIT_CALL
|
||||
}
|
||||
|
||||
STABS_DEBUG
|
||||
DWARF_DEBUG
|
||||
|
||||
DISCARDS
|
||||
}
|
||||
|
Reference in New Issue
Block a user