diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-19 19:03:52 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-03-03 05:26:01 -0500 |
commit | 07b3bb1ef211fdf20eddcae902d1098788ea2f6e (patch) | |
tree | 2807803056ad7a73955c71947e4002b50b6d2861 | |
parent | 9bf59424862ef5c1ba5d7ad6699a0b474916c4e3 (diff) |
Rename .data.nosave to .data..nosave.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r-- | arch/s390/kernel/swsusp_asm64.S | 2 | ||||
-rw-r--r-- | include/asm-generic/vmlinux.lds.h | 2 | ||||
-rw-r--r-- | include/linux/init.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S index 0c26cc1898ec..e5cd623cb025 100644 --- a/arch/s390/kernel/swsusp_asm64.S +++ b/arch/s390/kernel/swsusp_asm64.S | |||
@@ -261,7 +261,7 @@ restore_registers: | |||
261 | lghi %r2,0 | 261 | lghi %r2,0 |
262 | br %r14 | 262 | br %r14 |
263 | 263 | ||
264 | .section .data.nosave,"aw",@progbits | 264 | .section .data..nosave,"aw",@progbits |
265 | .align 8 | 265 | .align 8 |
266 | .Ldisabled_wait_31: | 266 | .Ldisabled_wait_31: |
267 | .long 0x000a0000,0x00000000 | 267 | .long 0x000a0000,0x00000000 |
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 6f6da4f080f2..ea3660526e91 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
@@ -175,7 +175,7 @@ | |||
175 | #define NOSAVE_DATA \ | 175 | #define NOSAVE_DATA \ |
176 | . = ALIGN(PAGE_SIZE); \ | 176 | . = ALIGN(PAGE_SIZE); \ |
177 | VMLINUX_SYMBOL(__nosave_begin) = .; \ | 177 | VMLINUX_SYMBOL(__nosave_begin) = .; \ |
178 | *(.data.nosave) \ | 178 | *(.data..nosave) \ |
179 | . = ALIGN(PAGE_SIZE); \ | 179 | . = ALIGN(PAGE_SIZE); \ |
180 | VMLINUX_SYMBOL(__nosave_end) = .; | 180 | VMLINUX_SYMBOL(__nosave_end) = .; |
181 | 181 | ||
diff --git a/include/linux/init.h b/include/linux/init.h index ab1d31f9352b..de994304e0bb 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
@@ -301,7 +301,7 @@ void __init parse_early_options(char *cmdline); | |||
301 | #endif | 301 | #endif |
302 | 302 | ||
303 | /* Data marked not to be saved by software suspend */ | 303 | /* Data marked not to be saved by software suspend */ |
304 | #define __nosavedata __section(.data.nosave) | 304 | #define __nosavedata __section(.data..nosave) |
305 | 305 | ||
306 | /* This means "can be init if no module support, otherwise module load | 306 | /* This means "can be init if no module support, otherwise module load |
307 | may call it." */ | 307 | may call it." */ |