| Message ID | 1416866114-8027-3-git-send-email-chris.j.arges@canonical.com |
|---|---|
| State | New |
| Headers | show |
Applied to Vivid. -apw
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 5fc163d..4b201c1 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -114,6 +114,7 @@ CONFIG_RTC_DRV_XGENE=y CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_SVW=m CONFIG_SCHED_SMT=y +# CONFIG_SCOM_DEBUGFS is not set CONFIG_SCSI_SRP_ATTRS=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250_DW=m diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index c7a9a44..ae53a2a 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -107,6 +107,7 @@ CONFIG_RTC_DRV_XGENE=m CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_SVW=m CONFIG_SCHED_SMT=y +# CONFIG_SCOM_DEBUGFS is not set CONFIG_SCSI_SRP_ATTRS=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250_DW=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index b0fcf04..6713da5 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -104,6 +104,7 @@ CONFIG_RTC_DRV_XGENE=m CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SATA_SVW=m # CONFIG_SCHED_SMT is not set +# CONFIG_SCOM_DEBUGFS is not set CONFIG_SCSI_SRP_ATTRS=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SH_TIMER_CMT=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 159eb18..1293581 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6021,7 +6021,6 @@ CONFIG_SCHED_MC=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCHED_STACK_END_CHECK is not set CONFIG_SCHED_TRACER=y -# CONFIG_SCOM_DEBUGFS is not set CONFIG_SCSI=y CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_3W_SAS=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index fc94a07..5ff07a7 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -112,6 +112,7 @@ CONFIG_RTC_DRV_XGENE=m CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_SVW=m CONFIG_SCHED_SMT=y +# CONFIG_SCOM_DEBUGFS is not set CONFIG_SCSI_SRP_ATTRS=m CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SERIAL_8250_DW=m diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc index 9b9359c..140c28c 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc +++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc @@ -53,6 +53,7 @@ CONFIG_PPC_INDIRECT_PCI=y CONFIG_RCU_FANOUT=32 # CONFIG_RCU_NOCB_CPU is not set CONFIG_RTC_DRV_DS3232=y +# CONFIG_SCOM_DEBUGFS is not set CONFIG_SCSI_SRP_ATTRS=m CONFIG_SPI_PXA2XX_PCI=m CONFIG_TICK_CPU_ACCOUNTING=y diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp index fe8f17b..022e401 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc-smp @@ -54,6 +54,7 @@ CONFIG_PPC_RTAS=y CONFIG_RCU_FANOUT=32 # CONFIG_RCU_NOCB_CPU is not set CONFIG_RTC_DRV_DS3232=m +# CONFIG_SCOM_DEBUGFS is not set CONFIG_SCSI_SRP_ATTRS=m # CONFIG_SPI_PXA2XX_PCI is not set CONFIG_TICK_CPU_ACCOUNTING=y diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb index 3c681fb..6b75776 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc64-emb +++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb @@ -57,6 +57,7 @@ CONFIG_RCU_FANOUT=32 # CONFIG_RCU_NOCB_CPU is not set CONFIG_RTC_DRV_DS3232=y # CONFIG_SCHED_SMT is not set +# CONFIG_SCOM_DEBUGFS is not set CONFIG_SCSI_SRP_ATTRS=m CONFIG_SPI_PXA2XX_PCI=m # CONFIG_TICK_CPU_ACCOUNTING is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-smp b/debian.master/config/powerpc/config.flavour.powerpc64-smp index 524d602..4ca1763 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc64-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc64-smp @@ -57,6 +57,7 @@ CONFIG_RCU_FANOUT=64 CONFIG_RCU_NOCB_CPU=y CONFIG_RTC_DRV_DS3232=m CONFIG_SCHED_SMT=y +CONFIG_SCOM_DEBUGFS=y CONFIG_SCSI_SRP_ATTRS=y # CONFIG_SPI_PXA2XX_PCI is not set CONFIG_U3_DART=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 38d2692..34fe1ff 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -167,6 +167,7 @@ CONFIG_RTC_DRV_XGENE=m CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_SVW=m CONFIG_SCHED_SMT=y +CONFIG_SCOM_DEBUGFS=y CONFIG_SCSI_SRP_ATTRS=y # CONFIG_SENSORS_SCH56XX_COMMON is not set CONFIG_SERIAL_8250_DW=m
BugLink: http://bugs.launchpad.net/bugs/1395855 Enable CONFIG_SCOM_DEBUGFS for powerpc/powerpc64-smp and ppc64el/generic kernels to create debugfs entries for debug and diagnostic tools. Signed-off-by: Chris J Arges <chris.j.arges@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/arm64/config.common.arm64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.flavour.powerpc-e500mc | 1 + debian.master/config/powerpc/config.flavour.powerpc-smp | 1 + debian.master/config/powerpc/config.flavour.powerpc64-emb | 1 + debian.master/config/powerpc/config.flavour.powerpc64-smp | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 + 10 files changed, 9 insertions(+), 1 deletion(-)