summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-12-301-1/+2
|\
| * x86: unify pci iommu setup and allow swiotlb to compile for 32 bitJeremy Fitzhardinge2008-12-171-1/+2
* | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-281-0/+1
|\ \
| * | tracing/function-graph-tracer: introduce __notrace_funcgraph to filter specia...Frederic Weisbecker2008-12-081-6/+0
| | |
| | \
| *-. \ Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftraceIngo Molnar2008-12-031-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | tracing/function-graph-tracer: support for x86-64Frederic Weisbecker2008-12-021-0/+1
| * | | tracing/function-return-tracer: change the name into function-graph-tracerFrederic Weisbecker2008-11-261-2/+2
| | | |
| | \ \
| *-. \ \ Merge branches 'tracing/core', 'x86/urgent' and 'x86/ptrace' into tracing/hw-...Ingo Molnar2008-11-251-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | tracing, x86: add low level support for ftrace return tracingFrederic Weisbecker2008-11-111-0/+6
| | |/ / | |/| |
| | | |
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
*---------. \ \ \ Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump',...Ingo Molnar2008-12-231-2/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | / | | | | |_|_|/ | | | |/| | |
| | | | | | * x86: signal: unify signal_{32|64}.cHiroshi Shimamoto2008-11-261-1/+1
| | | | | |/
| | | | * | Merge branch 'linus' into x86/memory-corruption-checkIngo Molnar2008-11-201-1/+2
| | | | |\ \ | | |_|_|/ / | |/| | | |
| | | | * | x86: corruption-check: some post-move cleanupsArjan van de Ven2008-10-271-1/+2
| | | | * | x86: corruption check: move the corruption checks into their own fileArjan van de Ven2008-10-271-0/+1
| | | | |/
| | | * / x86: unify appropriate bits from dumpstack_32 and dumpstack_64Neil Horman2008-10-271-1/+1
| | | |/
| | * / x86 debug: mark early_printk.o as notraceIngo Molnar2008-11-041-0/+1
| |/ /
* / / x86, bts: exclude ds.c from build when disabledMarkus Metzger2008-11-251-1/+1
|/ /
* | ftrace, powerpc, sparc64, x86: remove notrace from arch ftrace fileSteven Rostedt2008-10-231-0/+1
* | Merge branch 'tracing/ftrace' into tracing/urgentIngo Molnar2008-10-221-1/+1
|\ \ | |/ |/|
| * ftrace: rename FTRACE to FUNCTION_TRACERSteven Rostedt2008-10-201-1/+1
* | x86: unify show_interrupts() and proc helpersThomas Gleixner2008-10-161-1/+1
* | x86: Add sysfs entries for UV v4Russ Anderson2008-10-161-1/+1
* | x86, UV: add uv_setup_irq() and uv_teardown_irq() functions, v3Dean Nelson2008-10-161-1/+1
* | x86: rename apic_32.c and apic_64.c to apic.cYinghai Lu2008-10-161-1/+1
* | rename io_apic_64.c and io_apic_32.c to io_apic.cYinghai Lu2008-10-161-1/+1
|/
* traps: x86: finalize unification of traps.cAlexander van Heukelum2008-10-131-1/+1
* x86_64: split out dumpstack code from traps_64.cAlexander van Heukelum2008-10-131-2/+2
* i386: split out dumpstack code from traps_32.cAlexander van Heukelum2008-10-131-1/+1
*-----. Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x...Ingo Molnar2008-10-121-3/+7
|\ \ \ \
| | | * | x86: moved microcode.c to microcode_intel.cDmitry Adamushko2008-09-231-3/+5
| | | * | x86: AMD microcode patch loading supportPeter Oruba2008-07-281-0/+1
| | | * | x86: major refactoringPeter Oruba2008-07-281-2/+2
| | | * | x86: code split to two partsPeter Oruba2008-07-281-1/+2
| | | * | x86: move microcode.c to microcode_intel.cPeter Oruba2008-07-281-1/+1
| | |/ /
| * | | Merge branch 'linus' into x86/xenIngo Molnar2008-10-121-1/+4
| |\ \ \ | |/ / / |/| | |
| * | | x86: split spinlock implementations out into their own filesJeremy Fitzhardinge2008-07-241-2/+2
| |/ /
* | | Merge branch 'x86/xsave' into x86/coreIngo Molnar2008-09-051-1/+1
|\ \ \
| * | | x86, xsave: enable xsave/xrstor on cpus with xsave supportSuresh Siddha2008-07-301-1/+1
* | | | x86: move dir es7000 to es7000_32.cYinghai Lu2008-09-041-0/+1
|/ / /
* | | Merge branch 'linus' into x86/x2apicIngo Molnar2008-07-221-1/+2
|\| |
| * | Merge branch 'x86/paravirt-spinlocks' into x86/for-linusIngo Molnar2008-07-211-1/+2
| |\ \
| | * \ Merge branch 'linus' into x86/paravirt-spinlocksIngo Molnar2008-07-181-2/+1
| | |\ \
| | * | | x86, paravirt-spinlocks: fix boot hangIngo Molnar2008-07-161-1/+2
* | | | | Merge branch 'x86/uv' into x86/x2apicIngo Molnar2008-07-181-0/+1
|\| | | |
| * | | | x86 BIOS interface for RTC on SGI UVRuss Anderson2008-07-181-0/+1
| | |/ / | |/| |
* | | | Merge branch 'linus' into x86/x2apicIngo Molnar2008-07-181-0/+7
|\| | |
| * | | ftrace: fix merge bugletIngo Molnar2008-07-171-2/+1
| |/ /
| * | Merge branch 'auto-ftrace-next' into tracing/for-linusIngo Molnar2008-07-141-0/+8
| |\ \
| | * \ Merge branch 'linus' into tracing/ftraceIngo Molnar2008-06-251-0/+1
| | |\ \
| | * | | ftrace: use the new kbuild CFLAGS_REMOVE for x86/kernel directorySteven Rostedt2008-05-231-0/+7