aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic/vmlinux.lds.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-08-02 02:29:56 -0400
committerIngo Molnar <mingo@elte.hu>2010-08-02 02:31:54 -0400
commit3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01 (patch)
treea1a8cc85948c086aa12a1d8014151a7ca7c04ea8 /include/asm-generic/vmlinux.lds.h
parent9fc3af467d0749989518a23f7289a6f44e5cb214 (diff)
parent9fe6206f400646a2322096b56c59891d530e8d51 (diff)
Merge commit 'v2.6.35' into perf/core
Conflicts: tools/perf/Makefile tools/perf/util/hist.c Merge reason: Resolve the conflicts and update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
-rw-r--r--include/asm-generic/vmlinux.lds.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 415b1a9118e7..853aa871fc6c 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -63,6 +63,12 @@
63/* Align . to a 8 byte boundary equals to maximum function alignment. */ 63/* Align . to a 8 byte boundary equals to maximum function alignment. */
64#define ALIGN_FUNCTION() . = ALIGN(8) 64#define ALIGN_FUNCTION() . = ALIGN(8)
65 65
66/*
67 * Align to a 32 byte boundary equal to the
68 * alignment gcc 4.5 uses for a struct
69 */
70#define STRUCT_ALIGN() . = ALIGN(32)
71
66/* The actual configuration determine if the init/exit sections 72/* The actual configuration determine if the init/exit sections
67 * are handled as text/data or they can be discarded (which 73 * are handled as text/data or they can be discarded (which
68 * often happens at runtime) 74 * often happens at runtime)
@@ -162,7 +168,11 @@
162 LIKELY_PROFILE() \ 168 LIKELY_PROFILE() \
163 BRANCH_PROFILE() \ 169 BRANCH_PROFILE() \
164 TRACE_PRINTKS() \ 170 TRACE_PRINTKS() \
171 \
172 STRUCT_ALIGN(); \
165 FTRACE_EVENTS() \ 173 FTRACE_EVENTS() \
174 \
175 STRUCT_ALIGN(); \
166 TRACE_SYSCALLS() 176 TRACE_SYSCALLS()
167 177
168/* 178/*
@@ -431,7 +441,7 @@
431 */ 441 */
432#define INIT_TASK_DATA_SECTION(align) \ 442#define INIT_TASK_DATA_SECTION(align) \
433 . = ALIGN(align); \ 443 . = ALIGN(align); \
434 .data..init_task : { \ 444 .data..init_task : AT(ADDR(.data..init_task) - LOAD_OFFSET) { \
435 INIT_TASK_DATA(align) \ 445 INIT_TASK_DATA(align) \
436 } 446 }
437 447