.data.nosave should not need a separate output section; this change moves it into the .data section. Signed-off-by: Tim Abbott <tabbott@xxxxxxx> Cc: Kyle McMartin <kyle@xxxxxxxxxxx> Cc: Helge Deller <deller@xxxxxx> Cc: linux-parisc@xxxxxxxxxxxxxxx --- arch/parisc/kernel/vmlinux.lds.S | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index fd2cc4f..0cc9658 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S @@ -103,6 +103,7 @@ SECTIONS . = ALIGN(L1_CACHE_BYTES); /* Data */ .data : { + NOSAVE_DATA DATA_DATA CONSTRUCTORS } @@ -118,17 +119,6 @@ SECTIONS *(.data.lock_aligned) } - /* nosave data is really only used for software suspend...it's here - * just in case we ever implement it - */ - . = ALIGN(PAGE_SIZE); - __nosave_begin = .; - .data_nosave : { - *(.data.nosave) - } - . = ALIGN(PAGE_SIZE); - __nosave_end = .; - /* End of data section */ _edata = .; -- 1.6.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html