Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105887
b: refs/heads/master
c: f2992db
h: refs/heads/master
i:
  105885: b223aee
  105883: d41fdd4
  105879: 30200a2
  105871: ad26958
  105855: 8eb1b1a
v: v3
  • Loading branch information
Pavel Emelyanov authored and Linus Torvalds committed Jul 25, 2008
1 parent 3ff555e commit 784d34f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7e9abd89cbdf9b73d327d8173343abce9022609b
refs/heads/master: f2992db2a4f7ae10f61d5bc68c7c1528cec639e2
6 changes: 4 additions & 2 deletions trunk/include/linux/res_counter.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ void res_counter_init(struct res_counter *counter);
* counter->limit _locked call expects the counter->lock to be taken
*/

int res_counter_charge_locked(struct res_counter *counter, unsigned long val);
int res_counter_charge(struct res_counter *counter, unsigned long val);
int __must_check res_counter_charge_locked(struct res_counter *counter,
unsigned long val);
int __must_check res_counter_charge(struct res_counter *counter,
unsigned long val);

/*
* uncharge - tell that some portion of the resource is released
Expand Down

0 comments on commit 784d34f

Please sign in to comment.