git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
include
/
linux
/
idr.h
diff --git
a/include/linux/idr.h
b/include/linux/idr.h
index
8860752
..
928ae71
100644
(file)
--- a/
include/linux/idr.h
+++ b/
include/linux/idr.h
@@
-50,14
+50,14
@@
struct idr_layer {
unsigned long bitmap; /* A zero bit means "space here" */
struct idr_layer {
unsigned long bitmap; /* A zero bit means "space here" */
- struct idr_layer
*ary[1<<IDR_BITS];
+ struct idr_layer
__rcu
*ary[1<<IDR_BITS];
int count; /* When zero, we can release it */
int layer; /* distance from leaf */
struct rcu_head rcu_head;
};
struct idr {
int count; /* When zero, we can release it */
int layer; /* distance from leaf */
struct rcu_head rcu_head;
};
struct idr {
- struct idr_layer *top;
+ struct idr_layer
__rcu
*top;
struct idr_layer *id_free;
int layers; /* only valid without concurrent changes */
int id_free_cnt;
struct idr_layer *id_free;
int layers; /* only valid without concurrent changes */
int id_free_cnt;