[Utopic][SRU][PATCH] UBUNTU: [Config] CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y on ppc64el

[Chris J Arges]

BugLink: http://bugs.launchpad.net/bugs/1450497

CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is enabled for ppc64el on Trusty and Vivid;
however on Utopic this isn't the case. By enabling this option %steal can be
properly reported in virtual machines.

Note, enabling this disables CONFIG_VIRT_CPU_ACCOUNTING_GEN which is consistent
with other series.

Signed-off-by: Chris J Arges <chris.j.arges at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 +
 debian.master/config/armhf/config.common.armhf     | 1 +
 debian.master/config/config.common.ubuntu          | 2 +-
 debian.master/config/powerpc/config.common.powerpc | 2 +-
 debian.master/config/ppc64el/config.common.ppc64el | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 8247755..11716fb 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -151,6 +151,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_USBNET=m
 # CONFIG_USB_UX500_DMA is not set
 CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_XEN=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 9f7c937..c20678c 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -139,4 +139,5 @@ CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_USBNET=y
 # CONFIG_USB_UX500_DMA is not set
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # CONFIG_XEN is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 6d7fde8..4a59926 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7826,7 +7826,7 @@ CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_VITESSE_PHY=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index d642c1b8..12c9d07 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -157,4 +157,4 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_USBNET=m
 # CONFIG_USB_UX500_DMA is not set
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 4a1a321..482f518 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -210,5 +210,5 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_UX500_DMA=y
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
-# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_WORD_SIZE=64
-- 
1.9.1