diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2013-08-14 14:55:40 +0200 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-04-30 11:39:05 +0530 |
| commit | 41c4d54b08d41e48939e279a5af4f7eaf602611b (patch) | |
| tree | d681d3af933dbef2505cd15235ed4090c5e4583b /arch/score | |
| parent | ff4f2a208aee1320c04d230169165f7ccaccea00 (diff) | |
sched, arch: Create asm/preempt.h
In order to prepare to per-arch implementations of preempt_count move
the required bits into an asm-generic header and use this for all
archs.
(cherry picked from commit a787870924dbd6f321661e06d4ec1c7a408c9ccf)
Conflicts:
arch/c6x/include/asm/Kbuild
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/ia64/include/asm/Kbuild
arch/mips/include/asm/Kbuild
arch/openrisc/include/asm/Kbuild
arch/powerpc/include/asm/Kbuild
arch/score/include/asm/Kbuild
include/linux/preempt.h
Change-Id: I544914d3c23cc50da658296a34f9f2796854e259
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-h5j0c1r3e3fk015m30h8f1zx@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'arch/score')
| -rw-r--r-- | arch/score/include/asm/Kbuild | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index cebaff8069a1..194574fdb482 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -3,3 +3,8 @@ header-y += generic-y += clkdev.h generic-y += trace_clock.h +<<<<<<< HEAD +======= +generic-y += xor.h +generic-y += preempt.h +>>>>>>> a787870... sched, arch: Create asm/preempt.h |