summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-021-0/+2
|\
| * Merge branch 'x86/asm' into tracing/syscallsIngo Molnar2009-03-141-1/+7
| |\
| * | tracing/x86: basic implementation of syscall tracing for x86Frederic Weisbecker2009-03-131-0/+1
| * | Merge branch 'x86/core' into tracing/texteditIngo Molnar2009-03-061-317/+345
| |\ \
| * \ \ Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing...Ingo Molnar2009-03-021-1/+1
| |\ \ \
| * \ \ \ Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 't...Ingo Molnar2009-02-131-0/+11
| |\ \ \ \
| * | | | | ftrace: change function graph tracer to use new in_nmiSteven Rostedt2009-02-081-1/+1
| * | | | | ring-buffer: add NMI protection for spinlocksSteven Rostedt2009-02-081-0/+1
* | | | | | generic debug pageallocAkinobu Mita2009-04-011-0/+3
* | | | | | Merge branch 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2009-03-301-0/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'linus' into core/iommuIngo Molnar2009-03-281-317/+343
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-271-317/+340
| | |\ \ \ \ \ \
| | * | | | | | | x86: disable __do_IRQ supportThomas Gleixner2009-03-261-0/+3
| | | |_|_|/ / / | | |/| | | | |
| * / | | | | | dma-debug: x86 architecture bindingsJoerg Roedel2009-03-171-0/+1
| |/ / / / / /
| | | | | | |
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
*---------. | | | | | | Merge branches 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/debug', 'x86/kconf...Ingo Molnar2009-03-141-1/+4
|\ \ \ \ \ \| | | | | | | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| | | | * | | | | | x86, 32-bit: also limit NODES_HIGH_SHIFT hereJan Beulich2009-03-131-1/+1
| | | | |/ / / / /
| | | * | | | | | Merge branch 'x86/core' into x86/kconfigIngo Molnar2009-03-131-318/+352
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| | | * | | | | | x86: disable __do_IRQ supportThomas Gleixner2009-03-131-0/+3
| | | | |/ / / / | | | |/| | | |
| | | | | | | |
| \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ Merge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' an...Ingo Molnar2009-03-121-0/+6
|\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | x86: cpu architecture debug codeJaswinder Singh Rajput2009-03-101-0/+6
| | |/ / / / / | |/| | | | |
* / | | | | | x86, kexec: x86_64: add kexec jump support for x86_64Huang Ying2009-03-111-1/+1
|/ / / / / /
* | | | | | Merge branch 'x86/mce2' into x86/coreIngo Molnar2009-03-051-0/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'x86/core' into x86/mce2H. Peter Anvin2009-03-041-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'x86/core' into x86/mce2H. Peter Anvin2009-02-251-316/+333
| |\ \ \ \ \ \
| * | | | | | | x86, mce, cmci: factor out threshold interrupt handlerAndi Kleen2009-02-241-0/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'x86/core' into core/percpuIngo Molnar2009-03-041-1/+4
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-------. \ \ \ \ \ Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x...Ingo Molnar2009-03-041-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | / / / | | | | | |_|_|/ / / | | | | |/| | | / / | | | | | | | |/ / | | | | | | |/| |
| | | | | * | | | bzip2/lzma: make config machinery an arch configurableH. Peter Anvin2009-01-051-0/+3
| | | | * | | | | Merge branch 'x86/urgent' into x86/patIngo Molnar2009-03-011-1/+1
| | |_|/| | | | | | |/| | | |/ / / | | | | |/| | |
| | | | * | | | x86: enable DMAR by defaultKyle McMartin2009-02-261-1/+1
| | | | | |/ / | | | | |/| |
* | | | | | | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/...Ingo Molnar2009-02-241-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | bootmem: clean up arch-specific bootmem wrappingTejun Heo2009-02-241-1/+1
| * | | | | | x86: convert to the new dynamic percpu allocatorTejun Heo2009-02-201-0/+3
* | | | | | | x86: remove the Voyager 32-bit subarchIngo Molnar2009-02-231-14/+0Star
* | | | | | | x86: improve the help text of X86_EXTENDED_PLATFORMRavikiran G Thirumalai2009-02-221-2/+28
| |_|/ / / / |/| | | | |
* | | | | | x86, apic: fix build fallout of genapic changesIngo Molnar2009-02-171-0/+1
* | | | | | x86: add x2apic configYinghai Lu2009-02-171-0/+15
| |/ / / / |/| | | |
* | | | | Merge branch 'core/percpu' into x86/coreIngo Molnar2009-02-131-1/+4
|\| | | |
| * | | | x86: implement x86_32 stack protectorTejun Heo2009-02-101-2/+1Star
| * | | | x86: make lazy %gs optional on x86_32Tejun Heo2009-02-101-0/+4
| * | | | Merge branch 'x86/urgent' into core/percpuIngo Molnar2009-02-101-0/+11
| |\| | |
* | | | | x86: make hibernation always-possibleIngo Molnar2009-02-111-1/+0Star
* | | | | x86: cleanup, rename CONFIG_X86_NON_STANDARD to CONFIG_X86_EXTENDED_PLATFORMRavikiran G Thirumalai2009-02-111-37/+46
* | | | | x86: clean up arch/x86/Kconfig*Ingo Molnar2009-02-051-202/+202
* | | | | Merge branch 'x86/urgent' into x86/apicIngo Molnar2009-02-051-0/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | x86: disable intel_iommu support by defaultKyle McMartin2009-02-051-0/+11
| | |_|/ | |/| |
* | | | x86: don't treat bigsmp as non-standardYinghai Lu2009-01-301-8/+7Star
* | | | x86: allow more than 8 cpus to be used on 32-bitYinghai Lu2009-01-301-5/+1Star
* | | | x86/Voyager: move to the X86_32_NON_STANDARD code sectionIngo Molnar2009-01-291-17/+17
* | | | x86: rename X86_GENERICARCH to X86_32_NON_STANDARDIngo Molnar2009-01-291-11/+11