Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 209669
b: refs/heads/master
c: b35de43
h: refs/heads/master
i:
  209667: aa18855
v: v3
  • Loading branch information
Andrea Righi authored and Linus Torvalds committed Aug 20, 2010
1 parent 17fb628 commit 91348d4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c81476df1b4241aefba4ff83a7701b3a926bd7ce
refs/heads/master: b35de43b31040828f83046f40fd34ba33146409d
2 changes: 2 additions & 0 deletions trunk/include/linux/kfifo.h
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,8 @@ extern void __kfifo_dma_out_finish_r(struct __kfifo *fifo, size_t recsize);

extern unsigned int __kfifo_len_r(struct __kfifo *fifo, size_t recsize);

extern void __kfifo_skip_r(struct __kfifo *fifo, size_t recsize);

extern unsigned int __kfifo_out_peek_r(struct __kfifo *fifo,
void *buf, unsigned int len, size_t recsize);

Expand Down
9 changes: 9 additions & 0 deletions trunk/kernel/kfifo.c
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,15 @@ unsigned int __kfifo_out_r(struct __kfifo *fifo, void *buf,
}
EXPORT_SYMBOL(__kfifo_out_r);

void __kfifo_skip_r(struct __kfifo *fifo, size_t recsize)
{
unsigned int n;

n = __kfifo_peek_n(fifo, recsize);
fifo->out += n + recsize;
}
EXPORT_SYMBOL(__kfifo_skip_r);

int __kfifo_from_user_r(struct __kfifo *fifo, const void __user *from,
unsigned long len, unsigned int *copied, size_t recsize)
{
Expand Down

0 comments on commit 91348d4

Please sign in to comment.