[PATCH] uml: Kill useless warnings

Fixes some little warnings about "Defined but not used ..." by #ifdef'ing
things

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 248948f7db179338f63f4efac8938715b7ef11cd..cb7ec3736a170994e34ef54eb4bb7ad99cebf71c 100644 (file)
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -10,6 +10,7 @@
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
+#include <string.h>
 #include "user_util.h"
 #include "kern_util.h"
 #include "user.h"

diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
index 7209ba57868b5e1b080298aab7a2de0cd322c1d8..e30c98023b159d4b7bade3c199a449d215faa37c 100644 (file)
--- a/arch/um/kernel/time_kern.c
+++ b/arch/um/kernel/time_kern.c
@@ -43,7 +43,9 @@ int timer_irq_inited = 0;
 
 static int first_tick;
 static unsigned long long prev_tsc;
+#ifdef CONFIG_UML_REAL_TIME_CLOCK
 static long long delta;                /* Deviation per interval */
+#endif
 
 extern unsigned long long host_hz;
 
@@ -59,7 +61,7 @@ void timer_irq(union uml_pt_regs *regs)
        }
 
        if(first_tick){
-#if defined(CONFIG_UML_REAL_TIME_CLOCK)
+#ifdef CONFIG_UML_REAL_TIME_CLOCK
                unsigned long long tsc;
                /* We've had 1 tick */
                tsc = time_stamp();

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 8a88e33d73399629443b659afc953072434e8f2a..74fa6642cf5dda8964ac67fe6cb007baf7c13e57 100644 (file)
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -59,6 +59,7 @@ static struct inode_operations hostfs_iops;
 static struct inode_operations hostfs_dir_iops;
 static struct address_space_operations hostfs_link_aops;
 
+#ifndef MODULE
 static int __init hostfs_args(char *options, int *add)
 {
        char *ptr;
@@ -95,6 +96,7 @@ __uml_setup("hostfs=", hostfs_args,
 "    The only flag currently supported is 'append', which specifies that all\n"
 "    files opened by hostfs will be opened in append mode.\n\n"
 );
+#endif
 
 static char *dentry_name(struct dentry *dentry, int extra)
 {