summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-09 22:09:40 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-09 22:09:40 +0300
commitae67e87f408bbf2533f246049d6e66320f3b7a81 (patch)
treefed4dd38e3c72f49d72aa725fa718ca338088faf /include
parente3a00f68e426df24a5fb98956a1bd1b23943aa1e (diff)
parent7f8d61f005228fc48e6e2ca3c9af3302cd4870af (diff)
downloadlinux-ae67e87f408bbf2533f246049d6e66320f3b7a81.tar.xz
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.h4
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; \
})