summaryrefslogtreecommitdiff
path: root/kernel/groups.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-10-13 15:44:24 +0200
committerIngo Molnar <mingo@elte.hu>2010-10-13 15:44:24 +0200
commit3d8a1a6a8af910cc2da566080d111e062a124ba6 (patch)
tree0c78b30a5c7aa083e215222989f982313c5141c0 /kernel/groups.c
parent1b13fe6a6e9986dbc079cbb05090be75edbffa5d (diff)
parent5d0d71569e671239ae0d905ced9b65cd843f99ee (diff)
Merge branch 'amd-iommu/2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'kernel/groups.c')
-rw-r--r--kernel/groups.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/groups.c b/kernel/groups.c
index 53b1916c9492..253dc0f35cf4 100644
--- a/kernel/groups.c
+++ b/kernel/groups.c
@@ -143,10 +143,9 @@ int groups_search(const struct group_info *group_info, gid_t grp)
right = group_info->ngroups;
while (left < right) {
unsigned int mid = (left+right)/2;
- int cmp = grp - GROUP_AT(group_info, mid);
- if (cmp > 0)
+ if (grp > GROUP_AT(group_info, mid))
left = mid + 1;
- else if (cmp < 0)
+ else if (grp < GROUP_AT(group_info, mid))
right = mid;
else
return 1;