diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 11:17:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 11:17:12 -0400 |
commit | b854e4de0bf88d094476af82c0d5a80f6f2af916 (patch) | |
tree | 6e9b0a9f28468b043bd395fd816c4b44d4ac8f58 /include/asm-generic | |
parent | 458c3f60ef12996d5a5b390260a5112bb1da1615 (diff) | |
parent | 7d992feb7694a21ee81f22894b455dadd5d1c110 (diff) |
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RCU updates from Ingo Molnar:
"Main RCU changes this cycle were:
- Full-system idle detection. This is for use by Frederic
Weisbecker's adaptive-ticks mechanism. Its purpose is to allow the
timekeeping CPU to shut off its tick when all other CPUs are idle.
- Miscellaneous fixes.
- Improved rcutorture test coverage.
- Updated RCU documentation"
* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (30 commits)
nohz_full: Force RCU's grace-period kthreads onto timekeeping CPU
nohz_full: Add full-system-idle state machine
jiffies: Avoid undefined behavior from signed overflow
rcu: Simplify _rcu_barrier() processing
rcu: Make rcutorture emit online failures if verbose
rcu: Remove unused variable from rcu_torture_writer()
rcu: Sort rcutorture module parameters
rcu: Increase rcutorture test coverage
rcu: Add duplicate-callback tests to rcutorture
doc: Fix memory-barrier control-dependency example
rcu: Update RTFP documentation
nohz_full: Add full-system-idle arguments to API
nohz_full: Add full-system idle states and variables
nohz_full: Add per-CPU idle-state tracking
nohz_full: Add rcu_dyntick data for scalable detection of all-idle state
nohz_full: Add Kconfig parameter for scalable detection of all-idle state
nohz_full: Add testing information to documentation
rcu: Eliminate unused APIs intended for adaptive ticks
rcu: Select IRQ_WORK from TREE_PREEMPT_RCU
rculist: list_first_or_null_rcu() should use list_entry_rcu()
...
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/vmlinux.lds.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 69732d279e8b..83e2c31e8b00 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
@@ -122,8 +122,12 @@ | |||
122 | #define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .; \ | 122 | #define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .; \ |
123 | *(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \ | 123 | *(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \ |
124 | VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .; | 124 | VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .; |
125 | #define TRACEPOINT_STR() VMLINUX_SYMBOL(__start___tracepoint_str) = .; \ | ||
126 | *(__tracepoint_str) /* Trace_printk fmt' pointer */ \ | ||
127 | VMLINUX_SYMBOL(__stop___tracepoint_str) = .; | ||
125 | #else | 128 | #else |
126 | #define TRACE_PRINTKS() | 129 | #define TRACE_PRINTKS() |
130 | #define TRACEPOINT_STR() | ||
127 | #endif | 131 | #endif |
128 | 132 | ||
129 | #ifdef CONFIG_FTRACE_SYSCALLS | 133 | #ifdef CONFIG_FTRACE_SYSCALLS |
@@ -190,7 +194,8 @@ | |||
190 | VMLINUX_SYMBOL(__stop___verbose) = .; \ | 194 | VMLINUX_SYMBOL(__stop___verbose) = .; \ |
191 | LIKELY_PROFILE() \ | 195 | LIKELY_PROFILE() \ |
192 | BRANCH_PROFILE() \ | 196 | BRANCH_PROFILE() \ |
193 | TRACE_PRINTKS() | 197 | TRACE_PRINTKS() \ |
198 | TRACEPOINT_STR() | ||
194 | 199 | ||
195 | /* | 200 | /* |
196 | * Data section helpers | 201 | * Data section helpers |