summaryrefslogtreecommitdiffstats
path: root/arch/x86
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-12-3013-24/+59
|\
| *-------. Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/print...Ingo Molnar2008-12-258-14/+41
| |\ \ \ \ \
| | | | * \ \ Merge commit 'v2.6.28-rc7' into core/lockingIngo Molnar2008-12-0442-147/+286
| | | | |\ \ \
| | | * | | | | 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-177-5/+14
| | | * | | | | x86: add swiotlb allocation functionsJeremy Fitzhardinge2008-12-171-0/+12
| | | * | | | | x86: remove unused iommu_nr_pagesJeremy Fitzhardinge2008-12-162-9/+0
| * | | | | | | Merge commit 'v2.6.28' into core/coreIngo Molnar2008-12-2539-194/+253
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | | | | | |
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *---------. \ \ \ \ \ \ Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'cor...Ingo Molnar2008-11-245-10/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | / / / | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge branch 'linus' into core/lockingIngo Molnar2008-11-1266-210/+398
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge commit 'v2.6.28-rc2' into core/lockingIngo Molnar2008-10-28586-14873/+58376
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.27-rc7' into core/lockingIngo Molnar2008-09-239-30/+27
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | x86: some lock annotations for user copy paths, v3Ingo Molnar2008-09-111-0/+1
| | | | * | | | | | | | | | | x86: some lock annotations for user copy paths, v2Nick Piggin2008-09-112-15/+5
| | | | * | | | | | | | | | | x86: some lock annotations for user copy pathsNick Piggin2008-09-102-1/+10
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-nextLinus Torvalds2008-12-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | allow stripping of generated symbols under CONFIG_KALLSYMS_ALLJan Beulich2008-12-191-0/+1
* | | | | | | | | | | | | | | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6Linus Torvalds2008-12-283-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | [S390] arch_setup_additional_pages argumentsMartin Schwidefsky2008-12-253-3/+3
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-12-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/coreIngo Molnar2008-12-2511-29/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge commit 'v2.6.28-rc8' into sched/coreIngo Molnar2008-12-1211-48/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'sched/urgent' into sched/coreIngo Molnar2008-12-0820-117/+144
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.28-rc6' into sched/coreIngo Molnar2008-11-2116-23/+150
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'linus' into sched/coreIngo Molnar2008-11-1918-44/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTERIngo Molnar2008-11-111-1/+1
| * | | | | | | | | | | | | | | | | Merge branch 'sched/urgent' into sched/coreIngo Molnar2008-11-0719-46/+113
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | x86, sched: enable wchan config menu item on 64-bitKen Chen2008-11-061-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-2835-1113/+1731
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-----. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/rin...Ingo Molnar2008-12-2515-58/+156
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Revert "x86: disable X86_PTRACE_BTS"Ingo Molnar2008-12-241-1/+0
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'linus' into tracing/hw-branch-tracingIngo Molnar2008-12-247-14/+31
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | x86, bts: memory accountingMarkus Metzger2008-12-201-11/+34
| | | * | | | | | | | | | | | | | | | | | | x86, bts: add fork and exit handlingMarkus Metzger2008-12-206-32/+85
| | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3Frederic Weisbecker2008-12-253-2/+8
| | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge branch 'x86/tsc' into tracing/coreIngo Molnar2008-12-255-5/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' i...Ingo Molnar2008-12-1913-62/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | 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-172-51/+35
| |/ / / / / / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/fastboot', 'tracing/ftrace', 'tracing/function-graph-...Ingo Molnar2008-12-1613-873/+817
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | x86, bts: fix build errorIngo Molnar2008-12-121-1/+1
| | | * | | | | | | | | | | | | | | | | | | x86, bts: provide in-kernel branch-trace interfaceMarkus Metzger2008-12-129-871/+810
| | | * | | | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | tracing/function-graph-tracer: append the tracing_graph_flagFrederic Weisbecker2008-12-081-1/+4
OpenPOWER on IntegriCloud