lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename .data[.percpu][.XXX] to .data[..percpu][..XXX].

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Denys Vlasenko
2010-02-20 01:03:43 +01:00
committed by Michal Marek
parent dafb932067
commit 3d9a854c2d
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/include/asm/percpu.h
View File

@@ -31,7 +31,7 @@ extern void *per_cpu_init(void);
#endif /* SMP */ #endif /* SMP */
#define PER_CPU_BASE_SECTION ".data.percpu" #define PER_CPU_BASE_SECTION ".data..percpu"
/* /*
* Be extremely careful when taking the address of this variable! Due to virtual * Be extremely careful when taking the address of this variable! Due to virtual

10
include/asm-generic/percpu.h
View File

@@ -76,7 +76,7 @@ extern void setup_per_cpu_areas(void);
#ifndef PER_CPU_BASE_SECTION #ifndef PER_CPU_BASE_SECTION
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#define PER_CPU_BASE_SECTION ".data.percpu" #define PER_CPU_BASE_SECTION ".data..percpu"
#else #else
#define PER_CPU_BASE_SECTION ".data" #define PER_CPU_BASE_SECTION ".data"
#endif #endif
@@ -88,15 +88,15 @@ extern void setup_per_cpu_areas(void);
#define PER_CPU_SHARED_ALIGNED_SECTION "" #define PER_CPU_SHARED_ALIGNED_SECTION ""
#define PER_CPU_ALIGNED_SECTION "" #define PER_CPU_ALIGNED_SECTION ""
#else #else
#define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned" #define PER_CPU_SHARED_ALIGNED_SECTION "..shared_aligned"
#define PER_CPU_ALIGNED_SECTION ".shared_aligned" #define PER_CPU_ALIGNED_SECTION "..shared_aligned"
#endif #endif
#define PER_CPU_FIRST_SECTION ".first" #define PER_CPU_FIRST_SECTION "..first"
#else #else
#define PER_CPU_SHARED_ALIGNED_SECTION "" #define PER_CPU_SHARED_ALIGNED_SECTION ""
#define PER_CPU_ALIGNED_SECTION ".shared_aligned" #define PER_CPU_ALIGNED_SECTION "..shared_aligned"
#define PER_CPU_FIRST_SECTION "" #define PER_CPU_FIRST_SECTION ""
#endif #endif

24
include/asm-generic/vmlinux.lds.h
View File

@@ -666,16 +666,16 @@
*/ */
#define PERCPU_VADDR(vaddr, phdr) \ #define PERCPU_VADDR(vaddr, phdr) \
VMLINUX_SYMBOL(__per_cpu_load) = .; \ VMLINUX_SYMBOL(__per_cpu_load) = .; \
.data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
- LOAD_OFFSET) { \ - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__per_cpu_start) = .; \ VMLINUX_SYMBOL(__per_cpu_start) = .; \
*(.data.percpu.first) \ *(.data..percpu..first) \
*(.data.percpu.page_aligned) \ *(.data..percpu..page_aligned) \
*(.data.percpu) \ *(.data..percpu) \
*(.data.percpu.shared_aligned) \ *(.data..percpu..shared_aligned) \
VMLINUX_SYMBOL(__per_cpu_end) = .; \ VMLINUX_SYMBOL(__per_cpu_end) = .; \
} phdr \ } phdr \
. = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu); . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
/** /**
* PERCPU - define output section for percpu area, simple version * PERCPU - define output section for percpu area, simple version
@@ -687,18 +687,18 @@
* *
* This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except
* that __per_cpu_load is defined as a relative symbol against * that __per_cpu_load is defined as a relative symbol against
* .data.percpu which is required for relocatable x86_32 * .data..percpu which is required for relocatable x86_32
* configuration. * configuration.
*/ */
#define PERCPU(align) \ #define PERCPU(align) \
. = ALIGN(align); \ . = ALIGN(align); \
.data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { \ .data..percpu : AT(ADDR(.data..percpu) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__per_cpu_load) = .; \ VMLINUX_SYMBOL(__per_cpu_load) = .; \
VMLINUX_SYMBOL(__per_cpu_start) = .; \ VMLINUX_SYMBOL(__per_cpu_start) = .; \
*(.data.percpu.first) \ *(.data..percpu..first) \
*(.data.percpu.page_aligned) \ *(.data..percpu..page_aligned) \
*(.data.percpu) \ *(.data..percpu) \
*(.data.percpu.shared_aligned) \ *(.data..percpu..shared_aligned) \
VMLINUX_SYMBOL(__per_cpu_end) = .; \ VMLINUX_SYMBOL(__per_cpu_end) = .; \
} }

4
include/linux/percpu-defs.h
View File

@@ -127,11 +127,11 @@
* Declaration/definition used for per-CPU variables that must be page aligned. * Declaration/definition used for per-CPU variables that must be page aligned.
*/ */
#define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ #define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \
DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") \ DECLARE_PER_CPU_SECTION(type, name, "..page_aligned") \
__aligned(PAGE_SIZE) __aligned(PAGE_SIZE)
#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \
DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") \ DEFINE_PER_CPU_SECTION(type, name, "..page_aligned") \
__aligned(PAGE_SIZE) __aligned(PAGE_SIZE)
/* /*

2
kernel/module.c
View File

@@ -397,7 +397,7 @@ static unsigned int find_pcpusec(Elf_Ehdr *hdr,
Elf_Shdr *sechdrs, Elf_Shdr *sechdrs,
const char *secstrings) const char *secstrings)
{ {
return find_sec(hdr, sechdrs, secstrings, ".data.percpu"); return find_sec(hdr, sechdrs, secstrings, ".data..percpu");
} }
static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size) static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size)