summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'irq/sparseirq' into cpus4096Ingo Molnar2008-12-171-1/+10
|\
| * sparseirq: fix !SMP building, #2Yinghai Lu2008-12-171-1/+1
| * x86, sparseirq: move irq_desc according to smp_affinity, v7Yinghai Lu2008-12-171-0/+9
* | x86: Set CONFIG_NR_CPUS even on UPMike Travis2008-12-171-3/+3
* | x86: enable MAXSMPMike Travis2008-12-171-3/+4
| |
| \
| \
| \
*---. \ Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096Ingo Molnar2008-12-121-11/+10
|\ \ \ \ | | |_|/ | |/| |
| | | * x86, apm: remove CONFIG_APM_REAL_MODE_POWER_OFF in favor of a kernel parameterNiels de Vos2008-12-021-7/+0
| | * | Merge branch 'linus' into x86/quirksIngo Molnar2008-12-081-2/+5
| | |\ \
| | * | | x86: use update_genapic to get rid of ES7000_CLUSTERED_APIC v2Yinghai Lu2008-11-181-4/+0
| * | | | sparseirq: fix !SMP && !PCI_MSI && !HT_IRQ buildYinghai Lu2008-12-091-1/+1
| * | | | sparse irq_desc[] array: core kernel and x86 changesYinghai Lu2008-12-081-0/+10
| | |/ / | |/| |
* | | | Merge branch 'tracing/fastboot' into cpus4096Ingo Molnar2008-12-121-1/+1
|\ \ \ \
| * | | | tracing/function-graph-tracer: support for x86-64Frederic Weisbecker2008-12-021-1/+1
| * | | | tracing/function-return-tracer: change the name into function-graph-tracerFrederic Weisbecker2008-11-261-1/+1
| | | | |
| \ \ \ \
*-. | | | | Merge branches 'sched/core', 'core/core' and 'tracing/core' into cpus4096Ingo Molnar2008-11-241-0/+3
|\ \| | | | | | |/ / / | |/| | |
| | * | | tracing/stack-tracer: introduce CONFIG_USER_STACKTRACE_SUPPORTTörök Edwin2008-11-231-0/+1
| | | | |
| | | \ \
| | *-. \ \ Merge branches 'tracing/profiling', 'tracing/options' and 'tracing/urgent' in...Ingo Molnar2008-11-231-2/+5
| | |\ \ \ \ | | |_|/ / / | |/| | / / | | | |/ /
| | * | | Merge branch 'tracing/function-return-tracer' into tracing/fastbootIngo Molnar2008-11-121-0/+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-111-0/+1
| | * | | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-121-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | * | | Merge branch 'tracing/urgent' into tracing/ftraceIngo Molnar2008-11-111-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | | |
| | | \ \
| | *-. \ \ Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 't...Ingo Molnar2008-11-081-0/+4
| | |\ \ \ \
| | * | | | | ftrace: add quick function trace stopSteven Rostedt2008-11-061-0/+1
| | |/ / / /
* | | | | | Merge commit 'v2.6.28-rc6' into sched/coreIngo Molnar2008-11-211-2/+5
|\| | | | |
| * | | | | Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/...Linus Torvalds2008-11-201-1/+1
| |\ \ \ \ \
| | * | | | | x86: make NUMA on 32-bit depend on EXPERIMENTAL againRafael J. Wysocki2008-11-121-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2008-11-181-1/+1
| |\| | | |
| * | | | | x86, voyager: fix smp generic helper voyager breakageJames Bottomley2008-11-111-1/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'linus' into sched/coreIngo Molnar2008-11-191-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | x86: Make NUMA on 32-bit depend on BROKENRafael J. Wysocki2008-11-101-1/+1
| |/ / /
* | | | 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-071-1/+5
|\| | |
| * | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-11-071-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | x86: mention ACPI in top-level Kconfig menuBjorn Helgaas2008-11-061-1/+1
| | |/
| * / io mapping: clean up #ifdefsKeith Packard2008-11-031-0/+4
| |/
* / x86, sched: enable wchan config menu item on 64-bitKen Chen2008-11-061-1/+1
|/
* Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-10-311-0/+4
|\
| * x86/voyager: fix compile breakage caused by dc1e35c6e95e8923cf1d3510438b63c60...James Bottomley2008-10-311-0/+4
* | Merge commit 'v2.6.28-rc2' into tracing/urgentIngo Molnar2008-10-271-0/+5
|\|
| * Merge branch 'linus' into testLen Brown2008-10-231-55/+162
| |\
| * \ Merge branch 'i7300_idle' into testLen Brown2008-10-231-0/+2
| |\ \
| | * | i7300_idle driver v1.55Andy Henroid2008-10-221-0/+2
| * | | cpuidle: upon BIOS bug, default to default_idle rather than pollingVenkatesh Pallipadi2008-10-171-0/+3
| |/ /
* | | Merge branch 'tracing/ftrace' into tracing/urgentIngo Molnar2008-10-221-1/+1
|\ \ \ | |_|/ |/| |
| * | ftrace: rename FTRACE to FUNCTION_TRACERSteven Rostedt2008-10-201-1/+1
| * | Merge branch 'linus' into tracing-v28-for-linus-v3Ingo Molnar2008-10-191-23/+10
| |\ \
* | | | Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-10-201-0/+1
|\| | |
| * | | ftrace: enable using mcount recording on x86Steven Rostedt2008-10-141-0/+1
* | | | Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-10-201-8/+0
|\ \ \ \