Garrett, are we good to merge this too? ----- Original Message ----- > This should apply after the previous all 5 oom patches. > > Signed-off-by: CAI Qian <[email protected]> > --- > testcases/kernel/mem/oom/Makefile | 1 + > testcases/kernel/mem/oom/lib/oom.c | 9 ++++++++- > 2 files changed, 9 insertions(+), 1 deletions(-) > > diff --git a/testcases/kernel/mem/oom/Makefile > b/testcases/kernel/mem/oom/Makefile > index cfce410..01c0546 100644 > --- a/testcases/kernel/mem/oom/Makefile > +++ b/testcases/kernel/mem/oom/Makefile > @@ -24,6 +24,7 @@ LDLIBS += $(NUMA_LIBS) -loom > LIBDIR := lib > LIB := $(LIBDIR)/liboom.a > FILTER_OUT_DIRS := $(LIBDIR) > +LDFLAGS += -L$(LIBDIR) > > $(LIBDIR): > mkdir -p "$@" > diff --git a/testcases/kernel/mem/oom/lib/oom.c > b/testcases/kernel/mem/oom/lib/oom.c > index 0c44959..f0f1dac 100644 > --- a/testcases/kernel/mem/oom/lib/oom.c > +++ b/testcases/kernel/mem/oom/lib/oom.c > @@ -8,11 +8,15 @@ > #include <errno.h> > #include <stdio.h> > #include <string.h> > -#include <numaif.h> > #include <stdarg.h> > #include "test.h" > #include "usctest.h" > #include "oom.h" > +#include "config.h" > +#if HAVE_NUMA_H && HAVE_LINUX_MEMPOLICY_H && HAVE_NUMAIF_H \ > + && HAVE_MPOL_CONSTANTS > +#include <numaif.h> > +#endif > > void oom(int testcase, int mempolicy, int lite) > { > @@ -24,10 +28,13 @@ void oom(int testcase, int mempolicy, int lite) > case -1: > tst_brkm(TBROK|TERRNO, cleanup, "fork"); > case 0: > +#if HAVE_NUMA_H && HAVE_LINUX_MEMPOLICY_H && HAVE_NUMAIF_H \ > + && HAVE_MPOL_CONSTANTS > if (mempolicy) > if (set_mempolicy(MPOL_BIND, &nmask, MAXNODES) == -1) > tst_brkm(TBROK|TERRNO, cleanup, > "set_mempolicy"); > +#endif > test_alloc(testcase, lite); > exit(0); > default: > -- > 1.7.3.2
------------------------------------------------------------------------------ Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
