aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2013-07-05 13:18:26 -0400
committerGlenn Elliott <gelliott@cs.unc.edu>2013-07-05 13:18:26 -0400
commitb43e13d9190a165cd3a8b8e9e7221eb2a9cc73d7 (patch)
tree5d053102b8d3046b22e17d830607e244f4b63e5d
parentc1f183501ce70a510a4d9ab98595500904f33705 (diff)
make it compilepgm
-rw-r--r--kernel/mutex.c2
-rw-r--r--litmus/ftdev.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c
index ff56dc04f648..e980a5b64227 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -24,6 +24,8 @@
24#include <linux/interrupt.h> 24#include <linux/interrupt.h>
25#include <linux/debug_locks.h> 25#include <linux/debug_locks.h>
26 26
27#include <litmus/litmus.h>
28
27/* 29/*
28 * In the DEBUG case we are using the "NULL fastpath" for mutexes, 30 * In the DEBUG case we are using the "NULL fastpath" for mutexes,
29 * which forces all calls into the slowpath: 31 * which forces all calls into the slowpath:
diff --git a/litmus/ftdev.c b/litmus/ftdev.c
index 7126c61e8b4c..bd64287e4467 100644
--- a/litmus/ftdev.c
+++ b/litmus/ftdev.c
@@ -16,7 +16,6 @@ struct ft_buffer* alloc_ft_buffer(unsigned int count, size_t size)
16 struct ft_buffer* buf; 16 struct ft_buffer* buf;
17 size_t total = (size + 1) * count; 17 size_t total = (size + 1) * count;
18 char* mem; 18 char* mem;
19 int order = 0, pages = 1;
20 19
21 buf = kmalloc(sizeof(*buf), GFP_KERNEL); 20 buf = kmalloc(sizeof(*buf), GFP_KERNEL);
22 if (!buf) 21 if (!buf)
@@ -42,9 +41,6 @@ struct ft_buffer* alloc_ft_buffer(unsigned int count, size_t size)
42 41
43void free_ft_buffer(struct ft_buffer* buf) 42void free_ft_buffer(struct ft_buffer* buf)
44{ 43{
45 int order = 0, pages = 1;
46 size_t total;
47
48 if (buf) { 44 if (buf) {
49 vfree(buf->buffer_mem); 45 vfree(buf->buffer_mem);
50 kfree(buf); 46 kfree(buf);