diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
| commit | 6a50f368784f29b0772f265a05b9e395bb2c23ff (patch) | |
| tree | 80faccf654cbbaae2a0a74686db514f663623bb2 /config-generic | |
| parent | 498236e304bc3f3c936ef937b2a101b9e22f6544 (diff) | |
| download | kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.gz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.xz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.zip | |
Linux v4.1-11355-g6aaf0da8728c
- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143)
- Fix errant with_perf disable that removed perf entirely (rhbz 1237266)
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 05105b935..8cfe42350 100644 --- a/config-generic +++ b/config-generic @@ -104,6 +104,8 @@ CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIE_ECRC=y CONFIG_PCIEAER_INJECT=m +CONFIG_HOTPLUG_PCI=y +# CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_PCIE=y # CONFIG_SGI_IOC4 is not set @@ -339,6 +341,12 @@ CONFIG_ACPI_PCI_SLOT=y CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=m +# CONFIG_ACPI_NFIT is not set +# CONFIG_LIBNVDIMM is not set +# CONFIG_ND_BLK is not set +# CONFIG_BTT is not set + + # # Block devices # @@ -2438,7 +2446,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_RSA=y -# CONFIG_SERIAL_8250_DW is not set +CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_INGENIC is not set CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set |