From 604b514b261b42b68fc3fd88b92a09feb786b319 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Sun, 8 Jan 2006 01:02:17 -0800
Subject: [PATCH] --- yaml --- r: 16928 b: refs/heads/master c:
 97a41e26124330e41aa10ef88cd1711bc3d17460 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/audit.c      | 2 +-
 trunk/kernel/irq/proc.c   | 2 ++
 trunk/kernel/rcutorture.c | 2 +-
 trunk/kernel/timer.c      | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ccde4c3715dc..9a304874612f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7b4d7a4666454b40b45a853bd1d296af37a85f0
+refs/heads/master: 97a41e26124330e41aa10ef88cd1711bc3d17460
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index 32fa03ad1984..d13ab7d2d899 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/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/trunk/kernel/irq/proc.c b/trunk/kernel/irq/proc.c
index 8a64a4844cde..d03b5eef8ce0 100644
--- a/trunk/kernel/irq/proc.c
+++ b/trunk/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/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c
index 49fbbeff201c..36efe088ad81 100644
--- a/trunk/kernel/rcutorture.c
+++ b/trunk/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/trunk/kernel/timer.c b/trunk/kernel/timer.c
index fd74268d8663..074b4bd5cfd8 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/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>