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
66 depends on DEBUG_FS
77 select CONSTRUCTORS if !UML
88 default n
9− ---help---
9+ help
1010 This option enables gcov-based code profiling (e.g. for code coverage
1111 measurements).
1212
@@ -42,7 +42,7 @@ config GCOV_PROFILE_ALL · 29 unmodified lines
4242 depends on GCOV_KERNEL
4343 depends on ARCH_HAS_GCOV_PROFILE_ALL
4444 default n
45− ---help---
45+ help
4646 This options activates profiling for the entire kernel.
4747
4848 If unsure, say N.
kernel/irq/Kconfig+2−2
@@ -118,7 +118,7 @@ config IRQ_FORCED_THREADING · 117 unmodified lines
118118
119119 config SPARSE_IRQ
120120 bool "Support sparse irq numbering" if MAY_HAVE_SPARSE_IRQ
121− ---help---
121+ help
122122
123123 Sparse irq numbering is useful for distro kernels that want
124124 to define a high CONFIG_NR_CPUS value but still want to have
@@ -134,7 +134,7 @@ config GENERIC_IRQ_DEBUGFS · 9 unmodified lines
134134 depends on DEBUG_FS
135135 select GENERIC_IRQ_INJECTION
136136 default n
137− ---help---
137+ help
138138
139139 Exposes internal state information through debugfs. Mostly for
140140 developers and debugging of hard to diagnose interrupt problems.
kernel/power/Kconfig+13−13
@@ -3,7 +3,7 @@ config SUSPEND · 2 unmodified lines
33 bool "Suspend to RAM and standby"
44 depends on ARCH_SUSPEND_POSSIBLE
55 default y
6− ---help---
6+ help
77 Allow the system to enter sleep states in which main memory is
88 powered and thus its contents are preserved, such as the
99 suspend-to-RAM state (e.g. the ACPI S3 state).
@@ -42,7 +42,7 @@ config HIBERNATION · 32 unmodified lines
4242 select LZO_COMPRESS
4343 select LZO_DECOMPRESS
4444 select CRC32
45− ---help---
45+ help
4646 Enable the suspend to disk (STD) functionality, which is usually
4747 called "hibernation" in user interfaces. STD checkpoints the
4848 system and powers it off; and restores that checkpoint on reboot.
@@ -84,7 +84,7 @@ config HIBERNATION_SNAPSHOT_DEV · 35 unmodified lines
8484 bool "Userspace snapshot device"
8585 depends on HIBERNATION
8686 default y
87− ---help---
87+ help
8888 Device used by the uswsusp tools.
8989
9090 Say N if no snapshotting from userspace is needed, this also
@@ -96,7 +96,7 @@ config PM_STD_PARTITION · 5 unmodified lines
9696 string "Default resume partition"
9797 depends on HIBERNATION
9898 default ""
99− ---help---
99+ help
100100 The default resume partition is the partition that the suspend-
101101 to-disk implementation will look for a suspended disk image.
102102
@@ -131,7 +131,7 @@ config PM_SLEEP_SMP_NONZERO_CPU · 28 unmodified lines
131131 def_bool y
132132 depends on PM_SLEEP_SMP
133133 depends on ARCH_SUSPEND_NONZERO_CPU
134− ---help---
134+ help
135135 If an arch can suspend (for suspend, hibernate, kexec, etc) on a
136136 non-zero numbered CPU, it may define ARCH_SUSPEND_NONZERO_CPU. This
137137 will allow nohz_full mask to include CPU0.
@@ -140,7 +140,7 @@ config PM_AUTOSLEEP · 2 unmodified lines
140140 bool "Opportunistic sleep"
141141 depends on PM_SLEEP
142142 default n
143− ---help---
143+ help
144144 Allow the kernel to trigger a system transition into a global sleep
145145 state automatically whenever there are no active wakeup sources.
146146
@@ -148,7 +148,7 @@ config PM_WAKELOCKS · 1 unmodified line
148148 bool "User space wakeup sources interface"
149149 depends on PM_SLEEP
150150 default n
151− ---help---
151+ help
152152 Allow user space to create, activate and deactivate wakeup source
153153 objects with the help of a sysfs-based interface.
154154
@@ -165,7 +165,7 @@ config PM_WAKELOCKS_GC · 10 unmodified lines
165165
166166 config PM
167167 bool "Device power management core functionality"
168− ---help---
168+ help
169169 Enable functionality allowing I/O devices to be put into energy-saving
170170 (low power) states, for example after a specified period of inactivity
171171 (autosuspended), and woken up in response to a hardware-generated
@@ -179,7 +179,7 @@ config PM · 7 unmodified lines
179179 config PM_DEBUG
180180 bool "Power Management Debug Support"
181181 depends on PM
182− ---help---
182+ help
183183 This option enables various debugging support in the Power Management
184184 code. This is helpful when debugging and reporting PM bugs, like
185185 suspend support.
@@ -187,7 +187,7 @@ config PM_DEBUG · 1 unmodified line
187187 config PM_ADVANCED_DEBUG
188188 bool "Extra PM attributes in sysfs for low-level debugging/testing"
189189 depends on PM_DEBUG
190− ---help---
190+ help
191191 Add extra sysfs attributes allowing one to access some Power Management
192192 fields of device objects from user space. If you are not a kernel
193193 developer interested in debugging/testing Power Management, say "no".
@@ -195,7 +195,7 @@ config PM_ADVANCED_DEBUG · 1 unmodified line
195195 config PM_TEST_SUSPEND
196196 bool "Test suspend/resume and wakealarm during bootup"
197197 depends on SUSPEND && PM_DEBUG && RTC_CLASS=y
198− ---help---
198+ help
199199 This option will let you suspend your machine during bootup, and
200200 make it wake up a few seconds later using an RTC wakeup alarm.
201201 Enable this with a kernel parameter like "test_suspend=mem".
@@ -210,7 +210,7 @@ config PM_SLEEP_DEBUG · 8 unmodified lines
210210 config DPM_WATCHDOG
211211 bool "Device suspend/resume watchdog"
212212 depends on PM_DEBUG && PSTORE && EXPERT
213− ---help---
213+ help
214214 Sets up a watchdog timer to capture drivers that are
215215 locked up attempting to suspend/resume a device.
216216 A detected lockup causes system panic with message
@@ -243,7 +243,7 @@ config PM_TRACE_RTC · 26 unmodified lines
243243 depends on PM_SLEEP_DEBUG
244244 depends on X86
245245 select PM_TRACE
246− ---help---
246+ help
247247 This enables some cheesy code to save the last PM event point in the
248248 RTC across reboots, so that you can debug a machine that just hangs
249249 during suspend (or more commonly, during resume).