Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57d1c91f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

parents 47853e7f 37193147

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
*.a

*.s

*.ko

*.so

*.mod.c



#

Documentation/kbuild/modules.txt

+40 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ In this document you will find information about: 
	=== 5. Include files

	   --- 5.1 How to include files from the kernel include dir

	   --- 5.2 External modules using an include/ dir

	   --- 5.3 External modules using several directories

	=== 6. Module installation

	   --- 6.1 INSTALL_MOD_PATH

	   --- 6.2 INSTALL_MOD_DIR
@@ -344,6 +345,45 @@ directory and therefore needs to deal with this in their kbuild file. 
	Note that in the assignment there is no space between -I and the path.

	This is a kbuild limitation:  there must be no space present.



--- 5.3 External modules using several directories



	If an external module does not follow the usual kernel style but

	decide to spread files over several directories then kbuild can

	support this too.



	Consider the following example:

	

	|

	+- src/complex_main.c

	|   +- hal/hardwareif.c

	|   +- hal/include/hardwareif.h

	+- include/complex.h

	

	To build a single module named complex.ko we then need the following

	kbuild file:



	Kbuild:

		obj-m := complex.o

		complex-y := src/complex_main.o

		complex-y += src/hal/hardwareif.o



		EXTRA_CFLAGS := -I$(src)/include

		EXTRA_CFLAGS += -I$(src)src/hal/include





	kbuild knows how to handle .o files located in another directory -

	although this is NOT reccommended practice. The syntax is to specify

	the directory relative to the directory where the Kbuild file is

	located.



	To find the .h files we have to explicitly tell kbuild where to look

	for the .h files. When kbuild executes current directory is always

	the root of the kernel tree (argument to -C) and therefore we have to

	tell kbuild how to find the .h files using absolute paths.

	$(src) will specify the absolute path to the directory where the

	Kbuild file are located when being build as an external module.

	Therefore -I$(src)/ is used to point out the directory of the Kbuild

	file and any additional path are just appended.



=== 6. Module installation

arch/x86_64/ia32/.gitignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
vsyscall*.so

drivers/media/dvb/cinergyT2/cinergyT2.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); 
#define dprintk(level, args...)						\

do {									\

	if ((debug & level)) {						\

		printk("%s: %s(): ", __stringify(KBUILD_MODNAME),	\

		printk("%s: %s(): ", KBUILD_MODNAME,			\

		       __FUNCTION__);					\

		printk(args); }						\

} while (0)

drivers/media/dvb/ttpci/budget.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ extern int budget_debug; 
#endif



#define dprintk(level,args...) \

	    do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0)

	    do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __FUNCTION__); printk(args); } } while (0)



struct budget_info {

	char *name;