diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-06-23 12:04:36 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2009-06-26 17:55:27 -0400 |
commit | 73f1d9391a6aa72efdcea2f302ee7bfcd313c631 (patch) | |
tree | 44824c45de7a3ceaa9a07cc0ecc2aeb29e321f37 | |
parent | 4075ea8c54a7506844a69f674990241e7766357b (diff) |
asm-generic/vmlinux.lds.h: Fix up RW_DATA_SECTION definition.
RW_DATA_SECTION is defined to take 4 different alignment parameters,
while NOSAVE_DATA currently uses a fixed PAGE_SIZE alignment as noted
in the comments.
There are presently no in-tree users of this at present, and I just
stumbled across this while implementing the simplified script on a new
architecture port, which subsequently resulted in a syntax error.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | include/asm-generic/vmlinux.lds.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 92b73b6140ff..f92e730695c8 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
@@ -704,7 +704,7 @@ | |||
704 | * matches the requirment of PAGE_ALIGNED_DATA. | 704 | * matches the requirment of PAGE_ALIGNED_DATA. |
705 | * | 705 | * |
706 | * use 0 as page_align if page_aligned data is not used */ | 706 | * use 0 as page_align if page_aligned data is not used */ |
707 | #define RW_DATA_SECTION(cacheline, nosave, pagealigned, inittask) \ | 707 | #define RW_DATA_SECTION(cacheline, pagealigned, inittask) \ |
708 | . = ALIGN(PAGE_SIZE); \ | 708 | . = ALIGN(PAGE_SIZE); \ |
709 | .data : AT(ADDR(.data) - LOAD_OFFSET) { \ | 709 | .data : AT(ADDR(.data) - LOAD_OFFSET) { \ |
710 | INIT_TASK(inittask) \ | 710 | INIT_TASK(inittask) \ |
@@ -712,7 +712,7 @@ | |||
712 | READ_MOSTLY_DATA(cacheline) \ | 712 | READ_MOSTLY_DATA(cacheline) \ |
713 | DATA_DATA \ | 713 | DATA_DATA \ |
714 | CONSTRUCTORS \ | 714 | CONSTRUCTORS \ |
715 | NOSAVE_DATA(nosave) \ | 715 | NOSAVE_DATA \ |
716 | PAGE_ALIGNED_DATA(pagealigned) \ | 716 | PAGE_ALIGNED_DATA(pagealigned) \ |
717 | } | 717 | } |
718 | 718 | ||