History

Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull more Kbuild updates from Masahiro Yamada: - fix build rules in binderfs sample - fix build errors when Kbuild recurses to the top Makefile - covert '---help---' in Kconfig to 'help' * tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: treewide: replace '---help---' in Kconfig files with 'help' kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables samples: binderfs: really compile this sample and fix build issues

Linus Torvalds committed 6 years ago

Commit 6adc19f2 parents 3df83e1 a7f7f62439 files · +2473 −2489Browse files

Showing the changes to kernel (3 of 439 files). Show all

Unified · Split

3 files
  1. kernel/gcov/Kconfig +2 −2
  2. kernel/irq/Kconfig +2 −2
  3. kernel/power/Kconfig +13 −13
kernel/gcov/Kconfig+2−2
@@ -6,7 +6,7 @@ config GCOV_KERNEL · 5 unmodified lines
6 depends on DEBUG_FS6 depends on DEBUG_FS
7 select CONSTRUCTORS if !UML7 select CONSTRUCTORS if !UML
8 default n8 default n
9 ---help---9 help
10 This option enables gcov-based code profiling (e.g. for code coverage10 This option enables gcov-based code profiling (e.g. for code coverage
11 measurements).11 measurements).
12 12
@@ -42,7 +42,7 @@ config GCOV_PROFILE_ALL · 29 unmodified lines
42 depends on GCOV_KERNEL42 depends on GCOV_KERNEL
43 depends on ARCH_HAS_GCOV_PROFILE_ALL43 depends on ARCH_HAS_GCOV_PROFILE_ALL
44 default n44 default n
45 ---help---45 help
46 This options activates profiling for the entire kernel.46 This options activates profiling for the entire kernel.
47 47
48 If unsure, say N.48 If unsure, say N.
kernel/irq/Kconfig+2−2
@@ -118,7 +118,7 @@ config IRQ_FORCED_THREADING · 117 unmodified lines
118 118
119config SPARSE_IRQ119config SPARSE_IRQ
120 bool "Support sparse irq numbering" if MAY_HAVE_SPARSE_IRQ120 bool "Support sparse irq numbering" if MAY_HAVE_SPARSE_IRQ
121 ---help---121 help
122 122
123 Sparse irq numbering is useful for distro kernels that want123 Sparse irq numbering is useful for distro kernels that want
124 to define a high CONFIG_NR_CPUS value but still want to have124 to define a high CONFIG_NR_CPUS value but still want to have
@@ -134,7 +134,7 @@ config GENERIC_IRQ_DEBUGFS · 9 unmodified lines
134 depends on DEBUG_FS134 depends on DEBUG_FS
135 select GENERIC_IRQ_INJECTION135 select GENERIC_IRQ_INJECTION
136 default n136 default n
137 ---help---137 help
138 138
139 Exposes internal state information through debugfs. Mostly for139 Exposes internal state information through debugfs. Mostly for
140 developers and debugging of hard to diagnose interrupt problems.140 developers and debugging of hard to diagnose interrupt problems.
kernel/power/Kconfig+13−13
@@ -3,7 +3,7 @@ config SUSPEND · 2 unmodified lines
3 bool "Suspend to RAM and standby"3 bool "Suspend to RAM and standby"
4 depends on ARCH_SUSPEND_POSSIBLE4 depends on ARCH_SUSPEND_POSSIBLE
5 default y5 default y
6 ---help---6 help
7 Allow the system to enter sleep states in which main memory is7 Allow the system to enter sleep states in which main memory is
8 powered and thus its contents are preserved, such as the8 powered and thus its contents are preserved, such as the
9 suspend-to-RAM state (e.g. the ACPI S3 state).9 suspend-to-RAM state (e.g. the ACPI S3 state).
@@ -42,7 +42,7 @@ config HIBERNATION · 32 unmodified lines
42 select LZO_COMPRESS42 select LZO_COMPRESS
43 select LZO_DECOMPRESS43 select LZO_DECOMPRESS
44 select CRC3244 select CRC32
45 ---help---45 help
46 Enable the suspend to disk (STD) functionality, which is usually46 Enable the suspend to disk (STD) functionality, which is usually
47 called "hibernation" in user interfaces. STD checkpoints the47 called "hibernation" in user interfaces. STD checkpoints the
48 system and powers it off; and restores that checkpoint on reboot.48 system and powers it off; and restores that checkpoint on reboot.
@@ -84,7 +84,7 @@ config HIBERNATION_SNAPSHOT_DEV · 35 unmodified lines
84 bool "Userspace snapshot device"84 bool "Userspace snapshot device"
85 depends on HIBERNATION85 depends on HIBERNATION
86 default y86 default y
87 ---help---87 help
88 Device used by the uswsusp tools.88 Device used by the uswsusp tools.
89 89
90 Say N if no snapshotting from userspace is needed, this also90 Say N if no snapshotting from userspace is needed, this also
@@ -96,7 +96,7 @@ config PM_STD_PARTITION · 5 unmodified lines
96 string "Default resume partition"96 string "Default resume partition"
97 depends on HIBERNATION97 depends on HIBERNATION
98 default ""98 default ""
99 ---help---99 help
100 The default resume partition is the partition that the suspend-100 The default resume partition is the partition that the suspend-
101 to-disk implementation will look for a suspended disk image. 101 to-disk implementation will look for a suspended disk image.
102 102
@@ -131,7 +131,7 @@ config PM_SLEEP_SMP_NONZERO_CPU · 28 unmodified lines
131 def_bool y131 def_bool y
132 depends on PM_SLEEP_SMP132 depends on PM_SLEEP_SMP
133 depends on ARCH_SUSPEND_NONZERO_CPU133 depends on ARCH_SUSPEND_NONZERO_CPU
134 ---help---134 help
135 If an arch can suspend (for suspend, hibernate, kexec, etc) on a135 If an arch can suspend (for suspend, hibernate, kexec, etc) on a
136 non-zero numbered CPU, it may define ARCH_SUSPEND_NONZERO_CPU. This136 non-zero numbered CPU, it may define ARCH_SUSPEND_NONZERO_CPU. This
137 will allow nohz_full mask to include CPU0.137 will allow nohz_full mask to include CPU0.
@@ -140,7 +140,7 @@ config PM_AUTOSLEEP · 2 unmodified lines
140 bool "Opportunistic sleep"140 bool "Opportunistic sleep"
141 depends on PM_SLEEP141 depends on PM_SLEEP
142 default n142 default n
143 ---help---143 help
144 Allow the kernel to trigger a system transition into a global sleep144 Allow the kernel to trigger a system transition into a global sleep
145 state automatically whenever there are no active wakeup sources.145 state automatically whenever there are no active wakeup sources.
146 146
@@ -148,7 +148,7 @@ config PM_WAKELOCKS · 1 unmodified line
148 bool "User space wakeup sources interface"148 bool "User space wakeup sources interface"
149 depends on PM_SLEEP149 depends on PM_SLEEP
150 default n150 default n
151 ---help---151 help
152 Allow user space to create, activate and deactivate wakeup source152 Allow user space to create, activate and deactivate wakeup source
153 objects with the help of a sysfs-based interface.153 objects with the help of a sysfs-based interface.
154 154
@@ -165,7 +165,7 @@ config PM_WAKELOCKS_GC · 10 unmodified lines
165 165
166config PM166config PM
167 bool "Device power management core functionality"167 bool "Device power management core functionality"
168 ---help---168 help
169 Enable functionality allowing I/O devices to be put into energy-saving169 Enable functionality allowing I/O devices to be put into energy-saving
170 (low power) states, for example after a specified period of inactivity170 (low power) states, for example after a specified period of inactivity
171 (autosuspended), and woken up in response to a hardware-generated171 (autosuspended), and woken up in response to a hardware-generated
@@ -179,7 +179,7 @@ config PM · 7 unmodified lines
179config PM_DEBUG179config PM_DEBUG
180 bool "Power Management Debug Support"180 bool "Power Management Debug Support"
181 depends on PM181 depends on PM
182 ---help---182 help
183 This option enables various debugging support in the Power Management183 This option enables various debugging support in the Power Management
184 code. This is helpful when debugging and reporting PM bugs, like184 code. This is helpful when debugging and reporting PM bugs, like
185 suspend support.185 suspend support.
@@ -187,7 +187,7 @@ config PM_DEBUG · 1 unmodified line
187config PM_ADVANCED_DEBUG187config PM_ADVANCED_DEBUG
188 bool "Extra PM attributes in sysfs for low-level debugging/testing"188 bool "Extra PM attributes in sysfs for low-level debugging/testing"
189 depends on PM_DEBUG189 depends on PM_DEBUG
190 ---help---190 help
191 Add extra sysfs attributes allowing one to access some Power Management191 Add extra sysfs attributes allowing one to access some Power Management
192 fields of device objects from user space. If you are not a kernel192 fields of device objects from user space. If you are not a kernel
193 developer interested in debugging/testing Power Management, say "no".193 developer interested in debugging/testing Power Management, say "no".
@@ -195,7 +195,7 @@ config PM_ADVANCED_DEBUG · 1 unmodified line
195config PM_TEST_SUSPEND195config PM_TEST_SUSPEND
196 bool "Test suspend/resume and wakealarm during bootup"196 bool "Test suspend/resume and wakealarm during bootup"
197 depends on SUSPEND && PM_DEBUG && RTC_CLASS=y197 depends on SUSPEND && PM_DEBUG && RTC_CLASS=y
198 ---help---198 help
199 This option will let you suspend your machine during bootup, and199 This option will let you suspend your machine during bootup, and
200 make it wake up a few seconds later using an RTC wakeup alarm.200 make it wake up a few seconds later using an RTC wakeup alarm.
201 Enable this with a kernel parameter like "test_suspend=mem".201 Enable this with a kernel parameter like "test_suspend=mem".
@@ -210,7 +210,7 @@ config PM_SLEEP_DEBUG · 8 unmodified lines
210config DPM_WATCHDOG210config DPM_WATCHDOG
211 bool "Device suspend/resume watchdog"211 bool "Device suspend/resume watchdog"
212 depends on PM_DEBUG && PSTORE && EXPERT212 depends on PM_DEBUG && PSTORE && EXPERT
213 ---help---213 help
214 Sets up a watchdog timer to capture drivers that are214 Sets up a watchdog timer to capture drivers that are
215 locked up attempting to suspend/resume a device.215 locked up attempting to suspend/resume a device.
216 A detected lockup causes system panic with message216 A detected lockup causes system panic with message
@@ -243,7 +243,7 @@ config PM_TRACE_RTC · 26 unmodified lines
243 depends on PM_SLEEP_DEBUG243 depends on PM_SLEEP_DEBUG
244 depends on X86244 depends on X86
245 select PM_TRACE245 select PM_TRACE
246 ---help---246 help
247 This enables some cheesy code to save the last PM event point in the247 This enables some cheesy code to save the last PM event point in the
248 RTC across reboots, so that you can debug a machine that just hangs248 RTC across reboots, so that you can debug a machine that just hangs
249 during suspend (or more commonly, during resume).249 during suspend (or more commonly, during resume).