diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-19 19:03:43 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-03-03 05:26:00 -0500 |
commit | 3d9a854c2dac3e888393b23ba7adafcce4d6d4b9 (patch) | |
tree | 5159c52a0718d80f66ef8bed299bde2690e7b82e | |
parent | dafb9320671316fbd030b1d2e0ab9b96597223cb (diff) |
Rename .data[.percpu][.XXX] to .data[..percpu][..XXX].
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r-- | arch/ia64/include/asm/percpu.h | 2 | ||||
-rw-r--r-- | include/asm-generic/percpu.h | 10 | ||||
-rw-r--r-- | include/asm-generic/vmlinux.lds.h | 24 | ||||
-rw-r--r-- | include/linux/percpu-defs.h | 4 | ||||
-rw-r--r-- | kernel/module.c | 2 |
5 files changed, 21 insertions, 21 deletions
diff --git a/arch/ia64/include/asm/percpu.h b/arch/ia64/include/asm/percpu.h index 30cf46534dd2..35d9aeb6d85f 100644 --- a/arch/ia64/include/asm/percpu.h +++ b/arch/ia64/include/asm/percpu.h | |||
@@ -31,7 +31,7 @@ extern void *per_cpu_init(void); | |||
31 | 31 | ||
32 | #endif /* SMP */ | 32 | #endif /* SMP */ |
33 | 33 | ||
34 | #define PER_CPU_BASE_SECTION ".data.percpu" | 34 | #define PER_CPU_BASE_SECTION ".data..percpu" |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Be extremely careful when taking the address of this variable! Due to virtual | 37 | * Be extremely careful when taking the address of this variable! Due to virtual |
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h index 8087b90d4673..1202a1550e91 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h | |||
@@ -76,7 +76,7 @@ extern void setup_per_cpu_areas(void); | |||
76 | 76 | ||
77 | #ifndef PER_CPU_BASE_SECTION | 77 | #ifndef PER_CPU_BASE_SECTION |
78 | #ifdef CONFIG_SMP | 78 | #ifdef CONFIG_SMP |
79 | #define PER_CPU_BASE_SECTION ".data.percpu" | 79 | #define PER_CPU_BASE_SECTION ".data..percpu" |
80 | #else | 80 | #else |
81 | #define PER_CPU_BASE_SECTION ".data" | 81 | #define PER_CPU_BASE_SECTION ".data" |
82 | #endif | 82 | #endif |
@@ -88,15 +88,15 @@ extern void setup_per_cpu_areas(void); | |||
88 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | 88 | #define PER_CPU_SHARED_ALIGNED_SECTION "" |
89 | #define PER_CPU_ALIGNED_SECTION "" | 89 | #define PER_CPU_ALIGNED_SECTION "" |
90 | #else | 90 | #else |
91 | #define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned" | 91 | #define PER_CPU_SHARED_ALIGNED_SECTION "..shared_aligned" |
92 | #define PER_CPU_ALIGNED_SECTION ".shared_aligned" | 92 | #define PER_CPU_ALIGNED_SECTION "..shared_aligned" |
93 | #endif | 93 | #endif |
94 | #define PER_CPU_FIRST_SECTION ".first" | 94 | #define PER_CPU_FIRST_SECTION "..first" |
95 | 95 | ||
96 | #else | 96 | #else |
97 | 97 | ||
98 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | 98 | #define PER_CPU_SHARED_ALIGNED_SECTION "" |
99 | #define PER_CPU_ALIGNED_SECTION ".shared_aligned" | 99 | #define PER_CPU_ALIGNED_SECTION "..shared_aligned" |
100 | #define PER_CPU_FIRST_SECTION "" | 100 | #define PER_CPU_FIRST_SECTION "" |
101 | 101 | ||
102 | #endif | 102 | #endif |
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 32cddc155940..e304fcd10bc7 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
@@ -666,16 +666,16 @@ | |||
666 | */ | 666 | */ |
667 | #define PERCPU_VADDR(vaddr, phdr) \ | 667 | #define PERCPU_VADDR(vaddr, phdr) \ |
668 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ | 668 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ |
669 | .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ | 669 | .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ |
670 | - LOAD_OFFSET) { \ | 670 | - LOAD_OFFSET) { \ |
671 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ | 671 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ |
672 | *(.data.percpu.first) \ | 672 | *(.data..percpu..first) \ |
673 | *(.data.percpu.page_aligned) \ | 673 | *(.data..percpu..page_aligned) \ |
674 | *(.data.percpu) \ | 674 | *(.data..percpu) \ |
675 | *(.data.percpu.shared_aligned) \ | 675 | *(.data..percpu..shared_aligned) \ |
676 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ | 676 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ |
677 | } phdr \ | 677 | } phdr \ |
678 | . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu); | 678 | . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu); |
679 | 679 | ||
680 | /** | 680 | /** |
681 | * PERCPU - define output section for percpu area, simple version | 681 | * PERCPU - define output section for percpu area, simple version |
@@ -687,18 +687,18 @@ | |||
687 | * | 687 | * |
688 | * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except | 688 | * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except |
689 | * that __per_cpu_load is defined as a relative symbol against | 689 | * that __per_cpu_load is defined as a relative symbol against |
690 | * .data.percpu which is required for relocatable x86_32 | 690 | * .data..percpu which is required for relocatable x86_32 |
691 | * configuration. | 691 | * configuration. |
692 | */ | 692 | */ |
693 | #define PERCPU(align) \ | 693 | #define PERCPU(align) \ |
694 | . = ALIGN(align); \ | 694 | . = ALIGN(align); \ |
695 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { \ | 695 | .data..percpu : AT(ADDR(.data..percpu) - LOAD_OFFSET) { \ |
696 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ | 696 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ |
697 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ | 697 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ |
698 | *(.data.percpu.first) \ | 698 | *(.data..percpu..first) \ |
699 | *(.data.percpu.page_aligned) \ | 699 | *(.data..percpu..page_aligned) \ |
700 | *(.data.percpu) \ | 700 | *(.data..percpu) \ |
701 | *(.data.percpu.shared_aligned) \ | 701 | *(.data..percpu..shared_aligned) \ |
702 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ | 702 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ |
703 | } | 703 | } |
704 | 704 | ||
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 5a5d6ce4bd55..2351191f8c82 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h | |||
@@ -127,11 +127,11 @@ | |||
127 | * Declaration/definition used for per-CPU variables that must be page aligned. | 127 | * Declaration/definition used for per-CPU variables that must be page aligned. |
128 | */ | 128 | */ |
129 | #define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ | 129 | #define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ |
130 | DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") \ | 130 | DECLARE_PER_CPU_SECTION(type, name, "..page_aligned") \ |
131 | __aligned(PAGE_SIZE) | 131 | __aligned(PAGE_SIZE) |
132 | 132 | ||
133 | #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ | 133 | #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ |
134 | DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") \ | 134 | DEFINE_PER_CPU_SECTION(type, name, "..page_aligned") \ |
135 | __aligned(PAGE_SIZE) | 135 | __aligned(PAGE_SIZE) |
136 | 136 | ||
137 | /* | 137 | /* |
diff --git a/kernel/module.c b/kernel/module.c index f82386bd9ee9..5daf0abd63c1 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -397,7 +397,7 @@ static unsigned int find_pcpusec(Elf_Ehdr *hdr, | |||
397 | Elf_Shdr *sechdrs, | 397 | Elf_Shdr *sechdrs, |
398 | const char *secstrings) | 398 | const char *secstrings) |
399 | { | 399 | { |
400 | return find_sec(hdr, sechdrs, secstrings, ".data.percpu"); | 400 | return find_sec(hdr, sechdrs, secstrings, ".data..percpu"); |
401 | } | 401 | } |
402 | 402 | ||
403 | static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size) | 403 | static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size) |