summaryrefslogtreecommitdiffstats
path: root/arch/x86
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/function...Ingo Molnar2008-11-132-43/+6
|\ \ \
| | * | tracing/function-return-tracer: call prepare_ftrace_return by registersFrederic Weisbecker2008-11-122-5/+1
| | * | tracing/function-return-tracer: make the function return tracer locklessFrederic Weisbecker2008-11-121-38/+5
| |/ /
* | | trace: rename unlikely profiler to branch profilerSteven Rostedt2008-11-122-2/+2
* | | tracing: branch tracer, fix vdso crashIngo Molnar2008-11-122-7/+5
* | | tracing: profile likely and unlikely annotationsSteven Rostedt2008-11-121-0/+8
|/ /
* | Merge branch 'tracing/function-return-tracer' into tracing/fastbootIngo Molnar2008-11-126-7/+265
|\ \
| * | tracing: function return tracer, build fixIngo Molnar2008-11-111-0/+1
| * | tracing, x86: function return tracer, fix assembly constraintsIngo Molnar2008-11-111-1/+1
| * | tracing, x86: clean up FUNCTION_RET_TRACER KconfigIngo Molnar2008-11-111-1/+1
| * | tracing, x86: add low level support for ftrace return tracingFrederic Weisbecker2008-11-116-7/+264
* | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-122-3/+3
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-11-111-2/+2
| |\
| | * x86: HPET: enter hpet_interrupt_handler with interrupts disabledMatt Fleming2008-11-101-1/+1
| | * x86: HPET: read from HPET_Tn_CMP() not HPET_T0_CMPMatt Fleming2008-11-101-1/+1
| | * x86: HPET: convert WARN_ON to WARN_ON_ONCEMatt Fleming2008-11-101-1/+1
| * | x86: Make NUMA on 32-bit depend on BROKENRafael J. Wysocki2008-11-101-1/+1
| |/
* | Merge branch 'tracing/urgent' into tracing/ftraceIngo Molnar2008-11-1118-51/+66
|\ \ | |/
| * Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-11-083-4/+8
| |\
| | * sched: optimize sched_clock() a bitIngo Molnar2008-11-081-1/+1
| | * sched: improve sched_clock() performanceIngo Molnar2008-11-082-3/+7
| * | Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/...Ingo Molnar2008-11-071-5/+4
| |\ \
| | * | oprofile: Fix p6 counter overflow checkAndi Kleen2008-11-071-5/+4
| * | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-11-071-2/+2
| |\ \ \
| | * | | x86, xen: fix use of pgd_page now that it really does return a pageJeremy Fitzhardinge2008-11-061-2/+2
| * | | | xen: make sure stray alias mappings are gone before pinningJeremy Fitzhardinge2008-11-072-5/+9
| | |_|/ | |/| |
| * | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-11-0612-32/+39
| |\ \ \ | | |/ /
| | * | Revert "x86: default to reboot via ACPI"Eduardo Habkost2008-11-061-5/+1
| | * | x86: align DirectMap in /proc/meminfoHugh Dickins2008-11-061-4/+4
| | * | Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2008-11-061-2/+7
| | |\ \
| | | * | AMD IOMMU: fix lazy IO/TLB flushing in unmap pathJoerg Roedel2008-11-061-1/+6
| | | * | AMD IOMMU: fix detection of NP capable IOMMUsJoerg Roedel2008-10-301-1/+1
| | * | | x86: add smp_mb() before sending INVALIDATE_TLB_VECTORSuresh Siddha2008-11-062-0/+11
| | * | | x86: remove VISWS and PARAVIRT around NR_IRQS puzzleYinghai Lu2008-11-061-3/+3
| | * | | x86: mention ACPI in top-level Kconfig menuBjorn Helgaas2008-11-061-1/+1
| | * | | x86: size NR_IRQS on 32-bit systems the same way as 64-bitYinghai Lu2008-11-061-14/+6
| | * | | x86: don't allow nr_irqs > NR_IRQSBen Hutchings2008-11-061-0/+2
| | * | | x86: don't use tsc_khz to calculate lpj if notsc is passedAlok Kataria2008-11-041-4/+4
| | * | | x86, voyager: fix smp_intr_init() compile breakageJames Bottomley2008-11-033-2/+3
| * | | | sched: re-tune balancingIngo Molnar2008-11-051-3/+4
| | | | |
| \ \ \ \
*-. \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 't...Ingo Molnar2008-11-088-27/+70
|\ \ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2008-11-037-11/+70
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | io mapping: clean up #ifdefsKeith Packard2008-11-031-0/+4
| | | * | | x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmapsKeith Packard2008-10-316-11/+66
| * | | | | ftrace: fix hardirq header for non ftrace archsSteven Rostedt2008-11-031-16/+0
* | | | | | ftrace: add quick function trace stopSteven Rostedt2008-11-063-0/+12
|/ / / / /
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tra...Ingo Molnar2008-11-035-8/+145
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| | | * | | ftrace: nmi safe code clean upsSteven Rostedt2008-10-312-13/+13
| | | * | | ftrace: nmi update statisticsSteven Rostedt2008-10-301-2/+24
| | | * | | ftrace: nmi safe code modificationSteven Rostedt2008-10-302-1/+121
OpenPOWER on IntegriCloud