xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source 
Manual merge of:
	drivers/char/hvc_console.c
	drivers/char/hvc_console.h
This commit is contained in:
Benjamin Herrenschmidt
2010-02-26 14:41:00 +11:00
parent 071c06cb57 6ebdc661b6
commit 874f2f997d
286 changed files with 8635 additions and 3381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/idr.c
View File

@@ -156,10 +156,12 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
/* if already at the top layer, we need to grow */
if (!(p = pa[l])) {
if (id >= 1 << (idp->layers * IDR_BITS)) {
*starting_id = id;
return IDR_NEED_TO_GROW;
}
p = pa[l];
BUG_ON(!p);
/* If we need to go up one layer, continue the
* loop; otherwise, restart from the top.