PM: Eliminate CONFIG_PM_RUNTIME

Having switched over all of the users of CONFIG_PM_RUNTIME to use CONFIG_PM directly, turn the latter into a user-selectable option and drop the former entirely from the tree.

Rafael J. Wysocki committed 11 years ago

Commit 464ed181 parent 71504e537 files · +39 −48Browse files

Unified · Split

37 files

arch/arm/configs/ape6evm_defconfig +1 −1
arch/arm/configs/armadillo800eva_defconfig +1 −1
arch/arm/configs/bcm_defconfig +1 −1
arch/arm/configs/bockw_defconfig +1 −1
arch/arm/configs/davinci_all_defconfig +1 −1
arch/arm/configs/exynos_defconfig +1 −1
arch/arm/configs/ezx_defconfig +0 −1
arch/arm/configs/hisi_defconfig +1 −1
arch/arm/configs/imote2_defconfig +0 −1
arch/arm/configs/imx_v6_v7_defconfig +1 −1
arch/arm/configs/keystone_defconfig +1 −1
arch/arm/configs/kzm9g_defconfig +1 −1
arch/arm/configs/lager_defconfig +1 −1
arch/arm/configs/mackerel_defconfig +0 −1
arch/arm/configs/marzen_defconfig +1 −1
arch/arm/configs/omap1_defconfig +0 −1
arch/arm/configs/prima2_defconfig +1 −1
arch/arm/configs/sama5_defconfig +1 −1
arch/arm/configs/shmobile_defconfig +1 −1
arch/arm/configs/sunxi_defconfig +1 −1
arch/arm/configs/tegra_defconfig +1 −1
arch/arm/configs/u8500_defconfig +1 −1
arch/arm/configs/vt8500_v6_v7_defconfig +1 −1
arch/arm/mach-omap2/Kconfig +3 −3
arch/mips/configs/db1xxx_defconfig +1 −1
arch/mips/configs/lemote2f_defconfig +0 −1
arch/mips/configs/loongson3_defconfig +1 −1
arch/mips/configs/nlm_xlp_defconfig +1 −1
arch/mips/configs/nlm_xlr_defconfig +1 −1
arch/powerpc/configs/ps3_defconfig +1 −1
arch/sh/Kconfig +1 −1
arch/sh/configs/apsh4ad0a_defconfig +1 −1
arch/sh/configs/sdk7786_defconfig +1 −1
drivers/usb/host/isp1760-hcd.c +1 −1
drivers/usb/host/oxu210hp-hcd.c +1 −1
include/linux/devfreq.h +1 −1
kernel/power/Kconfig +6 −10

arch/arm/configs/ape6evm_defconfig+1−1

@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y · 32 unmodified lines
33	CONFIG_VFP=y	33	CONFIG_VFP=y
34	CONFIG_NEON=y	34	CONFIG_NEON=y
35	CONFIG_BINFMT_MISC=y	35	CONFIG_BINFMT_MISC=y
36	CONFIG_PM_RUNTIME=y	36	CONFIG_PM=y
37	CONFIG_NET=y	37	CONFIG_NET=y
38	CONFIG_PACKET=y	38	CONFIG_PACKET=y
39	CONFIG_UNIX=y	39	CONFIG_UNIX=y

arch/arm/configs/armadillo800eva_defconfig+1−1

@@ -43,7 +43,7 @@ CONFIG_KEXEC=y · 42 unmodified lines
43	CONFIG_VFP=y	43	CONFIG_VFP=y
44	CONFIG_NEON=y	44	CONFIG_NEON=y
45	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set	45	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
46	CONFIG_PM_RUNTIME=y	46	CONFIG_PM=y
47	CONFIG_NET=y	47	CONFIG_NET=y
48	CONFIG_PACKET=y	48	CONFIG_PACKET=y
49	CONFIG_UNIX=y	49	CONFIG_UNIX=y

arch/arm/configs/bcm_defconfig+1−1

@@ -39,7 +39,7 @@ CONFIG_CPU_IDLE=y · 38 unmodified lines
39	CONFIG_VFP=y	39	CONFIG_VFP=y
40	CONFIG_NEON=y	40	CONFIG_NEON=y
41	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set	41	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
42	CONFIG_PM_RUNTIME=y	42	CONFIG_PM=y
43	CONFIG_NET=y	43	CONFIG_NET=y
44	CONFIG_PACKET=y	44	CONFIG_PACKET=y
45	CONFIG_PACKET_DIAG=y	45	CONFIG_PACKET_DIAG=y

arch/arm/configs/bockw_defconfig+1−1

@@ -29,7 +29,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 · 28 unmodified lines
29	CONFIG_ARM_APPENDED_DTB=y	29	CONFIG_ARM_APPENDED_DTB=y
30	CONFIG_VFP=y	30	CONFIG_VFP=y
31	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set	31	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
32	CONFIG_PM_RUNTIME=y	32	CONFIG_PM=y
33	CONFIG_NET=y	33	CONFIG_NET=y
34	CONFIG_PACKET=y	34	CONFIG_PACKET=y
35	CONFIG_UNIX=y	35	CONFIG_UNIX=y

arch/arm/configs/davinci_all_defconfig+1−1

@@ -49,7 +49,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=m · 48 unmodified lines
49	CONFIG_CPU_FREQ_GOV_POWERSAVE=m	49	CONFIG_CPU_FREQ_GOV_POWERSAVE=m
50	CONFIG_CPU_FREQ_GOV_ONDEMAND=m	50	CONFIG_CPU_FREQ_GOV_ONDEMAND=m
51	CONFIG_CPU_IDLE=y	51	CONFIG_CPU_IDLE=y
52	CONFIG_PM_RUNTIME=y	52	CONFIG_PM=y
53	CONFIG_NET=y	53	CONFIG_NET=y
54	CONFIG_PACKET=y	54	CONFIG_PACKET=y
55	CONFIG_UNIX=y	55	CONFIG_UNIX=y

arch/arm/configs/exynos_defconfig+1−1

@@ -27,7 +27,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y · 26 unmodified lines
27	CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"	27	CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
28	CONFIG_VFP=y	28	CONFIG_VFP=y
29	CONFIG_NEON=y	29	CONFIG_NEON=y
30	CONFIG_PM_RUNTIME=y	30	CONFIG_PM=y
31	CONFIG_NET=y	31	CONFIG_NET=y
32	CONFIG_PACKET=y	32	CONFIG_PACKET=y
33	CONFIG_UNIX=y	33	CONFIG_UNIX=y

arch/arm/configs/ezx_defconfig+0−1

@@ -39,7 +39,6 @@ CONFIG_BINFMT_AOUT=m · 38 unmodified lines
39	CONFIG_BINFMT_MISC=m	39	CONFIG_BINFMT_MISC=m
40	CONFIG_PM=y	40	CONFIG_PM=y
41	CONFIG_APM_EMULATION=y	41	CONFIG_APM_EMULATION=y
42	CONFIG_PM_RUNTIME=y
43	CONFIG_NET=y	42	CONFIG_NET=y
44	CONFIG_PACKET=y	43	CONFIG_PACKET=y
45	CONFIG_UNIX=y	44	CONFIG_UNIX=y

arch/arm/configs/hisi_defconfig+1−1

@@ -18,7 +18,7 @@ CONFIG_ARM_APPENDED_DTB=y · 17 unmodified lines
18	CONFIG_ARM_ATAG_DTB_COMPAT=y	18	CONFIG_ARM_ATAG_DTB_COMPAT=y
19	CONFIG_NEON=y	19	CONFIG_NEON=y
20	CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y	20	CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
21	CONFIG_PM_RUNTIME=y	21	CONFIG_PM=y
22	CONFIG_NET=y	22	CONFIG_NET=y
23	CONFIG_PACKET=y	23	CONFIG_PACKET=y
24	CONFIG_UNIX=y	24	CONFIG_UNIX=y

arch/arm/configs/imote2_defconfig+0−1

@@ -31,7 +31,6 @@ CONFIG_BINFMT_AOUT=m · 30 unmodified lines
31	CONFIG_BINFMT_MISC=m	31	CONFIG_BINFMT_MISC=m
32	CONFIG_PM=y	32	CONFIG_PM=y
33	CONFIG_APM_EMULATION=y	33	CONFIG_APM_EMULATION=y
34	CONFIG_PM_RUNTIME=y
35	CONFIG_NET=y	34	CONFIG_NET=y
36	CONFIG_PACKET=y	35	CONFIG_PACKET=y
37	CONFIG_UNIX=y	36	CONFIG_UNIX=y

arch/arm/configs/imx_v6_v7_defconfig+1−1

@@ -54,7 +54,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y · 53 unmodified lines
54	CONFIG_VFP=y	54	CONFIG_VFP=y
55	CONFIG_NEON=y	55	CONFIG_NEON=y
56	CONFIG_BINFMT_MISC=m	56	CONFIG_BINFMT_MISC=m
57	CONFIG_PM_RUNTIME=y	57	CONFIG_PM=y
58	CONFIG_PM_DEBUG=y	58	CONFIG_PM_DEBUG=y
59	CONFIG_PM_TEST_SUSPEND=y	59	CONFIG_PM_TEST_SUSPEND=y
60	CONFIG_NET=y	60	CONFIG_NET=y

arch/arm/configs/keystone_defconfig+1−1

@@ -30,7 +30,7 @@ CONFIG_HIGHMEM=y · 29 unmodified lines
30	CONFIG_VFP=y	30	CONFIG_VFP=y
31	CONFIG_NEON=y	31	CONFIG_NEON=y
32	# CONFIG_SUSPEND is not set	32	# CONFIG_SUSPEND is not set
33	CONFIG_PM_RUNTIME=y	33	CONFIG_PM=y
34	CONFIG_NET=y	34	CONFIG_NET=y
35	CONFIG_PACKET=y	35	CONFIG_PACKET=y
36	CONFIG_UNIX=y	36	CONFIG_UNIX=y

arch/arm/configs/kzm9g_defconfig+1−1

@@ -43,7 +43,7 @@ CONFIG_KEXEC=y · 42 unmodified lines
43	CONFIG_VFP=y	43	CONFIG_VFP=y
44	CONFIG_NEON=y	44	CONFIG_NEON=y
45	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set	45	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
46	CONFIG_PM_RUNTIME=y	46	CONFIG_PM=y
47	CONFIG_NET=y	47	CONFIG_NET=y
48	CONFIG_PACKET=y	48	CONFIG_PACKET=y
49	CONFIG_UNIX=y	49	CONFIG_UNIX=y

arch/arm/configs/lager_defconfig+1−1

@@ -37,7 +37,7 @@ CONFIG_AUTO_ZRELADDR=y · 36 unmodified lines
37	CONFIG_VFP=y	37	CONFIG_VFP=y
38	CONFIG_NEON=y	38	CONFIG_NEON=y
39	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set	39	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
40	CONFIG_PM_RUNTIME=y	40	CONFIG_PM=y
41	CONFIG_NET=y	41	CONFIG_NET=y
42	CONFIG_PACKET=y	42	CONFIG_PACKET=y
43	CONFIG_UNIX=y	43	CONFIG_UNIX=y

arch/arm/configs/mackerel_defconfig+0−1

@@ -28,7 +28,6 @@ CONFIG_KEXEC=y · 27 unmodified lines
28	CONFIG_VFP=y	28	CONFIG_VFP=y
29	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set	29	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
30	CONFIG_PM=y	30	CONFIG_PM=y
31	CONFIG_PM_RUNTIME=y
32	CONFIG_NET=y	31	CONFIG_NET=y
33	CONFIG_PACKET=y	32	CONFIG_PACKET=y
34	CONFIG_UNIX=y	33	CONFIG_UNIX=y

arch/arm/configs/marzen_defconfig+1−1

@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y · 32 unmodified lines
33	CONFIG_VFP=y	33	CONFIG_VFP=y
34	CONFIG_KEXEC=y	34	CONFIG_KEXEC=y
35	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set	35	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
36	CONFIG_PM_RUNTIME=y	36	CONFIG_PM=y
37	CONFIG_NET=y	37	CONFIG_NET=y
38	CONFIG_PACKET=y	38	CONFIG_PACKET=y
39	CONFIG_UNIX=y	39	CONFIG_UNIX=y

arch/arm/configs/omap1_defconfig+0−1

@@ -63,7 +63,6 @@ CONFIG_FPE_NWFPE=y · 62 unmodified lines
63	CONFIG_BINFMT_MISC=y	63	CONFIG_BINFMT_MISC=y
64	CONFIG_PM=y	64	CONFIG_PM=y
65	# CONFIG_SUSPEND is not set	65	# CONFIG_SUSPEND is not set
66	CONFIG_PM_RUNTIME=y
67	CONFIG_NET=y	66	CONFIG_NET=y
68	CONFIG_PACKET=y	67	CONFIG_PACKET=y
69	CONFIG_UNIX=y	68	CONFIG_UNIX=y

arch/arm/configs/prima2_defconfig+1−1

@@ -18,7 +18,7 @@ CONFIG_PREEMPT=y · 17 unmodified lines
18	CONFIG_AEABI=y	18	CONFIG_AEABI=y
19	CONFIG_KEXEC=y	19	CONFIG_KEXEC=y
20	CONFIG_BINFMT_MISC=y	20	CONFIG_BINFMT_MISC=y
21	CONFIG_PM_RUNTIME=y	21	CONFIG_PM=y
22	CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"	22	CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
23	CONFIG_BLK_DEV_LOOP=y	23	CONFIG_BLK_DEV_LOOP=y
24	CONFIG_BLK_DEV_RAM=y	24	CONFIG_BLK_DEV_RAM=y

arch/arm/configs/sama5_defconfig+1−1

@@ -32,7 +32,7 @@ CONFIG_VFP=y · 31 unmodified lines
32	CONFIG_NEON=y	32	CONFIG_NEON=y
33	CONFIG_KERNEL_MODE_NEON=y	33	CONFIG_KERNEL_MODE_NEON=y
34	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set	34	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
35	CONFIG_PM_RUNTIME=y	35	CONFIG_PM=y
36	CONFIG_PM_DEBUG=y	36	CONFIG_PM_DEBUG=y
37	CONFIG_PM_ADVANCED_DEBUG=y	37	CONFIG_PM_ADVANCED_DEBUG=y
38	CONFIG_NET=y	38	CONFIG_NET=y

arch/arm/configs/shmobile_defconfig+1−1

@@ -39,7 +39,7 @@ CONFIG_KEXEC=y · 38 unmodified lines
39	CONFIG_VFP=y	39	CONFIG_VFP=y
40	CONFIG_NEON=y	40	CONFIG_NEON=y
41	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set	41	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
42	CONFIG_PM_RUNTIME=y	42	CONFIG_PM=y
43	CONFIG_NET=y	43	CONFIG_NET=y
44	CONFIG_PACKET=y	44	CONFIG_PACKET=y
45	CONFIG_UNIX=y	45	CONFIG_UNIX=y

arch/arm/configs/sunxi_defconfig+1−1

@@ -11,7 +11,7 @@ CONFIG_ARM_APPENDED_DTB=y · 10 unmodified lines
11	CONFIG_ARM_ATAG_DTB_COMPAT=y	11	CONFIG_ARM_ATAG_DTB_COMPAT=y
12	CONFIG_VFP=y	12	CONFIG_VFP=y
13	CONFIG_NEON=y	13	CONFIG_NEON=y
14	CONFIG_PM_RUNTIME=y	14	CONFIG_PM=y
15	CONFIG_NET=y	15	CONFIG_NET=y
16	CONFIG_PACKET=y	16	CONFIG_PACKET=y
17	CONFIG_UNIX=y	17	CONFIG_UNIX=y

arch/arm/configs/tegra_defconfig+1−1

@@ -46,7 +46,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y · 45 unmodified lines
46	CONFIG_CPU_IDLE=y	46	CONFIG_CPU_IDLE=y
47	CONFIG_VFP=y	47	CONFIG_VFP=y
48	CONFIG_NEON=y	48	CONFIG_NEON=y
49	CONFIG_PM_RUNTIME=y	49	CONFIG_PM=y
50	CONFIG_NET=y	50	CONFIG_NET=y
51	CONFIG_PACKET=y	51	CONFIG_PACKET=y
52	CONFIG_UNIX=y	52	CONFIG_UNIX=y

arch/arm/configs/u8500_defconfig+1−1

@@ -25,7 +25,7 @@ CONFIG_CPU_IDLE=y · 24 unmodified lines
25	CONFIG_ARM_U8500_CPUIDLE=y	25	CONFIG_ARM_U8500_CPUIDLE=y
26	CONFIG_VFP=y	26	CONFIG_VFP=y
27	CONFIG_NEON=y	27	CONFIG_NEON=y
28	CONFIG_PM_RUNTIME=y	28	CONFIG_PM=y
29	CONFIG_NET=y	29	CONFIG_NET=y
30	CONFIG_PACKET=y	30	CONFIG_PACKET=y
31	CONFIG_UNIX=y	31	CONFIG_UNIX=y

arch/arm/configs/vt8500_v6_v7_defconfig+1−1

@@ -16,7 +16,7 @@ CONFIG_ARM_APPENDED_DTB=y · 15 unmodified lines
16	CONFIG_ARM_ATAG_DTB_COMPAT=y	16	CONFIG_ARM_ATAG_DTB_COMPAT=y
17	CONFIG_VFP=y	17	CONFIG_VFP=y
18	CONFIG_NEON=y	18	CONFIG_NEON=y
19	CONFIG_PM_RUNTIME=y	19	CONFIG_PM=y
20	CONFIG_NET=y	20	CONFIG_NET=y
21	CONFIG_UNIX=y	21	CONFIG_UNIX=y
22	CONFIG_INET=y	22	CONFIG_INET=y

arch/arm/mach-omap2/Kconfig+3−3

@@ -15,7 +15,7 @@ config ARCH_OMAP3 · 14 unmodified lines
15	select ARM_CPU_SUSPEND if PM	15	select ARM_CPU_SUSPEND if PM
16	select OMAP_INTERCONNECT	16	select OMAP_INTERCONNECT
17	select PM_OPP if PM	17	select PM_OPP if PM
18	select PM_RUNTIME if CPU_IDLE	18	select PM if CPU_IDLE
19	select SOC_HAS_OMAP2_SDRC	19	select SOC_HAS_OMAP2_SDRC
20		20
21	config ARCH_OMAP4	21	config ARCH_OMAP4
@@ -32,7 +32,7 @@ config ARCH_OMAP4 · 10 unmodified lines
32	select PL310_ERRATA_588369 if CACHE_L2X0	32	select PL310_ERRATA_588369 if CACHE_L2X0
33	select PL310_ERRATA_727915 if CACHE_L2X0	33	select PL310_ERRATA_727915 if CACHE_L2X0
34	select PM_OPP if PM	34	select PM_OPP if PM
35	select PM_RUNTIME if CPU_IDLE	35	select PM if CPU_IDLE
36	select ARM_ERRATA_754322	36	select ARM_ERRATA_754322
37	select ARM_ERRATA_775420	37	select ARM_ERRATA_775420
38		38
@@ -103,7 +103,7 @@ config ARCH_OMAP2PLUS_TYPICAL · 64 unmodified lines
103	select I2C_OMAP	103	select I2C_OMAP
104	select MENELAUS if ARCH_OMAP2	104	select MENELAUS if ARCH_OMAP2
105	select NEON if CPU_V7	105	select NEON if CPU_V7
106	select PM_RUNTIME	106	select PM
107	select REGULATOR	107	select REGULATOR
108	select TWL4030_CORE if ARCH_OMAP3 \|\| ARCH_OMAP4	108	select TWL4030_CORE if ARCH_OMAP3 \|\| ARCH_OMAP4
109	select TWL4030_POWER if ARCH_OMAP3 \|\| ARCH_OMAP4	109	select TWL4030_POWER if ARCH_OMAP3 \|\| ARCH_OMAP4

arch/mips/configs/db1xxx_defconfig+1−1

@@ -36,7 +36,7 @@ CONFIG_PCI=y · 35 unmodified lines
36	CONFIG_PCI_REALLOC_ENABLE_AUTO=y	36	CONFIG_PCI_REALLOC_ENABLE_AUTO=y
37	CONFIG_PCCARD=y	37	CONFIG_PCCARD=y
38	CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y	38	CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
39	CONFIG_PM_RUNTIME=y	39	CONFIG_PM=y
40	CONFIG_NET=y	40	CONFIG_NET=y
41	CONFIG_PACKET=y	41	CONFIG_PACKET=y
42	CONFIG_PACKET_DIAG=y	42	CONFIG_PACKET_DIAG=y

arch/mips/configs/lemote2f_defconfig+0−1

@@ -37,7 +37,6 @@ CONFIG_MIPS32_N32=y · 36 unmodified lines
37	CONFIG_PM=y	37	CONFIG_PM=y
38	CONFIG_HIBERNATION=y	38	CONFIG_HIBERNATION=y
39	CONFIG_PM_STD_PARTITION="/dev/hda3"	39	CONFIG_PM_STD_PARTITION="/dev/hda3"
40	CONFIG_PM_RUNTIME=y
41	CONFIG_CPU_FREQ=y	40	CONFIG_CPU_FREQ=y
42	CONFIG_CPU_FREQ_DEBUG=y	41	CONFIG_CPU_FREQ_DEBUG=y
43	CONFIG_CPU_FREQ_STAT=m	42	CONFIG_CPU_FREQ_STAT=m

arch/mips/configs/loongson3_defconfig+1−1

@@ -58,7 +58,7 @@ CONFIG_BINFMT_MISC=m · 57 unmodified lines
58	CONFIG_MIPS32_COMPAT=y	58	CONFIG_MIPS32_COMPAT=y
59	CONFIG_MIPS32_O32=y	59	CONFIG_MIPS32_O32=y
60	CONFIG_MIPS32_N32=y	60	CONFIG_MIPS32_N32=y
61	CONFIG_PM_RUNTIME=y	61	CONFIG_PM=y
62	CONFIG_NET=y	62	CONFIG_NET=y
63	CONFIG_PACKET=y	63	CONFIG_PACKET=y
64	CONFIG_UNIX=y	64	CONFIG_UNIX=y

arch/mips/configs/nlm_xlp_defconfig+1−1

@@ -61,7 +61,7 @@ CONFIG_BINFMT_MISC=y · 60 unmodified lines
61	CONFIG_MIPS32_COMPAT=y	61	CONFIG_MIPS32_COMPAT=y
62	CONFIG_MIPS32_O32=y	62	CONFIG_MIPS32_O32=y
63	CONFIG_MIPS32_N32=y	63	CONFIG_MIPS32_N32=y
64	CONFIG_PM_RUNTIME=y	64	CONFIG_PM=y
65	CONFIG_PM_DEBUG=y	65	CONFIG_PM_DEBUG=y
66	CONFIG_NET=y	66	CONFIG_NET=y
67	CONFIG_PACKET=y	67	CONFIG_PACKET=y

arch/mips/configs/nlm_xlr_defconfig+1−1

@@ -41,7 +41,7 @@ CONFIG_PCI=y · 40 unmodified lines
41	CONFIG_PCI_MSI=y	41	CONFIG_PCI_MSI=y
42	CONFIG_PCI_DEBUG=y	42	CONFIG_PCI_DEBUG=y
43	CONFIG_BINFMT_MISC=m	43	CONFIG_BINFMT_MISC=m
44	CONFIG_PM_RUNTIME=y	44	CONFIG_PM=y
45	CONFIG_PM_DEBUG=y	45	CONFIG_PM_DEBUG=y
46	CONFIG_NET=y	46	CONFIG_NET=y
47	CONFIG_PACKET=y	47	CONFIG_PACKET=y

arch/powerpc/configs/ps3_defconfig+1−1

@@ -36,7 +36,7 @@ CONFIG_KEXEC=y · 35 unmodified lines
36	CONFIG_SCHED_SMT=y	36	CONFIG_SCHED_SMT=y
37	CONFIG_CMDLINE_BOOL=y	37	CONFIG_CMDLINE_BOOL=y
38	CONFIG_CMDLINE=""	38	CONFIG_CMDLINE=""
39	CONFIG_PM_RUNTIME=y	39	CONFIG_PM=y
40	CONFIG_PM_DEBUG=y	40	CONFIG_PM_DEBUG=y
41	# CONFIG_SECCOMP is not set	41	# CONFIG_SECCOMP is not set
42	# CONFIG_PCI is not set	42	# CONFIG_PCI is not set

arch/sh/Kconfig+1−1

@@ -223,7 +223,7 @@ config CPU_SHX3 · 222 unmodified lines
223	config ARCH_SHMOBILE	223	config ARCH_SHMOBILE
224	bool	224	bool
225	select ARCH_SUSPEND_POSSIBLE	225	select ARCH_SUSPEND_POSSIBLE
226	select PM_RUNTIME	226	select PM
227		227
228	config CPU_HAS_PMU	228	config CPU_HAS_PMU
229	depends on CPU_SH4 \|\| CPU_SH4A	229	depends on CPU_SH4 \|\| CPU_SH4A

arch/sh/configs/apsh4ad0a_defconfig+1−1

@@ -47,7 +47,7 @@ CONFIG_PREEMPT=y · 46 unmodified lines
47	CONFIG_BINFMT_MISC=y	47	CONFIG_BINFMT_MISC=y
48	CONFIG_PM=y	48	CONFIG_PM=y
49	CONFIG_PM_DEBUG=y	49	CONFIG_PM_DEBUG=y
50	CONFIG_PM_RUNTIME=y	50	CONFIG_PM=y
51	CONFIG_CPU_IDLE=y	51	CONFIG_CPU_IDLE=y
52	CONFIG_NET=y	52	CONFIG_NET=y
53	CONFIG_PACKET=y	53	CONFIG_PACKET=y

arch/sh/configs/sdk7786_defconfig+1−1

@@ -82,7 +82,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y · 81 unmodified lines
82	CONFIG_BINFMT_MISC=y	82	CONFIG_BINFMT_MISC=y
83	CONFIG_PM=y	83	CONFIG_PM=y
84	CONFIG_PM_DEBUG=y	84	CONFIG_PM_DEBUG=y
85	CONFIG_PM_RUNTIME=y	85	CONFIG_PM=y
86	CONFIG_CPU_IDLE=y	86	CONFIG_CPU_IDLE=y
87	CONFIG_NET=y	87	CONFIG_NET=y
88	CONFIG_PACKET=y	88	CONFIG_PACKET=y

drivers/usb/host/isp1760-hcd.c+1−1

@@ -1739,7 +1739,7 @@ static int isp1760_hub_status_data(struct usb_hcd hcd, char buf) · 1738 unmodified lines
1739	int retval = 1;	1739	int retval = 1;
1740	unsigned long flags;	1740	unsigned long flags;
1741		1741
1742	/* if !PM_RUNTIME, root hub timers won't get shut down ... */	1742	/* if !PM, root hub timers won't get shut down ... */
1743	if (!HC_IS_RUNNING(hcd->state))	1743	if (!HC_IS_RUNNING(hcd->state))
1744	return 0;	1744	return 0;
1745		1745

drivers/usb/host/oxu210hp-hcd.c+1−1

@@ -3087,7 +3087,7 @@ static int oxu_hub_status_data(struct usb_hcd hcd, char buf) · 3086 unmodified lines
3087	int ports, i, retval = 1;	3087	int ports, i, retval = 1;
3088	unsigned long flags;	3088	unsigned long flags;
3089		3089
3090	/* if !PM_RUNTIME, root hub timers won't get shut down ... */	3090	/* if !PM, root hub timers won't get shut down ... */
3091	if (!HC_IS_RUNNING(hcd->state))	3091	if (!HC_IS_RUNNING(hcd->state))
3092	return 0;	3092	return 0;
3093		3093

include/linux/devfreq.h+1−1

@@ -188,7 +188,7 @@ extern struct devfreq devm_devfreq_add_device(struct device dev, · 187 unmodified lines
188	extern void devm_devfreq_remove_device(struct device *dev,	188	extern void devm_devfreq_remove_device(struct device *dev,
189	struct devfreq *devfreq);	189	struct devfreq *devfreq);
190		190
191	/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */	191	/* Supposed to be called by PM callbacks */
192	extern int devfreq_suspend_device(struct devfreq *devfreq);	192	extern int devfreq_suspend_device(struct devfreq *devfreq);
193	extern int devfreq_resume_device(struct devfreq *devfreq);	193	extern int devfreq_resume_device(struct devfreq *devfreq);
194		194

kernel/power/Kconfig+6−10

 config PM_SLEEP
 	def_bool y
 	depends on SUSPEND || HIBERNATE_CALLBACKS
-	select PM_RUNTIME
+	select PM
 config PM_SLEEP_SMP
 	def_bool y
 	depends on PM_WAKELOCKS
 	default y
-config PM_RUNTIME
+config PM
-	bool "Run-time PM core functionality"
+	bool "Device power management core functionality"
 	---help---
 	  Enable functionality allowing I/O devices to be put into energy-saving
-	  (low power) states at run time (or autosuspended) after a specified
+	  (low power) states, for example after a specified period of inactivity
-	  period of inactivity and woken up in response to a hardware-generated
+	  (autosuspended), and woken up in response to a hardware-generated
 	  wake-up event or a driver's request.
 	  Hardware support is generally required for this functionality to work
 	  and the bus type drivers of the buses the devices are on are
-	  responsible for the actual handling of the autosuspend requests and
+	  responsible for the actual handling of device suspend requests and
 	  wake-up events.
-config PM
-	def_bool y
-	depends on PM_SLEEP || PM_RUNTIME
 config PM_DEBUG
 	bool "Power Management Debug Support"
 	depends on PM