diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-11 13:26:50 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-11 13:26:50 -0400 |
| commit | ad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5 (patch) | |
| tree | 2565121e4b9945d953e02c77a2e53065b3789aa4 /kernel/groups.c | |
| parent | 86c8c04792f152c5469023885510140dd34817bc (diff) | |
| parent | c7a27aa4652c63172489a73f3961455650a79a7f (diff) | |
Merge branch 'oprofile/urgent' (early part) into oprofile/perf
Diffstat (limited to 'kernel/groups.c')
| -rw-r--r-- | kernel/groups.c | 5 |
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) | |||
| 143 | right = group_info->ngroups; | 143 | right = group_info->ngroups; |
| 144 | while (left < right) { | 144 | while (left < right) { |
| 145 | unsigned int mid = (left+right)/2; | 145 | unsigned int mid = (left+right)/2; |
| 146 | int cmp = grp - GROUP_AT(group_info, mid); | 146 | if (grp > GROUP_AT(group_info, mid)) |
| 147 | if (cmp > 0) | ||
| 148 | left = mid + 1; | 147 | left = mid + 1; |
| 149 | else if (cmp < 0) | 148 | else if (grp < GROUP_AT(group_info, mid)) |
| 150 | right = mid; | 149 | right = mid; |
| 151 | else | 150 | else |
| 152 | return 1; | 151 | return 1; |
