diff options
| author | Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
| commit | 41be702a542a0d14bb0b1c16e824fa9ed27616ec (patch) | |
| tree | e48942a05882da47544e179c6a0c920e00137a6a /samples/kfifo/bytestream-example.c | |
| parent | 8ed814602876bec9bad2649ca17f34b499357a1c (diff) | |
| parent | d8ec26d7f8287f5788a494f56e8814210f0e64be (diff) | |
Merge tag 'v3.13' into next
Linux 3.13
Minor fixup needed in selinux_inet_conn_request()
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'samples/kfifo/bytestream-example.c')
| -rw-r--r-- | samples/kfifo/bytestream-example.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/kfifo/bytestream-example.c b/samples/kfifo/bytestream-example.c index cfe40addda76..2fca916d9edf 100644 --- a/samples/kfifo/bytestream-example.c +++ b/samples/kfifo/bytestream-example.c @@ -64,7 +64,7 @@ static int __init testfunc(void) /* put values into the fifo */ for (i = 0; i != 10; i++) - kfifo_put(&test, &i); + kfifo_put(&test, i); /* show the number of used elements */ printk(KERN_INFO "fifo len: %u\n", kfifo_len(&test)); @@ -85,7 +85,7 @@ static int __init testfunc(void) kfifo_skip(&test); /* put values into the fifo until is full */ - for (i = 20; kfifo_put(&test, &i); i++) + for (i = 20; kfifo_put(&test, i); i++) ; printk(KERN_INFO "queue len: %u\n", kfifo_len(&test)); |