| Message ID | 1459344713-20394-1-git-send-email-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 30/03/2016 15:31, Thomas Huth wrote: > kvm-unit-tests can currently not be build in parallel for powerpc. > For example with "make -j4", I get: > > In file included from lib/asm/../../powerpc/asm/ppc_asm.h:4:0, > from lib/asm/ppc_asm.h:1, > from lib/powerpc/setup.c:19: > lib/asm/asm-offsets.h:1:35: fatal error: generated/asm-offsets.h: No such file or directory > > Fix it by adding a proper dependency to the Makefile (cstart64.S > needs this generated header file), and by removing an unnecessary > include-statement in lib/powerpc/setup.c. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > lib/powerpc/setup.c | 1 - > powerpc/Makefile.common | 2 ++ > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/powerpc/setup.c b/lib/powerpc/setup.c > index e3cf952..353c7d4 100644 > --- a/lib/powerpc/setup.c > +++ b/lib/powerpc/setup.c > @@ -16,7 +16,6 @@ > #include <alloc.h> > #include <asm/setup.h> > #include <asm/page.h> > -#include <asm/ppc_asm.h> > #include <asm/hcall.h> > > extern unsigned long stacktop; > diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common > index 4ffb829..4449aec 100644 > --- a/powerpc/Makefile.common > +++ b/powerpc/Makefile.common > @@ -68,6 +68,8 @@ generated_files = $(asm-offsets) > > test_cases: $(generated_files) $(tests-common) $(tests) > > +$(cstart.o): $(asm-offsets) > + > $(TEST_DIR)/selftest.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/selftest.o > > $(TEST_DIR)/spapr_hcall.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/spapr_hcall.o > Thanks, applying soon. Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/lib/powerpc/setup.c b/lib/powerpc/setup.c index e3cf952..353c7d4 100644 --- a/lib/powerpc/setup.c +++ b/lib/powerpc/setup.c @@ -16,7 +16,6 @@ #include <alloc.h> #include <asm/setup.h> #include <asm/page.h> -#include <asm/ppc_asm.h> #include <asm/hcall.h> extern unsigned long stacktop; diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index 4ffb829..4449aec 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -68,6 +68,8 @@ generated_files = $(asm-offsets) test_cases: $(generated_files) $(tests-common) $(tests) +$(cstart.o): $(asm-offsets) + $(TEST_DIR)/selftest.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/selftest.o $(TEST_DIR)/spapr_hcall.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/spapr_hcall.o
kvm-unit-tests can currently not be build in parallel for powerpc. For example with "make -j4", I get: In file included from lib/asm/../../powerpc/asm/ppc_asm.h:4:0, from lib/asm/ppc_asm.h:1, from lib/powerpc/setup.c:19: lib/asm/asm-offsets.h:1:35: fatal error: generated/asm-offsets.h: No such file or directory Fix it by adding a proper dependency to the Makefile (cstart64.S needs this generated header file), and by removing an unnecessary include-statement in lib/powerpc/setup.c. Signed-off-by: Thomas Huth <thuth@redhat.com> --- lib/powerpc/setup.c | 1 - powerpc/Makefile.common | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)