diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:54:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:54:30 +0100 |
| commit | 67caadc611eb1bf4aefc7c7a33dde30d12832569 (patch) | |
| tree | d36388a7af0948af048542d25a35ae36d1570379 | |
| parent | b3d9a136815ca9284ade2a897a3b7d2b0084c33c (diff) | |
| parent | af8e947079a7dab0480b5d6db6b093fd04b86fc9 (diff) | |
Merge branch 'x86/build' into x86/asm, to fix up conflicts
Conflicts:
arch/x86/entry/syscalls/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/x86/entry/syscalls/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/entry/syscalls/Makefile b/arch/x86/entry/syscalls/Makefile index 331f1dca5085..6fb9b57ed5ba 100644 --- a/arch/x86/entry/syscalls/Makefile +++ b/arch/x86/entry/syscalls/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -out := $(obj)/../../include/generated/asm -uapi := $(obj)/../../include/generated/uapi/asm +out := arch/$(SRCARCH)/include/generated/asm +uapi := arch/$(SRCARCH)/include/generated/uapi/asm # Create output directory if not already present _dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') \ |