diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-09 11:09:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-09 11:09:40 -0800 |
| commit | ae67e87f408bbf2533f246049d6e66320f3b7a81 (patch) | |
| tree | fed4dd38e3c72f49d72aa725fa718ca338088faf /include | |
| parent | Merge tag 'iommu-fixes-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff) | |
| parent | percpu: use notrace variant of preempt_disable/preempt_enable (diff) | |
| download | linux-dev-ae67e87f408bbf2533f246049d6e66320f3b7a81.tar.xz linux-dev-ae67e87f408bbf2533f246049d6e66320f3b7a81.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Two bug fixes
- a memory alignment fix in the s390 only hypfs code
- a fix for the generic percpu code that caused ftrace to break on
s390. This is not relevant for x86 but for all architectures that
use the generic percpu code"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
percpu: use notrace variant of preempt_disable/preempt_enable
s390/hypfs: Use get_free_page() instead of kmalloc to ensure page alignment
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/percpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h index 40e887068da2..0504ef8f3aa3 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h @@ -118,9 +118,9 @@ do { \ #define this_cpu_generic_read(pcp) \ ({ \ typeof(pcp) __ret; \ - preempt_disable(); \ + preempt_disable_notrace(); \ __ret = raw_cpu_generic_read(pcp); \ - preempt_enable(); \ + preempt_enable_notrace(); \ __ret; \ }) |