Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1229992
| Path | csiph.com!goblin1!goblin2!goblin.stu.neva.ru!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Feng Wu <feng.wu@intel.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH] Add virt directory to the top Makefile |
| Date | Tue, 22 Sep 2015 11:10:02 +0200 |
| Message-ID | <qbrKi-Rt-19@gated-at.bofh.it> (permalink) |
| X-Original-To | pbonzini@redhat.com, alex.williamson@redhat.com, mmarek@suse.com |
| X-Extloop1 | 1 |
| X-Ironport-Av | E=Sophos;i="5.17,572,1437462000"; d="scan'208";a="774353642" |
| X-Mailer | git-send-email 2.1.0 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 78 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | eric.auger@linaro.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Feng Wu <feng.wu@intel.com> |
| X-Original-Date | Tue, 22 Sep 2015 16:47:29 +0800 |
| X-Original-Message-ID | <1442911649-149474-1-git-send-email-feng.wu@intel.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1229992 |
Show key headers only | View raw
We need to build files in virt/lib/, which are now used by KVM and VFIO, so add virt directory to the top Makefile. Signed-off-by: Feng Wu <feng.wu@intel.com> --- Makefile | 8 +++++--- arch/x86/kvm/Makefile | 3 --- virt/Makefile | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 virt/Makefile diff --git a/Makefile b/Makefile index 35b4c19..d82fceb 100644 --- a/Makefile +++ b/Makefile @@ -550,6 +550,7 @@ drivers-y := drivers/ sound/ firmware/ net-y := net/ libs-y := lib/ core-y := usr/ +virt-y := virt/ endif # KBUILD_EXTMOD ifeq ($(dot-config),1) @@ -890,10 +891,10 @@ core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ - $(net-y) $(net-m) $(libs-y) $(libs-m))) + $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y))) vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \ - $(init-) $(core-) $(drivers-) $(net-) $(libs-)))) + $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-)))) init-y := $(patsubst %/, %/built-in.o, $(init-y)) core-y := $(patsubst %/, %/built-in.o, $(core-y)) @@ -902,10 +903,11 @@ net-y := $(patsubst %/, %/built-in.o, $(net-y)) libs-y1 := $(patsubst %/, %/lib.a, $(libs-y)) libs-y2 := $(patsubst %/, %/built-in.o, $(libs-y)) libs-y := $(libs-y1) $(libs-y2) +virt-y := $(patsubst %/, %/built-in.o, $(virt-y)) # Externally visible symbols (used by link-vmlinux.sh) export KBUILD_VMLINUX_INIT := $(head-y) $(init-y) -export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) +export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(virt-y) export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds export LDFLAGS_vmlinux # used by scripts/pacmage/Makefile diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index 05cc2d7..67d215c 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile @@ -6,9 +6,6 @@ CFLAGS_svm.o := -I. CFLAGS_vmx.o := -I. KVM := ../../../virt/kvm -LIB := ../../../virt/lib - -obj-$(CONFIG_IRQ_BYPASS_MANAGER) += $(LIB)/ kvm-y += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o \ $(KVM)/eventfd.o $(KVM)/irqchip.o $(KVM)/vfio.o diff --git a/virt/Makefile b/virt/Makefile new file mode 100644 index 0000000..335dc0b --- /dev/null +++ b/virt/Makefile @@ -0,0 +1 @@ +obj-y += ./lib/ -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH] Add virt directory to the top Makefile Feng Wu <feng.wu@intel.com> - 2015-09-22 11:10 +0200
Re: [PATCH] Add virt directory to the top Makefile Michal Marek <mmarek@suse.com> - 2015-09-22 11:30 +0200
Re: [PATCH] Add virt directory to the top Makefile Paolo Bonzini <pbonzini@redhat.com> - 2015-09-22 12:20 +0200
csiph-web