summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2008-07-22markers: fix duplicate modpost entryMathieu Desnoyers1-1/+2
When a kernel was rebuilt, the previous Module.markers was not cleared. It caused markers with different format strings to appear as duplicates when a markers was changed. This problem is present since scripts/mod/modpost.c started to generate Module.markers, commit b2e3e658b344c6bcfb8fb694100ab2f2b5b2edb0 It therefore applies to 2.6.25, 2.6.26 and linux-next. I merely merged the patches from Roland, Wenji and Takashi here. Credits to Roland McGrath <roland@redhat.com> Wenji Huang <wenji.huang@oracle.com> and Takashi Nishiie <t-nishiie@np.css.fujitsu.com> for providing the individual fixes. - Changelog : - Integrated Takashi's Makefile modification to clear Module.markers upon make clean. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: Roland McGrath <roland@redhat.com> Cc: Wenji Huang <wenji.huang@oracle.com> Cc: Takashi Nishiie <t-nishiie@np.css.fujitsu.com> Cc: <stable@kernel.org> [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-17Fix collateral damage to top level MakefileGrant Likely1-1/+0
The patch named "powerpc/mpc5121: Add clock driver", also contained an unrelated and bogus change to the top-level makefile. This patch backs out the bad bit. SHA1 of offending patch: 137e95906e294913fab02162e8a1948ade49acb5) Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Repented-by: John Rigby <jrigby@freescale.com> [ Heh. Normally I pick these out from the diffstats, but I guess I've grown to trust the ppc tree too much ;) - Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-16Fix MIPS cross-compile problemRalf Baechle1-2/+2
Crosscompiling on a Fedora 9 machine running gcc 4.3.0 as its host compiler and gcc 3.4.6 for the mips-linux target results in the following build error: $ make malta_defconfig $ make cc1: error: unrecognized command line option "-fno-stack-protector" scripts/kconfig/conf -s arch/mips/Kconfig cc1: error: unrecognized command line option "-fno-stack-protector" The arch Makefile is included too late so the host compiler is feature tested, not the crosscompiler as intended and thus the Makefile applies adds -fno-stack-protector to crosscompiler's flags which fails for gcc 3.4.6. The bug was introduced by e06b8b98da071f7dd78fb7822991694288047df0 in 2.6.25; 35bb5b1e0e84cfa1a8906f7e6a77f391ff315791 did add more flags testing before the arch Makefile inclusion. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-16Merge commit 'origin/master'Benjamin Herrenschmidt1-1/+14
Manual merge of: arch/powerpc/Kconfig arch/powerpc/kernel/stacktrace.c arch/powerpc/mm/slice.c arch/ppc/kernel/smp.c
2008-07-15Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-buildBenjamin Herrenschmidt1-0/+4
Manual fixup of: arch/powerpc/Kconfig
2008-07-15Merge commit 'gcl/gcl-next'Benjamin Herrenschmidt1-0/+1
2008-07-14Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6Linus Torvalds1-1/+14
* 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits) firmware: convert sb16_csp driver to use firmware loader exclusively dsp56k: use request_firmware edgeport-ti: use request_firmware() edgeport: use request_firmware() vicam: use request_firmware() dabusb: use request_firmware() cpia2: use request_firmware() ip2: use request_firmware() firmware: convert Ambassador ATM driver to request_firmware() whiteheat: use request_firmware() ti_usb_3410_5052: use request_firmware() emi62: use request_firmware() emi26: use request_firmware() keyspan_pda: use request_firmware() keyspan: use request_firmware() ttusb-budget: use request_firmware() kaweth: use request_firmware() smctr: use request_firmware() firmware: convert ymfpci driver to use firmware loader exclusively firmware: convert maestro3 driver to use firmware loader exclusively ... Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and drivers/char/ip2/ip2main.c manually.
2008-07-14Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gitDavid Woodhouse1-1/+14
Conflicts: sound/pci/Kconfig
2008-07-14Merge branch 'auto-ftrace-next' into tracing/for-linusIngo Molnar1-0/+4
Conflicts: arch/x86/kernel/entry_32.S arch/x86/kernel/process_32.c arch/x86/kernel/process_64.c arch/x86/lib/Makefile include/asm-x86/irqflags.h kernel/Makefile kernel/sched.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-13Linux 2.6.26v2.6.26Linus Torvalds1-1/+1
2008-07-12powerpc/mpc5121: Add clock driverJohn Rigby1-0/+1
Plugs into the generic powerpc clock driver in arch/powerpc/kernel/clock.c The following subset of clk_interface is implemented: clk_get, clk_put: get clock via name, release clock clk_enable, clk_disable: enable or disable clock clk_get_rate: get clock rate in Hz clk_set_rate: stubbed clk_round_rate: stubbed clk_set_parent: NULL clk_get_parent: NULL Signed-off-by: John Rigby <jrigby@freescale.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2008-07-10firmware: Add firmware installation to modules_install, add firmware_installDavid Woodhouse1-0/+13
For 'make modules_install', install any firmware required by the modules which are being installed. Also add a 'make firmware_install' target which doesn't depend on the configuration, but installs _all_ available in-kernel-tree firmware into $(INSTALL_FW_PATH), which defaults to /lib/firmware. This is intended for distributors to make arch-independent (and config-independent) packages containing firmware. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2008-07-10firmware: Add CONFIG_EXTRA_FIRMWARE optionDavid Woodhouse1-1/+1
This allows arbitrary firmware files to be included in the static kernel where the firmware loader can find them without requiring userspace to be alive. (Updated and CONFIG_EXTRA_FIRMWARE_DIR added with lots of help from Johannes Berg). Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
2008-07-10Merge branch 'tracing/ftrace' into auto-ftrace-nextIngo Molnar1-0/+4
2008-07-05Linux 2.6.26-rc9v2.6.26-rc9Linus Torvalds1-1/+1
2008-06-25Merge branch 'linus' into tracing/ftraceIngo Molnar1-1/+1
2008-06-24Linux 2.6.26-rc8v2.6.26-rc8Linus Torvalds1-1/+1
2008-06-23Merge branch 'linus' into tracing/ftraceIngo Molnar1-1/+1
2008-06-20Linux 2.6.26-rc7v2.6.26-rc7Linus Torvalds1-1/+1
2008-06-16Merge branch 'linus' into tracing/ftraceIngo Molnar1-2/+2
2008-06-12Linux 2.6.26-rc6v2.6.26-rc6Linus Torvalds1-2/+2
.. and a new name, courtesy of Alan.
2008-06-04Linux 2.6.26-rc5v2.6.26-rc5Linus Torvalds1-1/+1
2008-05-26Linux 2.6.26-rc4v2.6.26-rc4Linus Torvalds1-1/+1
2008-05-23ftrace: add basic support for gcc profiler instrumentationArnaldo Carvalho de Melo1-0/+4
If CONFIG_FTRACE is selected and /proc/sys/kernel/ftrace_enabled is set to a non-zero value the ftrace routine will be called everytime we enter a kernel function that is not marked with the "notrace" attribute. The ftrace routine will then call a registered function if a function happens to be registered. [ This code has been highly hacked by Steven Rostedt and Ingo Molnar, so don't blame Arnaldo for all of this ;-) ] Update: It is now possible to register more than one ftrace function. If only one ftrace function is registered, that will be the function that ftrace calls directly. If more than one function is registered, then ftrace will call a function that will loop through the functions to call. Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-19Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixesLinus Torvalds1-1/+2
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: Don't clean bounds.h and asm-offsets.h kconfig: incorrect 'len' field initialisation ? kernel-doc: allow unnamed bit-fields kbuild: filter away debug symbols from kernel symbols Remove *.rej pattern from .gitignore MAINTAINERS: document names of new kbuild trees kbuild: disable modpost warnings for linkonce sections kbuild: escape meta characters in regular expression in make TAGS
2008-05-19Don't clean bounds.h and asm-offsets.hJan Blunck1-0/+1
Since 97965478a66fbdf0f4ad5e4ecc4828f0cb548a45 ("mm: Get rid of __ZONE_COUNT") mmzone.h includes bounds.h. Calling make clean after make prepare removes bounds.h again so when building external modules this fails. Signed-off-by: Jan Blunck <jblunck@suse.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> --
2008-05-18Linux 2.6.26-rc3v2.6.26-rc3Linus Torvalds1-1/+1
2008-05-11Linux 2.6.26-rc2v2.6.26-rc2Linus Torvalds1-1/+1
2008-05-11kbuild: escape meta characters in regular expression in make TAGSMasatake YAMATO1-1/+1
Alexey Dobriyan <adobriyan@gmail.com> introduced a code adds menuconfig SOMETHING in Kconfig to tags output when you did "make tags". See http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=80ff26241623875636674a31c0540a78c0fb5433 "make tags" may work fine with his code. However make TAGS doesn't work well because etags command requires backslashes to escape meta characters like `(', `)' and `|'. Here is a patch. Signed-off-by: Masatake YAMATO <yamato@redhat.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-05-03Linux 2.6.26-rc1v2.6.26-rc1Linus Torvalds1-2/+2
2008-05-01kbuild: fix vmlinux.o linkSam Ravnborg1-2/+4
We always linked vmliux.o. Remove init/built-in.o dependency so we avoid this Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-04-28kbuild: fix help output to show correct archAndres Salomon1-2/+2
Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-04-28kbuild: show defconfig subdirs in make helpSegher Boessenkool1-1/+22
PowerPC will start moving board defconfigs into subarch-specific subdirs soon. "make help" currently does not look in subdirs to find the defconfigs to show. This is partially a good thing, since there are way too many defconfigs for one list. This patch makes the main "make help" display something like help-40x - Show 40x-specific targets help-44x - Show 44x-specific targets help-boards - Show all of the above and wires up stuff so those new help-* commands actually work. [sam: fixed it up to display x86 defconfigs too] Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com> Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-04-25kbuild: fix depmod commentUwe Kleine-König1-1/+0
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> Cc: trivial@kernel.org Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-04-25Add option to enable -Wframe-larger-than= on gcc 4.4Andi Kleen1-0/+4
Add option to enable -Wframe-larger-than= on gcc 4.4 gcc mainline (upcoming 4.4) added a new -Wframe-larger-than=... option to warn at build time about too large stack frames. Add a config option to enable this warning, since this very useful for the kernel. I choose (somewhat arbitarily) 2048 as default warning threshold for 64bit and 1024 as default for 32bit architectures. With some research and fixing all the code for smaller values these defaults should be probably lowered. With the default allyesconfigs have some new warnings, but I think that is all code that should be just fixed. At some point (when gcc 4.4 is released and widely used) this should obsolete make checkstack Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-04-25kbuild: add kconfig symbols to tags outputAlexey Dobriyan1-2/+2
Steps to reproduce: vi -t NETFILTER Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-04-24Remove -numa from EXTRAVERSIONSebastian Siewior1-1/+1
This snuck in through 919ee677b656c52c5f86d3d916786891220d5452 ("[SPARC64]: Add NUMA support") Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-04-23[SPARC64]: Add NUMA support.David S. Miller1-1/+1
Currently there is only code to parse NUMA attributes on sun4v/niagara systems, but later on we will add such parsing for older systems. Signed-off-by: David S. Miller <davem@davemloft.net>
2008-04-21fix typo "is" -> "if" in MakefileUwe Kleine-König1-1/+1
It should be "if" but is written as "is".. Signed-off-by: Uwe Kleine-Koenig <Uwe.Kleine-Koenig@digi.com> Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
2008-04-16Linux 2.6.25v2.6.25Linus Torvalds1-1/+1
2008-04-11Linux 2.6.25-rc9v2.6.25-rc9Linus Torvalds1-1/+1
2008-04-01Linux 2.6.25-rc8v2.6.25-rc8Linus Torvalds1-1/+1
2008-03-25Linux 2.6.25-rc7v2.6.25-rc7Linus Torvalds1-1/+1
2008-03-23kbuild: soften modpost checks when doing cross buildsSam Ravnborg1-1/+1
The module alias support in the kernel have a consistency check where it is checked that the size of a structure in the kernel and on the build host are the same. For cross builds this check does not make sense so detect when we do cross builds and silently skip the check in these situations. This fixes a build bug for a wireless driver when cross building for arm. Acked-by: Michael Buesch <mb@bu3sch.de> Tested-by: Gordon Farquharson <gordonfarquharson@gmail.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: stable@kernel.org
2008-03-16Linux 2.6.25-rc6v2.6.25-rc6Linus Torvalds1-1/+1
2008-03-09Linux 2.6.25-rc5v2.6.25-rc5Linus Torvalds1-1/+1
2008-03-04Linux 2.6.25-rc4v2.6.25-rc4Linus Torvalds1-1/+1
2008-02-24Linux 2.6.25-rc3v2.6.25-rc3Linus Torvalds1-1/+1
2008-02-18Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuildLinus Torvalds1-4/+7
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: explain why DEBUG_SECTION_MISMATCH is UNDEFINED kbuild: fix building vmlinux.o kbuild: allow -fstack-protector to take effect kconfig: fix select in combination with default
2008-02-15Linux 2.6.25-rc2v2.6.25-rc2Linus Torvalds1-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:18:16 +0000