diff options
-rw-r--r-- | kernel/audit.c | 2 | ||||
-rw-r--r-- | kernel/irq/proc.c | 2 | ||||
-rw-r--r-- | kernel/rcutorture.c | 2 | ||||
-rw-r--r-- | kernel/timer.c | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 32fa03ad198..d13ab7d2d89 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -267,7 +267,7 @@ static int audit_set_failure(int state, uid_t loginuid) return old; } -int kauditd_thread(void *dummy) +static int kauditd_thread(void *dummy) { struct sk_buff *skb; diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c index 8a64a4844cd..d03b5eef8ce 100644 --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c @@ -10,6 +10,8 @@ #include <linux/proc_fs.h> #include <linux/interrupt.h> +#include "internals.h" + static struct proc_dir_entry *root_irq_dir, *irq_dir[NR_IRQS]; #ifdef CONFIG_SMP diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c index 49fbbeff201..36efe088ad8 100644 --- a/kernel/rcutorture.c +++ b/kernel/rcutorture.c @@ -103,7 +103,7 @@ atomic_t n_rcu_torture_error; /* * Allocate an element from the rcu_tortures pool. */ -struct rcu_torture * +static struct rcu_torture * rcu_torture_alloc(void) { struct list_head *p; diff --git a/kernel/timer.c b/kernel/timer.c index fd74268d866..074b4bd5cfd 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -33,6 +33,7 @@ #include <linux/posix-timers.h> #include <linux/cpu.h> #include <linux/syscalls.h> +#include <linux/delay.h> #include <asm/uaccess.h> #include <asm/unistd.h> |