summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
Commit message (Expand)AuthorAgeFilesLines
* x86: enable cpus display of kernel_max and offlined cpusMike Travis2009-01-031-0/+2
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/...Mike Travis2009-01-0369-3322/+3151
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Rusty Russell2008-12-3112-268/+575
| |\
| | * Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-12-307-249/+527
| | |\
| | | *---. Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.2...Ingo Molnar2008-12-2526-370/+700
| | | |\ \ \
| | | | * | | sparseirq: fix numa_migrate_irq_desc dependency and commentsYinghai Lu2008-12-191-1/+1
| | * | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-12-302-3/+6
| | |\ \ \ \ \
| | | | \ \ \ \
| | | | \ \ \ \
| | | | \ \ \ \
| | | | \ \ \ \
| | | | \ \ \ \
| | | | \ \ \ \
| | | *-----. \ \ \ \ Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timer...Ingo Molnar2008-12-252-3/+6
| | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | | | * | | | | x86: make sure we really have an hpet mapping before using itJeremy Fitzhardinge2008-12-161-2/+3
| | | | | * | | | | x86: enable HPET on Fujitsu u9200Janne Kulmala2008-12-162-1/+3
| | | | | |/ / / /
| | * | | | | | | Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-12-303-10/+35
| | |\ \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | | \ \ \ \ \ \
| | | *-----. \ \ \ \ \ \ Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/print...Ingo Molnar2008-12-253-10/+35
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | / / / / | | | | | |_|_|_|/ / / / | | | | |/| | | | | | / | | | | | | | |_|_|_|/ | | | | | | |/| | | |
| | | | | * | | | | | x86/swiotlb: add default swiotlb_arch_range_needs_mappingIan Campbell2008-12-171-0/+5
| | | | | * | | | | | x86/swiotlb: add default phys<->bus conversionIan Campbell2008-12-171-0/+10
| | | | | * | | | | | x86: unify pci iommu setup and allow swiotlb to compile for 32 bitJeremy Fitzhardinge2008-12-173-3/+8
| | | | | * | | | | | x86: add swiotlb allocation functionsJeremy Fitzhardinge2008-12-171-0/+12
| | | | | * | | | | | x86: remove unused iommu_nr_pagesJeremy Fitzhardinge2008-12-161-7/+0
| | | | | | |_|/ / / | | | | | |/| | | |
| * | | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Rusty Russell2008-12-3083-4356/+4603
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-2823-923/+1465
| | |\ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | *-----. \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/rin...Ingo Molnar2008-12-2512-57/+138
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / /
| | | | | * | | | | | | | | Merge branch 'linus' into tracing/hw-branch-tracingIngo Molnar2008-12-246-14/+30
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / | | | | | | |/| | | | | | |
| | | | | * | | | | | | | | x86, bts: memory accountingMarkus Metzger2008-12-201-11/+34
| | | | | * | | | | | | | | x86, bts: add fork and exit handlingMarkus Metzger2008-12-204-32/+69
| | | | | | |/ / / / / / / | | | | | |/| | | | | | |
| | | | * | | | | | | | | tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3Frederic Weisbecker2008-12-252-1/+6
| | | | |/ / / / / / / /
| | | * | | | | | | | | Merge branch 'x86/tsc' into tracing/coreIngo Molnar2008-12-254-4/+33
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' i...Ingo Molnar2008-12-197-41/+46
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | * | | | | | | | | Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/...Ingo Molnar2008-12-181-33/+28
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | x86, bts: correctly report invalid bts recordsMarkus Metzger2008-12-161-0/+3
| | | | * | | | | | | | | x86, bts: remove recursion from get_contextMarkus Metzger2008-12-161-33/+25
| | | * | | | | | | | | | x86: entry_64 - introduce FTRACE_ frame macro v2Cyrill Gorcunov2008-12-171-50/+7
| | | |/ / / / / / / / /
| | | | | | | | | | | |
| | | | \ \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ \ Merge branches 'tracing/fastboot', 'tracing/ftrace', 'tracing/function-graph-...Ingo Molnar2008-12-169-731/+664
| | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | x86, bts: fix build errorIngo Molnar2008-12-121-1/+1
| | | | | * | | | | | | | | x86, bts: provide in-kernel branch-trace interfaceMarkus Metzger2008-12-125-729/+657
| | | | | * | | | | | | | | x86, bts: turn BUG_ON into WARN_ON_ONCEMarkus Metzger2008-12-122-4/+5
| | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | tracing/function-graph-tracer: add a new .irqentry.text section, fixIngo Molnar2008-12-121-0/+1
| | | | * | | | | | | | | tracing/function-graph-tracer: annotate do_IRQ and smp_apic_timer_interruptFrederic Weisbecker2008-12-122-2/+4
| | | | * | | | | | | | | tracing/function-graph-tracer: add a new .irqentry.text sectionFrederic Weisbecker2008-12-121-0/+1
| | | |/ / / / / / / / /
| | | | | | | | | | | |
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | *---. \ \ \ \ \ \ \ \ \ Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/coreIngo Molnar2008-12-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | / / / / / / | | | | | | |_|/ / / / / / | | | | | |/| | | | | | |
| | | | * | | | | | | | | x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32Jaswinder Singh2008-12-251-1/+1
| | * | | | | | | | | | | Merge branch 'x86/irq' into x86/coreIngo Molnar2008-12-2313-903/+921
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'x86/apic' into x86/irqIngo Molnar2008-12-235-88/+106
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | x86: hardirq: use inc_irq_stat() in non-unified functionsHiroshi Shimamoto2008-12-166-6/+6
| | | * | | | | | | | | | | | x86: hardirq: introduce inc_irq_stat()Hiroshi Shimamoto2008-12-123-30/+7
| | | * | | | | | | | | | | | Merge commit 'v2.6.28-rc8' into x86/irqIngo Molnar2008-12-1214-103/+137
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | x86: ret_from_fork - get rid of jump backIngo Molnar2008-11-281-15/+16
| | | * | | | | | | | | | | | Merge branch 'x86/debug' into x86/irqIngo Molnar2008-11-2810-18/+46
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | x86: entry_64.S - trivial: space, comments fixupCyrill Gorcunov2008-11-281-46/+48
| | | * | | | | | | | | | | | | x86: uv bau interrupt -- use proper interrupt numberCyrill Gorcunov2008-11-281-1/+1
| | | * | | | | | | | | | | | | x86: entry_64.S - use ENTRY to define child_ripCyrill Gorcunov2008-11-271-1/+1
| | | * | | | | | | | | | | | | x86: entry_64.S - use X86_EFLAGS_IF instead of hardcoded numbergorcunov@gmail.com2008-11-271-1/+1
OpenPOWER on IntegriCloud