Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree before applying more scheduler patches. Conflicts: arch/avr32/include/asm/Kbuild
Showing the changes to kernel/context_tracking.c (1 of 893 files). Show all
Unified · Split
| @@ -50,6 +50,15 @@ void context_tracking_user_enter(void) · 49 unmodified lines | |||
| 50 | { | 50 | { |
| 51 | unsigned long flags; | 51 | unsigned long flags; |
| 52 | 52 | ||
| 53 | /* | ||
| 54 | * Repeat the user_enter() check here because some archs may be calling | ||
| 55 | * this from asm and if no CPU needs context tracking, they shouldn't | ||
| 56 | * go further. Repeat the check here until they support the static key | ||
| 57 | * check. | ||
| 58 | */ | ||
| 59 | if (!static_key_false(&context_tracking_enabled)) | ||
| 60 | return; | ||
| 61 | |||
| 53 | /* | 62 | /* |
| 54 | * Some contexts may involve an exception occuring in an irq, | 63 | * Some contexts may involve an exception occuring in an irq, |
| 55 | * leading to that nesting: | 64 | * leading to that nesting: |
| @@ -151,6 +160,9 @@ void context_tracking_user_exit(void) · 95 unmodified lines | |||
| 151 | { | 160 | { |
| 152 | unsigned long flags; | 161 | unsigned long flags; |
| 153 | 162 | ||
| 163 | if (!static_key_false(&context_tracking_enabled)) | ||
| 164 | return; | ||
| 165 | |||
| 154 | if (in_interrupt()) | 166 | if (in_interrupt()) |
| 155 | return; | 167 | return; |
| 156 | 168 | ||