aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | ocfs2: Update dlmfs for new dlmlock() APIMark Fasheh2006-09-242-51/+31
| | | | | | | | | | | | | | | | | | | | | | | | We just need to add a namelen field to the user_lock_res structure, and update a few debug prints. Instead of updating all debug prints, I took the opportunity to remove a few that are likely unnecessary these days. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | ocfs2: Allow binary names in the DLMMark Fasheh2006-09-245-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | The OCFS2 DLM uses strlen() to determine lock name length, which excludes the possibility of putting binary values in the name string. Fix this by requiring that string length be passed in as a parameter. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * | ocfs2: Silence dlm error printMark Fasheh2006-09-241-3/+3
| | | | | | | | | | | | | | | | | | | | | An AST can be delivered via the network after a lock has been removed, so no need to print an error when we see that. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
* | | Merge git://git.infradead.org/~dwmw2/khdrs-2.6Linus Torvalds2006-09-2439-142/+171
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.infradead.org/~dwmw2/khdrs-2.6: New 'make headers_install_all' target. Use dependencies for 'make headers_install'. [S390] Unexport <asm/z90crypt.h>, export <asm/zcrypt.h> in its place. Remove dead netfilter_logging.h from include/linux/Kbuild Remove offsetof() from user-visible <linux/stddef.h> Clean up exported headers on CRIS Fix v850 exported headers Don't advertise (or allow) headers_{install,check} where inappropriate. Remove UML header export Remove ARM26 header export. Fix H8300 exported headers. Fix m68knommu exported headers Fix exported headers for SPARC, SPARC64 Fix 'make headers_check' on m32r Fix 'make headers_check' on sh64 Fix 'make headers_check' on sh [HEADERS] Fix ARM 'make headers_check' Initial pass of manual conflict resolution in top-level Makefile over conflicting build rule and headers_install changes.
| * | | New 'make headers_install_all' target.David Woodhouse2006-09-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Install headers for _all_ architectures, suitable for making a tarball release or extracting them for use in a separate package. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Use dependencies for 'make headers_install'.David Woodhouse2006-09-243-46/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-export header files only if either they or their controlling Kbuild file has actually changed. Also allow for similar dependencies with 'headers_check', once we properly create the dependencies for those. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | [S390] Unexport <asm/z90crypt.h>, export <asm/zcrypt.h> in its place.David Woodhouse2006-09-241-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Remove dead netfilter_logging.h from include/linux/KbuildDavid Woodhouse2006-09-241-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Merge branch 'master' of ↵David Woodhouse2006-09-241797-64502/+170664
| |\ \ \ | | |/ / | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
| * | | Remove offsetof() from user-visible <linux/stddef.h>David Woodhouse2006-09-222-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | It's not used by anything user-visible, and it make g++ unhappy. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Clean up exported headers on CRISDavid Woodhouse2006-09-218-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes most of the issues with exported headers on CRIS, although we do still need to deal with the asm/arch symlink. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Fix v850 exported headersDavid Woodhouse2006-09-212-5/+6
| | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Don't advertise (or allow) headers_{install,check} where inappropriate.David Woodhouse2006-09-211-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For architectures which don't have the include/asm-$(ARCH)/Kbuild file, like ARM26, UM, etc. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Remove UML header exportDavid Woodhouse2006-09-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | No need for UML to export headers for userspace to build against. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Remove ARM26 header export.David Woodhouse2006-09-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | We ought to be able to use ARM headers; no need for special ARM26 version. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Fix H8300 exported headers.David Woodhouse2006-09-211-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Just clean up asm/page.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Fix m68knommu exported headersDavid Woodhouse2006-09-211-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Just clean up asm/page.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Fix exported headers for SPARC, SPARC64David Woodhouse2006-09-215-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly removing files which have no business being used in userspace. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | Fix 'make headers_check' on m32rDavid Woodhouse2006-09-215-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > asm-m32r/page.h requires asm-generic/memory_model.h, which does not exist > asm-m32r/ptrace.h requires asm/m32r.h, which does not exist > asm-m32r/signal.h requires linux/linkage.h, which does not exist > asm-m32r/unistd.h requires asm/syscall.h, which does not exist > asm-m32r/user.h requires asm/processor.h, which does not exist Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Fix 'make headers_check' on sh64Paul Mundt2006-09-214-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup for user headers, as noted: asm-sh64/page.h requires asm-generic/memory_model.h, which does not exist in exported headers asm-sh64/shmparam.h requires asm/cache.h, which does not exist in exported headers asm-sh64/signal.h requires asm/processor.h, which does not exist in exported headers asm-sh64/user.h requires asm/processor.h, which does not exist in exported headers Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Fix 'make headers_check' on shPaul Mundt2006-09-213-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup for user headers, as noted: asm-sh/page.h requires asm-generic/memory_model.h, which does not exist in exported headers asm-sh/ptrace.h requires asm/ubc.h, which does not exist in exported headers Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | [HEADERS] Fix ARM 'make headers_check'David Woodhouse2006-09-212-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | Sanitise the ARM headers exported to userspace. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | | Merge ssh://git.infradead.org/~/public_git/hdronelineDavid Woodhouse2006-09-2129-159/+721
| |\ \ \
* | \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuildLinus Torvalds2006-09-2420-319/+1471
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (28 commits) kbuild: add distclean info to 'make help' and more details for 'clean' dontdiff: add utsrelease.h kbuild: fix "mkdir -p" usage in scripts/package/mkspec kbuild: correct and clarify versioning info in Makefile kbuild: fixup Documentation/kbuild/modules.txt kbuild: Extend kbuild/defconfig tags support to exuberant ctags kbuild: fix for some typos in Documentation/makefiles.txt kbuild: clarify "make C=" build option Documentaion: update Documentation/Changes with minimum versions kbuild: update help in top level Makefile kbuild: fail kernel compilation in case of unresolved module symbols kbuild: remove debug left-over from Makefile.host kbuild: create output directory for hostprogs with O=.. build kbuild: add missing return statement in modpost.c:secref_whitelist() kbuild: preperly align SYSMAP output kbuild: make -rR is now default kbuild: make V=2 tell why a target is rebuild kbuild: modpost on vmlinux regardless of CONFIG_MODULES kbuild: ignore references from ".pci_fixup" to ".init.text" kbuild: linguistic fixes for Documentation/kbuild/makefiles.txt ...
| * | | | kbuild: add distclean info to 'make help' and more details for 'clean'Jesper Juhl2006-09-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add distclean info, that was previously missing, to 'make help'. Also add a few more details to the 'make clean' help text. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | dontdiff: add utsrelease.hRandy Dunlap2006-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auto-generated utsrelease.h to dontdiff file. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: fix "mkdir -p" usage in scripts/package/mkspecRolf Eike Beer2006-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "mkdir -p" does not only mean not to complain if the directory already exists, but also to create the parent directories if needed. This patch removes "lib" from the list of directories to create as we will also create "lib/modules". Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: correct and clarify versioning info in MakefileRobert P. J. Day2006-09-251-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attached patch clarifies the creation of KERNELRELEASE and corrects an error regarding the use of $(LOCALVERSION). Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: fixup Documentation/kbuild/modules.txtRobert P. J. Day2006-09-251-23/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: Extend kbuild/defconfig tags support to exuberant ctagsAron Griffis2006-09-251-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following patch extends kbuild/defconfig tags support to exuberant ctags. The previous support is only for emacs ctags/etags programs. This patch also corrects the kconfig regex for the emacs invocation. Previously it would miss some instances because it assumed /^config instead of /^[ \t]*config Signed-off-by: Aron Griffis <aron@hp.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: fix for some typos in Documentation/makefiles.txtBryce Harrington2006-09-251-40/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed a few typos while reading makefiles.txt to learn about the kbuild system. Attached is a patch against 2.6.18 to fix them. Remove trailing whitespace while we are there.. Signed-off-by: Bryce Harrington <bryce@osdl.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: clarify "make C=" build optionRobert P. J. Day2006-09-252-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify the use of "make C=" in the top-level Makefile, and fix a typo in the Documentation file. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | Documentaion: update Documentation/Changes with minimum versionsRobert P. J. Day2006-09-251-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on conversations with greg kh (and noticing a simple typo), these are the actual minimal versions for 2.6.18. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: update help in top level MakefileRobert P. J. Day2006-09-252-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: fail kernel compilation in case of unresolved module symbolsKirill Korotaev2006-09-252-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At stage 2 modpost utility is used to check modules. In case of unresolved symbols modpost only prints warning. IMHO it is a good idea to fail compilation process in case of unresolved symbols (at least in modules coming with kernel), since usually such errors are left unnoticed, but kernel modules are broken. - new option '-w' is added to modpost: if option is specified, modpost only warns about unresolved symbols - modpost is called with '-w' for external modules in Makefile.modpost Signed-off-by: Andrey Mirkin <amirkin@sw.ru> Signed-off-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: remove debug left-over from Makefile.hostSam Ravnborg2006-09-251-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: create output directory for hostprogs with O=.. buildSam Ravnborg2006-09-251-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hostprogs-y only supported creating output directory for the final program. Extend this to also cover the situation where a .o file (used when host program is made from compositie objects) is locate in another directory. First user of this is the built-in lxdialog that. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: add missing return statement in modpost.c:secref_whitelist()Sam Ravnborg2006-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed by: Magnus Damm <magnus@valinux.co.jp> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: preperly align SYSMAP outputSam Ravnborg2006-09-251-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align filenames for SYSMAP with other filenames Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: make -rR is now defaultSam Ravnborg2006-09-251-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not specify -rR anymore - it is default. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: make V=2 tell why a target is rebuildSam Ravnborg2006-09-252-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tell why a a target got build enabled by make V=2 Output (listed in the order they are checked): (1) - due to target is PHONY (2) - due to target missing (3) - due to: file1.h file2.h (4) - due to command line change (5) - due to missing .cmd file (6) - due to target not in $(targets) (1) We always build PHONY targets (2) No target, so we better build it (3) Prerequisite is newer than target (4) The command line stored in the file named dir/.target.cmd differed from actual command line. This happens when compiler options changes (5) No dir/.target.cmd file (used to store command line) (6) No dir/.target.cmd file and target not listed in $(targets) This is a good hint that there is a bug in the kbuild file This patch is inspired by a patch from: Milton Miller <miltonm@bga.com> Cc: Milton Miller <miltonm@bga.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: modpost on vmlinux regardless of CONFIG_MODULESSam Ravnborg2006-09-253-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on patch from: Magnus Damm <magnus@valinux.co.jp> This has the advantage that all section mismatch checks are run regardless of modules being enabled or not. When running modpost on vmlinux output: MODPOST vmlinux When running modpost on modules output count of modules like this: MODPOST 5 modules Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: ignore references from ".pci_fixup" to ".init.text"Magnus Damm2006-09-251-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The modpost code is extended to ignore references from ".pci_fixup" to ".init.text". Signed-off-by: Magnus Damm <magnus@valinux.co.jp>
| * | | | kbuild: linguistic fixes for Documentation/kbuild/makefiles.txtJan Engelhardt2006-09-251-90/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have done a look-through through Documentation/kbuild/ and my corrections (proposed) are attached. Cc'ed are original author Michael (responsible for comitting changes to these files?), Sam (kbuild maintainer), Adrian (-trivial maintainer). Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: linguistic fixes for Documentation/kbuild/modules.txtJan Engelhardt2006-09-251-59/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have done a look-through through Documentation/kbuild/ and my corrections (proposed) are attached. Cc'ed are original author Michael (responsible for comitting changes to these files?), Sam (kbuild maintainer), Adrian (-trivial maintainer). Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kconfig: linguistic fixes for Documentation/kbuild/kconfig-language.txtJan Engelhardt2006-09-251-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have done a look-through through Documentation/kbuild/ and my corrections (proposed) are attached. Cc'ed are original author Michael (responsible for comitting changes to these files?), Sam (kbuild maintainer), Adrian (-trivial maintainer). Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | remove RPM_BUILD_ROOT from asm-offsets.hOlaf Hering2006-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No file in rpm binary package should have the RPM_BUILD_ROOT string in it. To simplify building of external modules, our kernel-source package contains some temp files from the Kbuild system. asm/asm-offsets.h is one of the files that contains the absolute path if make O=$O is used. * This file was generated by /var/tmp/kernel-source-2.6.14_rc4-build/usr/src/linux-2.6.14-rc4-2/Kbuild Remove the $RPM_BUILD_ROOT string in the shipped tempfile. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: use in-kernel unifdefSam Ravnborg2006-09-253-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let headers_install use in-kernel unifdef Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: replace use of strlcpy with a dedicated implmentation in unifdefSam Ravnborg2006-09-251-1/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | | kbuild: add unifdefSam Ravnborg2006-09-251-0/+998
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains a raw copy of unifdef.c Next patch will modify it and add infrastructure to use it Adding unifdef to the kernel is acked by the author. The reason to add unifdef as part of the kernel source is that it is not yet a common utility on most distributions. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>