diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/context_tracking.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index 839d377d0da5..6e89e094c80e 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c | |||
@@ -33,15 +33,15 @@ void context_tracking_cpu_set(int cpu) | |||
33 | } | 33 | } |
34 | 34 | ||
35 | /** | 35 | /** |
36 | * user_enter - Inform the context tracking that the CPU is going to | 36 | * context_tracking_user_enter - Inform the context tracking that the CPU is going to |
37 | * enter userspace mode. | 37 | * enter userspace mode. |
38 | * | 38 | * |
39 | * This function must be called right before we switch from the kernel | 39 | * This function must be called right before we switch from the kernel |
40 | * to userspace, when it's guaranteed the remaining kernel instructions | 40 | * to userspace, when it's guaranteed the remaining kernel instructions |
41 | * to execute won't use any RCU read side critical section because this | 41 | * to execute won't use any RCU read side critical section because this |
42 | * function sets RCU in extended quiescent state. | 42 | * function sets RCU in extended quiescent state. |
43 | */ | 43 | */ |
44 | void user_enter(void) | 44 | void context_tracking_user_enter(void) |
45 | { | 45 | { |
46 | unsigned long flags; | 46 | unsigned long flags; |
47 | 47 | ||
@@ -131,8 +131,8 @@ EXPORT_SYMBOL_GPL(preempt_schedule_context); | |||
131 | #endif /* CONFIG_PREEMPT */ | 131 | #endif /* CONFIG_PREEMPT */ |
132 | 132 | ||
133 | /** | 133 | /** |
134 | * user_exit - Inform the context tracking that the CPU is | 134 | * context_tracking_user_exit - Inform the context tracking that the CPU is |
135 | * exiting userspace mode and entering the kernel. | 135 | * exiting userspace mode and entering the kernel. |
136 | * | 136 | * |
137 | * This function must be called after we entered the kernel from userspace | 137 | * This function must be called after we entered the kernel from userspace |
138 | * before any use of RCU read side critical section. This potentially include | 138 | * before any use of RCU read side critical section. This potentially include |
@@ -141,7 +141,7 @@ EXPORT_SYMBOL_GPL(preempt_schedule_context); | |||
141 | * This call supports re-entrancy. This way it can be called from any exception | 141 | * This call supports re-entrancy. This way it can be called from any exception |
142 | * handler without needing to know if we came from userspace or not. | 142 | * handler without needing to know if we came from userspace or not. |
143 | */ | 143 | */ |
144 | void user_exit(void) | 144 | void context_tracking_user_exit(void) |
145 | { | 145 | { |
146 | unsigned long flags; | 146 | unsigned long flags; |
147 | 147 | ||