diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 11:40:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 11:40:21 -0400 |
| commit | b7723f9d21d8d6043e63f5e3e412f321f5f1900c (patch) | |
| tree | 984098e5c060600e90e62f1b101593805f7cb2e9 /arch/x86/Kconfig.debug | |
| parent | 93c9d7f60c0cb7715890b1f9e159da6f4d1f5a65 (diff) | |
| parent | 6fc108a08dcddf8f9113cc7102ddaacf7ed37a6b (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Clean up arch/x86/Kconfig*
x86-64: Don't export init_level4_pgt
Diffstat (limited to 'arch/x86/Kconfig.debug')
| -rw-r--r-- | arch/x86/Kconfig.debug | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index bd58c8abbfbd..75085080b63e 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
| @@ -45,7 +45,6 @@ config EARLY_PRINTK | |||
| 45 | 45 | ||
| 46 | config EARLY_PRINTK_DBGP | 46 | config EARLY_PRINTK_DBGP |
| 47 | bool "Early printk via EHCI debug port" | 47 | bool "Early printk via EHCI debug port" |
| 48 | default n | ||
| 49 | depends on EARLY_PRINTK && PCI | 48 | depends on EARLY_PRINTK && PCI |
| 50 | ---help--- | 49 | ---help--- |
| 51 | Write kernel log output directly into the EHCI debug port. | 50 | Write kernel log output directly into the EHCI debug port. |
| @@ -76,7 +75,6 @@ config DEBUG_PER_CPU_MAPS | |||
| 76 | bool "Debug access to per_cpu maps" | 75 | bool "Debug access to per_cpu maps" |
| 77 | depends on DEBUG_KERNEL | 76 | depends on DEBUG_KERNEL |
| 78 | depends on SMP | 77 | depends on SMP |
| 79 | default n | ||
| 80 | ---help--- | 78 | ---help--- |
| 81 | Say Y to verify that the per_cpu map being accessed has | 79 | Say Y to verify that the per_cpu map being accessed has |
| 82 | been setup. Adds a fair amount of code to kernel memory | 80 | been setup. Adds a fair amount of code to kernel memory |