diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/semaphore.c | 2 | ||||
-rw-r--r-- | kernel/trace/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/semaphore.c b/kernel/semaphore.c index 60636a4e25c3..4567fc020fe3 100644 --- a/kernel/semaphore.c +++ b/kernel/semaphore.c | |||
@@ -118,7 +118,7 @@ EXPORT_SYMBOL(down_killable); | |||
118 | * down_trylock - try to acquire the semaphore, without waiting | 118 | * down_trylock - try to acquire the semaphore, without waiting |
119 | * @sem: the semaphore to be acquired | 119 | * @sem: the semaphore to be acquired |
120 | * | 120 | * |
121 | * Try to acquire the semaphore atomically. Returns 0 if the mutex has | 121 | * Try to acquire the semaphore atomically. Returns 0 if the semaphore has |
122 | * been acquired successfully or 1 if it it cannot be acquired. | 122 | * been acquired successfully or 1 if it it cannot be acquired. |
123 | * | 123 | * |
124 | * NOTE: This return value is inverted from both spin_trylock and | 124 | * NOTE: This return value is inverted from both spin_trylock and |
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index d81a1a532994..f347ac91292d 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
@@ -271,7 +271,7 @@ config PROFILE_ANNOTATED_BRANCHES | |||
271 | bool "Trace likely/unlikely profiler" | 271 | bool "Trace likely/unlikely profiler" |
272 | select TRACE_BRANCH_PROFILING | 272 | select TRACE_BRANCH_PROFILING |
273 | help | 273 | help |
274 | This tracer profiles all the the likely and unlikely macros | 274 | This tracer profiles all likely and unlikely macros |
275 | in the kernel. It will display the results in: | 275 | in the kernel. It will display the results in: |
276 | 276 | ||
277 | /sys/kernel/debug/tracing/trace_stat/branch_annotated | 277 | /sys/kernel/debug/tracing/trace_stat/branch_annotated |