tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull core fixes from Thomas Gleixner:
"A couple of fixlets for the core:

- Kernel doc function documentation fixes

- Missing prototypes for weak watchdog functions"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
resource/docs: Complete kernel-doc style function documentation
watchdog/core: Add missing prototypes for weak functions
resource/docs: Fix new kernel-doc warnings

Linus Torvalds 0b002cdd e255aee5

+16 -5
+2
include/linux/nmi.h
··· 119 119 void watchdog_nmi_stop(void); 120 120 void watchdog_nmi_start(void); 121 121 int watchdog_nmi_probe(void); 122 + int watchdog_nmi_enable(unsigned int cpu); 123 + void watchdog_nmi_disable(unsigned int cpu); 122 124 123 125 /** 124 126 * touch_nmi_watchdog - restart NMI watchdog timeout.
+14 -5
kernel/resource.c
··· 319 319 EXPORT_SYMBOL(release_resource); 320 320 321 321 /** 322 - * Finds the lowest iomem resource that covers part of [start..end]. The 323 - * caller must specify start, end, flags, and desc (which may be 322 + * Finds the lowest iomem resource that covers part of [@start..@end]. The 323 + * caller must specify @start, @end, @flags, and @desc (which may be 324 324 * IORES_DESC_NONE). 325 325 * 326 - * If a resource is found, returns 0 and *res is overwritten with the part 327 - * of the resource that's within [start..end]; if none is found, returns 328 - * -1. 326 + * If a resource is found, returns 0 and @*res is overwritten with the part 327 + * of the resource that's within [@start..@end]; if none is found, returns 328 + * -1 or -EINVAL for other invalid parameters. 329 329 * 330 330 * This function walks the whole tree and not just first level children 331 331 * unless @first_lvl is true. 332 + * 333 + * @start: start address of the resource searched for 334 + * @end: end address of same resource 335 + * @flags: flags which the resource must have 336 + * @desc: descriptor the resource must have 337 + * @first_lvl: walk only the first level children, if set 338 + * @res: return ptr, if resource found 332 339 */ 333 340 static int find_next_iomem_res(resource_size_t start, resource_size_t end, 334 341 unsigned long flags, unsigned long desc, ··· 406 399 * @flags: I/O resource flags 407 400 * @start: start addr 408 401 * @end: end addr 402 + * @arg: function argument for the callback @func 403 + * @func: callback function that is called for each qualifying resource area 409 404 * 410 405 * NOTE: For a new descriptor search, define a new IORES_DESC in 411 406 * <linux/ioport.h> and set it in 'desc' of a target resource entry.