Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b002cdd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e255aee5 f26621e6

include/linux/nmi.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -119,6 +119,8 @@ static inline int hardlockup_detector_perf_init(void) { return 0; } 
void watchdog_nmi_stop(void);

void watchdog_nmi_stop(void);

void watchdog_nmi_start(void);

void watchdog_nmi_start(void);

int watchdog_nmi_probe(void);

int watchdog_nmi_probe(void);

int watchdog_nmi_enable(unsigned int cpu);

void watchdog_nmi_disable(unsigned int cpu);





/**

/**

 * touch_nmi_watchdog - restart NMI watchdog timeout.

 * touch_nmi_watchdog - restart NMI watchdog timeout.

kernel/resource.c

+14 −5
Original line number Original line Diff line number Diff line
@@ -319,16 +319,23 @@ int release_resource(struct resource *old) 
EXPORT_SYMBOL(release_resource);

EXPORT_SYMBOL(release_resource);





/**

/**

 * Finds the lowest iomem resource that covers part of [start..end].  The

 * Finds the lowest iomem resource that covers part of [@start..@end].  The

 * caller must specify start, end, flags, and desc (which may be

 * caller must specify @start, @end, @flags, and @desc (which may be

 * IORES_DESC_NONE).

 * IORES_DESC_NONE).

 *

 *

 * If a resource is found, returns 0 and *res is overwritten with the part

 * If a resource is found, returns 0 and @*res is overwritten with the part

 * of the resource that's within [start..end]; if none is found, returns

 * of the resource that's within [@start..@end]; if none is found, returns

 * -1.

 * -1 or -EINVAL for other invalid parameters.

 *

 *

 * This function walks the whole tree and not just first level children

 * This function walks the whole tree and not just first level children

 * unless @first_lvl is true.

 * unless @first_lvl is true.

 *

 * @start:	start address of the resource searched for

 * @end:	end address of same resource

 * @flags:	flags which the resource must have

 * @desc:	descriptor the resource must have

 * @first_lvl:	walk only the first level children, if set

 * @res:	return ptr, if resource found

 */

 */

static int find_next_iomem_res(resource_size_t start, resource_size_t end,

static int find_next_iomem_res(resource_size_t start, resource_size_t end,

			       unsigned long flags, unsigned long desc,

			       unsigned long flags, unsigned long desc,
@@ -399,6 +406,8 @@ static int __walk_iomem_res_desc(resource_size_t start, resource_size_t end, 
 * @flags: I/O resource flags

 * @flags: I/O resource flags

 * @start: start addr

 * @start: start addr

 * @end: end addr

 * @end: end addr

 * @arg: function argument for the callback @func

 * @func: callback function that is called for each qualifying resource area

 *

 *

 * NOTE: For a new descriptor search, define a new IORES_DESC in

 * NOTE: For a new descriptor search, define a new IORES_DESC in

 * <linux/ioport.h> and set it in 'desc' of a target resource entry.

 * <linux/ioport.h> and set it in 'desc' of a target resource entry.