diff options
author | Colin Cross <ccross@android.com> | 2013-03-13 17:16:02 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2013-03-13 17:16:02 -0700 |
commit | 0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f (patch) | |
tree | 9bab760a750d9cf4504d92603ee7fc82beeb2e38 /lib | |
parent | a276def548828763cf5ac228adf8c1ca73f8d4d3 (diff) | |
parent | e28c3f2b514b5581e15614f7cf976131092cf4b6 (diff) | |
download | kernel_samsung_tuna-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.zip kernel_samsung_tuna-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.gz kernel_samsung_tuna-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.bz2 |
Merge tag 'v3.0.68' into android-3.0
This is the 3.0.68 stable release
Conflicts:
kernel/cgroup.c
Change-Id: I067982d25e18e3a12de93a5eb6429b8829d7ca11
Diffstat (limited to 'lib')
-rw-r--r-- | lib/idr.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -621,7 +621,14 @@ void *idr_get_next(struct idr *idp, int *nextidp) return p; } - id += 1 << n; + /* + * Proceed to the next layer at the current level. Unlike + * idr_for_each(), @id isn't guaranteed to be aligned to + * layer boundary at this point and adding 1 << n may + * incorrectly skip IDs. Make sure we jump to the + * beginning of the next layer using round_up(). + */ + id = round_up(id + 1, 1 << n); while (n < fls(id)) { n += IDR_BITS; p = *--paa; |