From: Subrata M. <su...@li...> - 2008-03-26 08:57:45
|
On Wed, 2008-03-26 at 16:49 +0800, wangf wrote: > Hi, > > When I was compiling ltp-full-20080229/kernel/module/, error occured. > The error like this: > ... > scripts/Makefile.build:46: *** CFLAGS was changed > in"ltp-full-20080229/testcases/kernel/module/delete_module/Makefile".Fix > it to use EXTRA_CFLAGS. Stop. > > The reason is: When we build an External module, we should use > EXTRA_CFLAGS, not CFLAGS. > In detail please refer to Documentation/kbuild/modules.txt > > In addition,there are some trashy "include" such as: > "#include <asm/atomic.h>" in delete_module01.c > "#include <linux/config.h>" in dummy_del_mod.c > > The following patch solves these problems: > > Signed-off-by: Wang Fang <wa...@cn...> > > --- Thanks for your Patches. Mike, Can you review this Patch and put forward your comments ? Regards-- Subrata > > diff -Nrup ltp-full-20080229/testcases/kernel/module/delete_module/delete_module01.c ltp-full-20080229-new/testcases/kernel/module/delete_module/delete_module01.c > --- ltp-full-20080229/testcases/kernel/module/delete_module/delete_module01.c 2008-02-29 15:55:43.000000000 +0800 > +++ ltp-full-20080229-new/testcases/kernel/module/delete_module/delete_module01.c 2008-03-26 13:23:11.000000000 +0800 > @@ -65,7 +65,6 @@ > * > ****************************************************************/ > #include <errno.h> > -#include <asm/atomic.h> > //#include <linux/module.h> > #include "test.h" > #include "usctest.h" > diff -Nrup ltp-full-20080229/testcases/kernel/module/delete_module/delete_module02.c ltp-full-20080229-new/testcases/kernel/module/delete_module/delete_module02.c > --- ltp-full-20080229/testcases/kernel/module/delete_module/delete_module02.c 2008-02-29 15:55:43.000000000 +0800 > +++ ltp-full-20080229-new/testcases/kernel/module/delete_module/delete_module02.c 2008-03-26 13:44:17.000000000 +0800 > @@ -83,7 +83,6 @@ > #include <pwd.h> > #include <sys/types.h> > #include <asm/page.h> > -#include <asm/atomic.h> > //#include <linux/module.h> > #include <sys/mman.h> > #include "test.h" > @@ -278,4 +277,5 @@ cleanup(void) > /* exit with return code appropriate for results */ > tst_exit(); > /*NOTREACHED*/ > -} > \ No newline at end of file > +} > + > diff -Nrup ltp-full-20080229/testcases/kernel/module/delete_module/delete_module03.c ltp-full-20080229-new/testcases/kernel/module/delete_module/delete_module03.c > --- ltp-full-20080229/testcases/kernel/module/delete_module/delete_module03.c 2008-02-29 15:55:43.000000000 +0800 > +++ ltp-full-20080229-new/testcases/kernel/module/delete_module/delete_module03.c 2008-03-26 13:28:06.000000000 +0800 > @@ -79,7 +79,6 @@ > > #include <errno.h> > #include <pwd.h> > -#include <asm/atomic.h> > //#include <linux/module.h> > #include "test.h" > #include "usctest.h" > diff -Nrup ltp-full-20080229/testcases/kernel/module/delete_module/dummy_del_mod.c ltp-full-20080229-new/testcases/kernel/module/delete_module/dummy_del_mod.c > --- ltp-full-20080229/testcases/kernel/module/delete_module/dummy_del_mod.c 2008-02-29 15:55:43.000000000 +0800 > +++ ltp-full-20080229-new/testcases/kernel/module/delete_module/dummy_del_mod.c 2008-03-26 13:28:24.000000000 +0800 > @@ -27,7 +27,6 @@ > */ > > #include <asm/atomic.h> > -#include <linux/config.h> > #include <linux/module.h> > #include <linux/init.h> > #include <linux/proc_fs.h> > diff -Nrup ltp-full-20080229/testcases/kernel/module/delete_module/dummy_del_mod_dep.c ltp-full-20080229-new/testcases/kernel/module/delete_module/dummy_del_mod_dep.c > --- ltp-full-20080229/testcases/kernel/module/delete_module/dummy_del_mod_dep.c 2008-02-29 15:55:43.000000000 +0800 > +++ ltp-full-20080229-new/testcases/kernel/module/delete_module/dummy_del_mod_dep.c 2008-03-26 13:28:38.000000000 +0800 > @@ -29,7 +29,6 @@ > > #include <asm/atomic.h> > #include <linux/module.h> > -#include <linux/config.h> > #include <linux/init.h> > #include <linux/proc_fs.h> > #include <linux/kernel.h> > diff -Nrup ltp-full-20080229/testcases/kernel/module/delete_module/Makefile ltp-full-20080229-new/testcases/kernel/module/delete_module/Makefile > --- ltp-full-20080229/testcases/kernel/module/delete_module/Makefile 2008-02-29 15:55:43.000000000 +0800 > +++ ltp-full-20080229-new/testcases/kernel/module/delete_module/Makefile 2008-03-26 14:40:33.000000000 +0800 > @@ -18,7 +18,7 @@ > # description : make file for the delete_module(2) testcases # > ########################################################################### > > -CFLAGS+= -I../../../../include -Wall > +EXTRA_CFLAGS+= -I../../../../include -Wall > MODCFLAGS+= /lib/modules/`uname -r`/build > LOADLIBES+= -L../../../../lib -lltp > > @@ -31,13 +31,13 @@ all: $(TARGETS) > # chmod 755 $(OBJS) > > delete_module01: delete_module01.c > - $(CC) $(CFLAGS) delete_module01.c $(LOADLIBES) -o $@ > + $(CC) $(EXTRA_CFLAGS) delete_module01.c $(LOADLIBES) -o $@ > > delete_module02: delete_module02.c > - $(CC) $(CFLAGS) delete_module02.c $(LOADLIBES) -o $@ > + $(CC) $(EXTRA_CFLAGS) delete_module02.c $(LOADLIBES) -o $@ > > delete_module03: delete_module03.c > - $(CC) $(CFLAGS) delete_module03.c $(LOADLIBES) -o $@ > + $(CC) $(EXTRA_CFLAGS) delete_module03.c $(LOADLIBES) -o $@ > > install: > @set -e; for i in $(TARGETS); do ln -f $$i ../../../bin/$$i ; done > > > > > > ------------------------------------------------------------------------- > Check out the new SourceForge.net Marketplace. > It's the best place to buy or sell services for > just about anything Open Source. > http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace > _______________________________________________ > Ltp-list mailing list > Ltp...@li... > https://lists.sourceforge.net/lists/listinfo/ltp-list |