Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 22892c701c63b8e650fc7a6323934ca13385382b..2dcafd0ba17f6c4d434a998f2db49e6bcf1e72c6 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -412,6 +412,10 @@ config TI_DAC7512
          This driver can also be built as a module. If so, the module
          will be called ti_dac7512.
 
          This driver can also be built as a module. If so, the module
          will be called ti_dac7512.
 

+config UID_STAT
+       bool "UID based statistics tracking exported to /proc/uid_stat"
+       default n
+

 config VMWARE_BALLOON
        tristate "VMware Balloon Driver"
        depends on VMWARE_VMCI && X86 && HYPERVISOR_GUEST
 config VMWARE_BALLOON
        tristate "VMware Balloon Driver"
        depends on VMWARE_VMCI && X86 && HYPERVISOR_GUEST


@@ -439,7 +443,7 @@ config ARM_CHARLCD
          still useful.
 
 config BMP085
          still useful.
 
 config BMP085

-       bool
+       tristate

        depends on SYSFS
 
 config BMP085_I2C
        depends on SYSFS
 
 config BMP085_I2C


@@ -525,6 +529,12 @@ config VEXPRESS_SYSCFG
          bus. System Configuration interface is one of the possible means
          of generating transactions on this bus.
 
          bus. System Configuration interface is one of the possible means
          of generating transactions on this bus.
 

+config UID_CPUTIME
+       bool "Per-UID cpu time statistics"
+       depends on PROFILING
+       help
+         Per UID based cpu time statistics exported to /proc/uid_cputime
+

 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"