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

Merge branch 'percpu-for-linus' into percpu-for-next

Browse Source 
Conflicts:
	arch/sparc/kernel/smp_64.c
	arch/x86/kernel/cpu/perf_counter.c
	arch/x86/kernel/setup_percpu.c
	drivers/cpufreq/cpufreq_ondemand.c
	mm/percpu.c

Conflicts in core and arch percpu codes are mostly from commit
ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many
num_possible_cpus() with nr_cpu_ids.  As for-next branch has moved all
the first chunk allocators into mm/percpu.c, the changes are moved
from arch code to mm/percpu.c.

Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Tejun Heo
2009-08-14 14:41:02 +09:00
parent a76761b621 142d44b0dd
commit 384be2b18a
1985 changed files with 49463 additions and 28163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,9 +30,7 @@
* EXCEPTION_TABLE(...)
* NOTES
*
* __bss_start = .;
* BSS_SECTION(0, 0)
* __bss_stop = .;
* BSS_SECTION(0, 0, 0)
* _end = .;
*
* STABS_DEBUG
@ -188,7 +186,7 @@
. = ALIGN(align); \
*(.data.cacheline_aligned)
#define INIT_TASK(align) \
#define INIT_TASK_DATA(align) \
. = ALIGN(align); \
*(.data.init_task)
@ -431,10 +429,10 @@
/*
* Init task
*/
#define INIT_TASK_DATA(align) \
#define INIT_TASK_DATA_SECTION(align) \
. = ALIGN(align); \
.data.init_task : { \
INIT_TASK \
INIT_TASK_DATA(align) \
}
#ifdef CONFIG_CONSTRUCTORS
@ -486,7 +484,8 @@
* bss (Block Started by Symbol) - uninitialized data
* zeroed during startup
*/
#define SBSS \
#define SBSS(sbss_align) \
. = ALIGN(sbss_align); \
.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \
*(.sbss) \
*(.scommon) \
@ -495,12 +494,10 @@
#define BSS(bss_align) \
. = ALIGN(bss_align); \
.bss : AT(ADDR(.bss) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__bss_start) = .; \
*(.bss.page_aligned) \
*(.dynbss) \
*(.bss) \
*(COMMON) \
VMLINUX_SYMBOL(__bss_stop) = .; \
}
/*
@ -719,15 +716,15 @@
* matches the requirment of PAGE_ALIGNED_DATA.
*
* use 0 as page_align if page_aligned data is not used */
#define RW_DATA_SECTION(cacheline, nosave, pagealigned, inittask) \
#define RW_DATA_SECTION(cacheline, pagealigned, inittask) \
. = ALIGN(PAGE_SIZE); \
.data : AT(ADDR(.data) - LOAD_OFFSET) { \
INIT_TASK(inittask) \
INIT_TASK_DATA(inittask) \
CACHELINE_ALIGNED_DATA(cacheline) \
READ_MOSTLY_DATA(cacheline) \
DATA_DATA \
CONSTRUCTORS \
NOSAVE_DATA(nosave) \
NOSAVE_DATA \
PAGE_ALIGNED_DATA(pagealigned) \
}
@ -749,8 +746,10 @@
INIT_RAM_FS \
}
#define BSS_SECTION(sbss_align, bss_align) \
SBSS \
#define BSS_SECTION(sbss_align, bss_align, stop_align) \
. = ALIGN(sbss_align); \
VMLINUX_SYMBOL(__bss_start) = .; \
SBSS(sbss_align) \
BSS(bss_align) \
. = ALIGN(4);
. = ALIGN(stop_align); \
VMLINUX_SYMBOL(__bss_stop) = .;