Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45850
b: refs/heads/master
c: 45f8bde
h: refs/heads/master
v: v3
  • Loading branch information
Robert P. J. Day authored and Linus Torvalds committed Jan 26, 2007
1 parent 986e31d commit f5431ac
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a8d814b5dd7a1bc5c19ae32d35b8bd4d8a510eae
refs/heads/master: 45f8bde0d0d6deb168b45998c72b4fbeb2f57efb
6 changes: 2 additions & 4 deletions trunk/include/linux/bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ static inline unsigned long hweight_long(unsigned long w)
return sizeof(w) == 4 ? hweight32(w) : hweight64(w);
}

/*
/**
* rol32 - rotate a 32-bit value left
*
* @word: value to rotate
* @shift: bits to roll
*/
Expand All @@ -42,9 +41,8 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
return (word << shift) | (word >> (32 - shift));
}

/*
/**
* ror32 - rotate a 32-bit value right
*
* @word: value to rotate
* @shift: bits to roll
*/
Expand Down
10 changes: 5 additions & 5 deletions trunk/include/linux/list.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,13 @@ static inline void list_replace_init(struct list_head *old,
INIT_LIST_HEAD(old);
}

/*
/**
* list_replace_rcu - replace old entry by new one
* @old : the element to be replaced
* @new : the new element to insert
*
* The old entry will be replaced with the new entry atomically.
* Note: 'old' should not be empty.
* The @old entry will be replaced with the @new entry atomically.
* Note: @old should not be empty.
*/
static inline void list_replace_rcu(struct list_head *old,
struct list_head *new)
Expand Down Expand Up @@ -680,12 +680,12 @@ static inline void hlist_del_init(struct hlist_node *n)
}
}

/*
/**
* hlist_replace_rcu - replace old entry by new one
* @old : the element to be replaced
* @new : the new element to insert
*
* The old entry will be replaced with the new entry atomically.
* The @old entry will be replaced with the @new entry atomically.
*/
static inline void hlist_replace_rcu(struct hlist_node *old,
struct hlist_node *new)
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/mutex.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ do { \
extern void __mutex_init(struct mutex *lock, const char *name,
struct lock_class_key *key);

/***
/**
* mutex_is_locked - is the mutex locked
* @lock: the mutex to be queried
*
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/linux/rtmutex.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <linux/plist.h>
#include <linux/spinlock_types.h>

/*
/**
* The rt_mutex structure
*
* @wait_lock: spinlock to protect the structure
Expand Down Expand Up @@ -71,7 +71,7 @@ struct hrtimer_sleeper;
#define DEFINE_RT_MUTEX(mutexname) \
struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname)

/***
/**
* rt_mutex_is_locked - is the mutex locked
* @lock: the mutex to be queried
*
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/linux/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static inline void setup_timer(struct timer_list * timer,
init_timer(timer);
}

/***
/**
* timer_pending - is a timer pending?
* @timer: the timer in question
*
Expand All @@ -63,7 +63,7 @@ extern int mod_timer(struct timer_list *timer, unsigned long expires);

extern unsigned long next_timer_interrupt(void);

/***
/**
* add_timer - start a timer
* @timer: the timer to be added
*
Expand Down

0 comments on commit f5431ac

Please sign in to comment.