Skip to content

Commit 05fb6bf

Browse files
rddunlapLinus Torvalds
authored andcommitted
[PATCH] kernel-doc fixes for 2.6.20-git15 (non-drivers)
Fix kernel-doc warnings in 2.6.20-git15 (lib/, mm/, kernel/, include/). Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 328d244 commit 05fb6bf

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

include/linux/hrtimer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ struct hrtimer_sleeper {
140140

141141
/**
142142
* struct hrtimer_base - the timer base for a specific clock
143+
* @cpu_base: per cpu clock base
143144
* @index: clock type index for per_cpu support when moving a
144145
* timer to a base on another cpu.
145146
* @active: red black tree root node for the active timers

kernel/relay.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,13 +474,12 @@ static void setup_callbacks(struct rchan *chan,
474474
}
475475

476476
/**
477-
*
478477
* relay_hotcpu_callback - CPU hotplug callback
479478
* @nb: notifier block
480479
* @action: hotplug action to take
481480
* @hcpu: CPU number
482481
*
483-
* Returns the success/failure of the operation. (NOTIFY_OK, NOTIFY_BAD)
482+
* Returns the success/failure of the operation. (%NOTIFY_OK, %NOTIFY_BAD)
484483
*/
485484
static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb,
486485
unsigned long action,

kernel/timer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,7 @@ static unsigned long cmp_next_hrtimer_event(unsigned long now,
711711

712712
/**
713713
* next_timer_interrupt - return the jiffy of the next pending timer
714+
* @now: current time (in jiffies)
714715
*/
715716
unsigned long get_next_timer_interrupt(unsigned long now)
716717
{

lib/bitmap.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ EXPORT_SYMBOL(__bitmap_complement);
9797

9898
/**
9999
* __bitmap_shift_right - logical right shift of the bits in a bitmap
100-
* @dst - destination bitmap
101-
* @src - source bitmap
102-
* @nbits - shift by this many bits
103-
* @bits - bitmap size, in bits
100+
* @dst : destination bitmap
101+
* @src : source bitmap
102+
* @shift : shift by this many bits
103+
* @bits : bitmap size, in bits
104104
*
105105
* Shifting right (dividing) means moving bits in the MS -> LS bit
106106
* direction. Zeros are fed into the vacated MS positions and the
@@ -141,10 +141,10 @@ EXPORT_SYMBOL(__bitmap_shift_right);
141141

142142
/**
143143
* __bitmap_shift_left - logical left shift of the bits in a bitmap
144-
* @dst - destination bitmap
145-
* @src - source bitmap
146-
* @nbits - shift by this many bits
147-
* @bits - bitmap size, in bits
144+
* @dst : destination bitmap
145+
* @src : source bitmap
146+
* @shift : shift by this many bits
147+
* @bits : bitmap size, in bits
148148
*
149149
* Shifting left (multiplying) means moving bits in the LS -> MS
150150
* direction. Zeros are fed into the vacated LS bit positions

mm/slab.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4026,7 +4026,7 @@ void drain_array(struct kmem_cache *cachep, struct kmem_list3 *l3,
40264026

40274027
/**
40284028
* cache_reap - Reclaim memory from caches.
4029-
* @unused: unused parameter
4029+
* @w: work descriptor
40304030
*
40314031
* Called from workqueue/eventd every few seconds.
40324032
* Purpose:

0 commit comments

Comments
 (0)