projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
Kconfig
diff --git
a/arch/x86/Kconfig
b/arch/x86/Kconfig
index e4ff5d1280ca826bba1d0d640052acda2cb3ce92..93698794aa3a7b3189ee427a105e1b20e88ef103 100644
(file)
--- a/
arch/x86/Kconfig
+++ b/
arch/x86/Kconfig
@@
-1204,6
+1204,10
@@
config ARCH_DISCONTIGMEM_DEFAULT
def_bool y
depends on NUMA && X86_32
def_bool y
depends on NUMA && X86_32
+config ARCH_PROC_KCORE_TEXT
+ def_bool y
+ depends on X86_64 && PROC_KCORE
+
config ARCH_SPARSEMEM_DEFAULT
def_bool y
depends on X86_64
config ARCH_SPARSEMEM_DEFAULT
def_bool y
depends on X86_64
@@
-1662,6
+1666,8
@@
source "kernel/power/Kconfig"
source "drivers/acpi/Kconfig"
source "drivers/acpi/Kconfig"
+source "drivers/sfi/Kconfig"
+
config X86_APM_BOOT
bool
default y
config X86_APM_BOOT
bool
default y
@@
-1857,7
+1863,7
@@
config PCI_DIRECT
config PCI_MMCONFIG
def_bool y
config PCI_MMCONFIG
def_bool y
- depends on X86_32 && PCI &&
ACPI
&& (PCI_GOMMCONFIG || PCI_GOANY)
+ depends on X86_32 && PCI &&
(ACPI || SFI)
&& (PCI_GOMMCONFIG || PCI_GOANY)
config PCI_OLPC
def_bool y
config PCI_OLPC
def_bool y
@@
-1895,7
+1901,7
@@
config DMAR_DEFAULT_ON
config DMAR_BROKEN_GFX_WA
def_bool n
prompt "Workaround broken graphics drivers (going away soon)"
config DMAR_BROKEN_GFX_WA
def_bool n
prompt "Workaround broken graphics drivers (going away soon)"
- depends on DMAR
+ depends on DMAR
&& BROKEN
---help---
Current Graphics drivers tend to use physical address
for DMA and avoid using DMA APIs. Setting this config
---help---
Current Graphics drivers tend to use physical address
for DMA and avoid using DMA APIs. Setting this config