path: root/Makefile
AgeCommit message (Collapse)Author
2012-09-08Linux 3.6-rc5v3.6-rc5Linus Torvalds
2012-09-01Linux 3.6-rc4v3.6-rc4Linus Torvalds
2012-08-22Linux 3.6-rc3v3.6-rc3Linus Torvalds
2012-08-16Linux 3.6-rc2v3.6-rc2Linus Torvalds
2012-08-02Linux 3.6-rc1v3.6-rc1Linus Torvalds
2012-07-30Merge branch 'kbuild' of ↵Linus Torvalds
git:// Pull kbuild fix from Michal Marek: "The main kbuild branch ended up with a single commit this time, a fix to send errors to stderr" * 'kbuild' of git:// kbuild: Print errors to stderr
2012-07-21Linux 3.5v3.5Linus Torvalds
2012-07-14Linux 3.5-rc7v3.5-rc7Linus Torvalds
2012-07-07Linux 3.5-rc6v3.5-rc6Linus Torvalds
2012-07-07kbuild: Print errors to stderrMichal Marek
... at least in the top-level Makefile and scripts/ There are some more instances of the 'echo <error>; exit 1' pattern in some arch Makefiles and kconfig. Reported-by: Linus Torvalds <> Signed-off-by: Michal Marek <>
2012-06-30Linux 3.5-rc5v3.5-rc5Linus Torvalds
2012-06-24Linux 3.5-rc4v3.5-rc4Linus Torvalds
2012-06-18Makefile: fix up CROSS_COMPILE and READABLE_ASM interaction.Paul Mundt
When the READABLE_ASM cc-option tests were added they were done so prior to the arch Makefile include, resulting in cc-option being run on the host cc instead of the factoring in the cross prefix set up by the architecture. This bumps the include back up so that cc-option actually runs on the compiler that we're building with. Cc: Andi Kleen <> Signed-off-by: Paul Mundt <> Signed-off-by: Linus Torvalds <>
2012-06-16Linux 3.5-rc3v3.5-rc3Linus Torvalds
2012-06-08Linux 3.5-rc2v3.5-rc2Linus Torvalds
2012-06-02Linux 3.5-rc1v3.5-rc1Linus Torvalds
2012-05-28Merge branch 'kbuild' of ↵Linus Torvalds
git:// Pull kbuild updates from Michal Marek. Fixed up nontrivial merge conflict in Makefile as per Stephen Rothwell and linux-next (and trivial arch/sparc/Makefile changes due to removed sparc32 logic). * 'kbuild' of git:// mips: Fix KBUILD_CPPFLAGS definition kbuild: fix ia64 link kbuild: document KBUILD_LDS, KBUILD_VMLINUX_{INIT,MAIN} and LDFLAGS_vmlinux kbuild: link of vmlinux moved to a script kbuild: refactor final link of sparc32 kbuild: drop unused KBUILD_VMLINUX_OBJS from top-level Makefile kbuild: Makefile: remove unnecessary check for m68knommu ARCH
2012-05-23Merge branch 'x86-extable-for-linus' of ↵Linus Torvalds
git:// Pull exception table generation updates from Ingo Molnar: "The biggest change here is to allow the build-time sorting of the exception table, to speed up booting. This is achieved by the architecture enabling BUILDTIME_EXTABLE_SORT. This option is enabled for x86 and MIPS currently. On x86 a number of fixes and changes were needed to allow build-time sorting of the exception table, in particular a relocation invariant exception table format was needed. This required the abstracting out of exception table protocol and the removal of 20 years of accumulated assumptions about the x86 exception table format. While at it, this tree also cleans up various other aspects of exception handling, such as early(er) exception handling for rdmsr_safe() et al. All in one, as the result of these changes the x86 exception code is now pretty nice and modern. As an added bonus any regressions in this code will be early and violent crashes, so if you see any of those, you'll know whom to blame!" Fix up trivial conflicts in arch/{mips,x86}/Kconfig files due to nearby modifications of other core architecture options. * 'x86-extable-for-linus' of git:// (35 commits) Revert "x86, extable: Disable presorted exception table for now" scripts/sortextable: Handle relative entries, and other cleanups x86, extable: Switch to relative exception table entries x86, extable: Disable presorted exception table for now x86, extable: Add _ASM_EXTABLE_EX() macro x86, extable: Remove open-coded exception table entries in arch/x86/ia32/ia32entry.S x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/xsave.h x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/kvm_host.h x86, extable: Remove the now-unused __ASM_EX_SEC macros x86, extable: Remove open-coded exception table entries in arch/x86/xen/xen-asm_32.S x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S x86, extable: Remove open-coded exception table entries in arch/x86/lib/usercopy_32.c x86, extable: Remove open-coded exception table entries in arch/x86/lib/putuser.S x86, extable: Remove open-coded exception table entries in arch/x86/lib/getuser.S x86, extable: Remove open-coded exception table entries in arch/x86/lib/csum-copy_64.S x86, extable: Remove open-coded exception table entries in arch/x86/lib/copy_user_nocache_64.S x86, extable: Remove open-coded exception table entries in arch/x86/lib/copy_user_64.S x86, extable: Remove open-coded exception table entries in arch/x86/lib/checksum_32.S x86, extable: Remove open-coded exception table entries in arch/x86/kernel/test_rodata.c x86, extable: Remove open-coded exception table entries in arch/x86/kernel/entry_64.S ...
2012-05-23Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', ↵Linus Torvalds
'x86-cpu-for-linus', 'x86-debug-for-linus' and 'x86-microcode-for-linus' of git:// Pull initial trivial x86 stuff from Ingo Molnar. Various random cleanups and trivial fixes. * 'x86-asm-for-linus' of git:// x86-64: Eliminate dead ia32 syscall handlers * 'x86-cleanups-for-linus' of git:// x86/pci-calgary_64.c: Remove obsoleted simple_strtoul() usage x86: Don't continue booting if we can't load the specified initrd x86: kernel/dumpstack.c simple_strtoul cleanup x86: kernel/check.c simple_strtoul cleanup debug: Add CONFIG_READABLE_ASM x86: spinlock.h: Remove REG_PTR_MODE * 'x86-cpu-for-linus' of git:// x86/cache_info: Fix setup of l2/l3 ids * 'x86-debug-for-linus' of git:// x86: Avoid double stack traces with show_regs() * 'x86-microcode-for-linus' of git:// x86, microcode: microcode_core.c simple_strtoul cleanup
2012-05-22Merge branch 'for-linus' of ↵Linus Torvalds
git:// Pull trivial updates from Jiri Kosina: "As usual, it's mostly typo fixes, redundant code elimination and some documentation updates." * 'for-linus' of git:// (57 commits) edac, mips: don't change code that has been removed in edac/mips tree xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer lib: Change mail address of Oskar Schirmer net: Change mail address of Oskar Schirmer arm/m68k: Change mail address of Sebastian Hess i2c: Change mail address of Oskar Schirmer net: Fix tcp_build_and_update_options comment in struct tcp_sock atomic64_32.h: fix parameter naming mismatch Kconfig: replace "--- help ---" with "---help---" c2port: fix bogus Kconfig "default no" edac: Fix spelling errors. qla1280: Remove redundant NULL check before release_firmware() call remoteproc: remove redundant NULL check before release_firmware() qla2xxx: Remove redundant NULL check before release_firmware() call. aic94xx: Get rid of redundant NULL check before release_firmware() call tehuti: delete redundant NULL check before release_firmware() qlogic: get rid of a redundant test for NULL before call to release_firmware() bna: remove redundant NULL test before release_firmware() tg3: remove redundant NULL test before release_firmware() call typhoon: get rid of redundant conditional before all to release_firmware() ...
2012-05-22Merge branch 'perf-core-for-linus' of ↵Linus Torvalds
git:// Pull perf changes from Ingo Molnar: "Lots of changes: - (much) improved assembly annotation support in perf report, with jump visualization, searching, navigation, visual output improvements and more. - kernel support for AMD IBS PMU hardware features. Notably 'perf record -e cycles:p' and 'perf top -e cycles:p' should work without skid now, like PEBS does on the Intel side, because it takes advantage of IBS transparently. - the libtracevents library: it is the first step towards unifying tracing tooling and perf, and it also gives a tracing library for external tools like powertop to rely on. - infrastructure: various improvements and refactoring of the UI modules and related code - infrastructure: cleanup and simplification of the profiling targets code (--uid, --pid, --tid, --cpu, --all-cpus, etc.) - tons of robustness fixes all around - various ftrace updates: speedups, cleanups, robustness improvements. - typing 'make' in tools/ will now give you a menu of projects to build and a short help text to explain what each does. - ... and lots of other changes I forgot to list. The perf record make bzImage + perf report regression you reported should be fixed." * 'perf-core-for-linus' of git:// (166 commits) tracing: Remove kernel_lock annotations tracing: Fix initial buffer_size_kb state ring-buffer: Merge separate resize loops perf evsel: Create events initially disabled -- again perf tools: Split term type into value type and term type perf hists: Fix callchain ip printf format perf target: Add uses_mmap field ftrace: Remove selecting FRAME_POINTER with FUNCTION_TRACER ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code() ftrace: Make ftrace_modify_all_code() global for archs to use ftrace: Return record ip addr for ftrace_location() ftrace: Consolidate ftrace_location() and ftrace_text_reserved() ftrace: Speed up search by skipping pages by address ftrace: Remove extra helper functions ftrace: Sort all function addresses, not just per page tracing: change CPU ring buffer state from tracing_cpumask tracing: Check return value of tracing_dentry_percpu() ring-buffer: Reset head page before running self test ring-buffer: Add integrity check at end of iter read ring-buffer: Make addition of pages in ring buffer atomic ...
2012-05-20Linux 3.4v3.4Linus Torvalds
2012-05-18x86, realmode: 16-bit real-mode code support for relocs toolH. Peter Anvin
A new option is added to the relocs tool called '--realmode'. This option causes the generation of 16-bit segment relocations and 32-bit linear relocations for the real-mode code. When the real-mode code is moved to the low-memory during kernel initialization, these relocation entries can be used to relocate the code properly. In the assembly code 16-bit segment relocations must be relative to the 'real_mode_seg' absolute symbol. Linear relocations must be relative to a symbol prefixed with 'pa_'. 16-bit segment relocation is used to load cs:ip in 16-bit code. Linear relocations are used in the 32-bit code for relocatable data references. They are declared in the linker script of the real-mode code. The relocs tool is moved to arch/x86/tools/relocs.c, and added new target archscripts that can be used to build scripts needed building an architecture. be compiled before building the arch/x86 tree. [ hpa: accelerating this because it detects invalid absolute relocations, a serious bug in binutils which currently produces bad kernels. ] Signed-off-by: H. Peter Anvin <> Link: Signed-off-by: Jarkko Sakkinen <> Signed-off-by: H. Peter Anvin <> Cc: <>
2012-05-18Merge remote-tracking branch 'tip/perf/urgent' into perf/coreArnaldo Carvalho de Melo
Merge reason: We are going to queue up a dependent patch: "perf tools: Move parse event automated tests to separated object" That depends on: commit e7c72d8 perf tools: Add 'G' and 'H' modifiers to event parsing Conflicts: tools/perf/builtin-stat.c Conflicted with the recent 'perf_target' patches when checking the result of perf_evsel open routines to see if a retry is needed to cope with older kernels where the exclude guest/host perf_event_attr bits were not used. Signed-off-by: Arnaldo Carvalho de Melo <>
2012-05-12Linux 3.4-rc7v3.4-rc7Linus Torvalds
.. and this should hopefully be the last -rc before final 3.4 release.
2012-05-06Linux 3.4-rc6v3.4-rc6Linus Torvalds
2012-05-05kbuild: link of vmlinux moved to a scriptSam Ravnborg
Move the final link of vmlinux to a script to improve readability and maintainability of the code. The Makefile fragments used to link vmlinux has over the years seen far too many changes and the logic had become hard to follow. As the process by nature is serialized there was nothing gained including this in the Makefile. "um" has special link requirments - and the only way to handle this was to hard-code the linking of "um" in the script. This was better than trying to modularize it only for the benefit of "um" anyway. The shell script has been improved after input from: Arnaud Lacombe <> Nick Bowler <> Signed-off-by: Sam Ravnborg <> Cc: Arnaud Lacombe <> Cc: Nick Bowler <> Cc: Richard Weinberger <> Signed-off-by: Michal Marek <>
2012-05-05kbuild: refactor final link of sparc32Sam Ravnborg
sparc32 uses an additional final link to support btfix. Introduce a new set of exported variables in the top-level Makefile to make the extra linking step simpler. sparc32 has hardcoded knowledge of kallsyms support. This fix include support for EXTRA_KALLSYM_PASS=1. The ugly part is that it is hardcoded in the arch/sparc/boot Makefile. Signed-off-by: Sam Ravnborg <> Cc: "David S. Miller" <> Signed-off-by: Michal Marek <>
2012-05-05kbuild: drop unused KBUILD_VMLINUX_OBJS from top-level MakefileSam Ravnborg
Signed-off-by: Sam Ravnborg <> Signed-off-by: Michal Marek <>
2012-05-05kbuild: Makefile: remove unnecessary check for m68knommu ARCHEdward Shao
ARCH is never set to m68knomm. make ARCH=m68knomm is not supported anymore. Signed-off-by: Edward Shao <> Acked-by: Sam Ravnborg <> Acked-by: Geert Uytterhoeven <> Acked-by: Greg Ungerer <> Signed-off-by: Michal Marek <>
2012-04-29Linux 3.4-rc5v3.4-rc5Linus Torvalds
2012-04-25Merge tag 'v3.4-rc4' into perf/coreIngo Molnar
Merge v3.4-rc4 - we were on -rc2 before. Signed-off-by: Ingo Molnar <>
2012-04-21Linux 3.4-rc4v3.4-rc4Linus Torvalds
2012-04-19kbuild/extable: Hook up sortextable into the build system.David Daney
Define a config variable BUILDTIME_EXTABLE_SORT to control build time sorting of the kernel's exception table. Patch Makefile to do the sorting when BUILDTIME_EXTABLE_SORT is selected. Signed-off-by: David Daney <> Link: Signed-off-by: H. Peter Anvin <>
2012-04-15Linux 3.4-rc3v3.4-rc3Linus Torvalds
2012-04-13Merge tag 'v3.4-rc2' into perf/coreIngo Molnar
Merge Linux 3.4-rc2: we were on v3.3, update the base. Signed-off-by: Ingo Molnar <>
2012-04-11tools: Connect to the kernel build systemBorislav Petkov
Now you can do $ make tools/<toolname> from the toplevel kernel directory and have the respective tool built. If you want to build and install it, do $ make tools/<toolname>_install $ make tools/<toolname>_clean should clean the respective tool directories. If you want to clean all in tools, simply do $ make tools/clean Also, if you want to get what the possible targets are, simply calling $ make tools/ should give you the short help. $ make tools/install installs all tools, of course. Doh. Signed-off-by: Borislav Petkov <> Cc: Ingo Molnar <> Cc: Michal Marek <> Cc: Sam Ravnborg <> Link: Signed-off-by: Arnaldo Carvalho de Melo <>
2012-04-08Merge branch 'master' into for-nextJiri Kosina
Merge with latest Linus' tree, as I have incoming patches that fix code that is newer than current HEAD of for-next. Conflicts: drivers/net/ethernet/realtek/r8169.c
2012-04-07Linux 3.4-rc2v3.4-rc2Linus Torvalds
2012-04-05Makefile: improve line wrappingJesper Juhl
Break a few lines that go way over the usual 80 column limit that we prefer. Also adjust the placement of a few line continuations. Signed-off-by: Jesper Juhl <> Signed-off-by: Jiri Kosina <>
2012-03-31Linux 3.4-rc1v3.4-rc1Linus Torvalds
2012-03-30Merge branch 'kbuild' of ↵Linus Torvalds
git:// Pull kbuild changes from Michal Marek: - Unification of cmd_uimage among archs that use it - make headers_check tries harder before reporting a missing <linux/types.h> include - kbuild portability fix for shells that do not support echo -e - make clean descends into samples/ - setlocalversion grep fix - modpost typo fix - dtc warnings fix * 'kbuild' of git:// setlocalversion: Use "grep -q" instead of piping output to "read dummy" modpost: fix ALL_INIT_DATA_SECTIONS Kbuild: centralize MKIMAGE and cmd_uimage definitions headers_check: recursively search for linux/types.h inclusion scripts/Kbuild.include: Fix portability problem of "echo -e" scripts: dtc: fix compile warnings kbuild: clean up samples directory kbuild: disable -Wmissing-field-initializers for W=1
2012-03-30debug: Add CONFIG_READABLE_ASMAndi Kleen
Add a config option to disable various gcc compiler optimizations that make assembler listings much harder to read. This is everything that reorders code significantly or creates partial functions. This is mainly to keep kernel hackers sane. Signed-off-by: Andi Kleen <> Link: Signed-off-by: H. Peter Anvin <>
2012-03-18Linux 3.3v3.3Linus Torvalds
2012-03-10Linux 3.3-rc7v3.3-rc7Linus Torvalds
2012-03-03Linux 3.3-rc6v3.3-rc6Linus Torvalds
2012-02-25Linux 3.3-rc5v3.3-rc5Linus Torvalds
2012-02-25kbuild: clean up samples directoryGerard Snitselaar
Playing around with make randconfig I ended up with CONFIG_SAMPLES set. After cleaning up the build I noticed that git status was showing samples/hidraw/hid-example as an untracked file. Adding samples to clean-dirs seems to solve the problem, but I don't know if that is the correct way to solve the issue. Signed-off-by: Gerard Snitselaar <> Signed-off-by: Michal Marek <>
2012-02-18Linux 3.3-rc4v3.3-rc4Linus Torvalds
2012-02-08Linux 3.3-rc3v3.3-rc3Linus Torvalds