summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-12-302-6/+14
|\
| *---. Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.2...Ingo Molnar2008-12-259-42/+40
| |\ \ \
| | * | | sparseirq: fix typo in !CONFIG_IO_APIC caseIngo Molnar2008-12-081-5/+2
| | * | | x86: MSI start irq numbering from nr_irqs_gsiYinghai Lu2008-12-081-1/+1
| | * | | x86: use NR_IRQS_LEGACYYinghai Lu2008-12-081-0/+2
| | * | | sparse irq_desc[] array: core kernel and x86 changesYinghai Lu2008-12-081-0/+9
* | | | | Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-12-307-8/+15
|\ \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-----. \ \ \ \ Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/print...Ingo Molnar2008-12-254-4/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | / | | | | | | |_|/ | | | | | |/| |
| | | | * | | | Merge commit 'v2.6.28-rc7' into core/lockingIngo Molnar2008-12-049-23/+41
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | * | | | | x86: unify pci iommu setup and allow swiotlb to compile for 32 bitJeremy Fitzhardinge2008-12-173-2/+3
| | | * | | | | x86: remove unused iommu_nr_pagesJeremy Fitzhardinge2008-12-161-2/+0
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merge commit 'v2.6.28' into core/coreIngo Molnar2008-12-257-36/+26
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *---. \ \ \ \ \ Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'cor...Ingo Molnar2008-11-243-4/+12
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge branch 'linus' into core/lockingIngo Molnar2008-11-1219-48/+52
| | |\ \ \ \ \ \
| | * | | | | | | Merge commit 'v2.6.28-rc2' into core/lockingIngo Molnar2008-10-283-4/+12
* | | | | | | | | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6Linus Torvalds2008-12-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [S390] arch_setup_additional_pages argumentsMartin Schwidefsky2008-12-251-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-286-182/+257
|\ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| *-----. \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/rin...Ingo Molnar2008-12-253-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | * | | | | | | | | | x86, bts: add fork and exit handlingMarkus Metzger2008-12-202-0/+16
| | | |/ / / / / / / / /
| | * | | | | | | | | | tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3Frederic Weisbecker2008-12-251-1/+2
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'x86/tsc' into tracing/coreIngo Molnar2008-12-251-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'x86/cpufeature' into x86/tscIngo Molnar2008-12-161-1/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' i...Ingo Molnar2008-12-194-18/+22
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | x86: entry_64 - introduce FTRACE_ frame macro v2Cyrill Gorcunov2008-12-171-1/+28
| * | | | | | | | | | x86, bts: provide in-kernel branch-trace interfaceMarkus Metzger2008-12-124-142/+153
| * | | | | | | | | | Merge commit 'v2.6.28-rc7' into tracing/coreIngo Molnar2008-12-042-16/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | tracing/function-return-tracer: change the name into function-graph-tracerFrederic Weisbecker2008-11-261-2/+2
| * | | | | | | | | | x86, bts, ptrace: move BTS buffer allocation from ds.c into ptrace.cMarkus Metzger2008-11-251-8/+4
| * | | | | | | | | | x86, bts: base in-kernel ds interface on handlesMarkus Metzger2008-11-251-67/+57
| | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ Merge branches 'tracing/core', 'x86/urgent' and 'x86/ptrace' into tracing/hw-...Ingo Molnar2008-11-251-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| * | | | | | | | | | | tracing/function-return-tracer: store return stack into task_struct and alloc...Frederic Weisbecker2008-11-232-30/+0
| | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \
| *---. \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/profiling', 'tracing/options' and 'tracing/urgent' in...Ingo Molnar2008-11-235-3/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | tracing/function-return-tracer: add the overrun fieldFrederic Weisbecker2008-11-181-0/+7
| * | | | | | | | | | | | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-192-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | ftrace: pass module struct to arch dynamic ftrace functionsSteven Rostedt2008-11-161-0/+8
| * | | | | | | | | | | | tracing, x86: add low level support for ftrace return tracingFrederic Weisbecker2008-11-112-0/+50
| * | | | | | | | | | | | Merge branch 'tracing/urgent' into tracing/ftraceIngo Molnar2008-11-115-20/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 't...Ingo Molnar2008-11-084-24/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | ftrace: fix hardirq header for non ftrace archsSteven Rostedt2008-11-031-16/+0
| |/ / / / / / / / / / / / /
| | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tra...Ingo Molnar2008-11-031-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | ftrace: nmi safe code clean upsSteven Rostedt2008-10-311-5/+5
| | | * | | | | | | | | | | ftrace: nmi safe code modificationSteven Rostedt2008-10-301-0/+15
* | | | | | | | | | | | | | Merge branch 'x86/irq' into x86/coreIngo Molnar2008-12-235-34/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'x86/apic' into x86/irqIngo Molnar2008-12-231-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | x86: hardirq: introduce inc_irq_stat()Hiroshi Shimamoto2008-12-122-0/+4
| * | | | | | | | | | | | | | Merge commit 'v2.6.28-rc8' into x86/irqIngo Molnar2008-12-126-35/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'x86/debug' into x86/irqIngo Molnar2008-11-283-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | x86: introduce ENTRY(KPROBE_ENTRY)_X86 assembly helpers to catch unbalanced d...Cyrill Gorcunov2008-11-231-0/+60
| * | | | | | | | | | | | | | x86: move dwarf2 related macro to dwarf2.hCyrill Gorcunov2008-11-231-31/+66
OpenPOWER on IntegriCloud