summaryrefslogtreecommitdiff
path: root/linux-uml/linux-uml-2.6.7/fix-warnings.patch
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /linux-uml/linux-uml-2.6.7/fix-warnings.patch
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'linux-uml/linux-uml-2.6.7/fix-warnings.patch')
-rw-r--r--linux-uml/linux-uml-2.6.7/fix-warnings.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/linux-uml/linux-uml-2.6.7/fix-warnings.patch b/linux-uml/linux-uml-2.6.7/fix-warnings.patch
index e69de29bb2..920df3fcba 100644
--- a/linux-uml/linux-uml-2.6.7/fix-warnings.patch
+++ b/linux-uml/linux-uml-2.6.7/fix-warnings.patch
@@ -0,0 +1,64 @@
+
+Fixes some little warnings about "Defined but not used ..." by #ifdef'ing things
+
+Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
+---
+
+ uml-linux-2.6.7-paolo/arch/um/kernel/time.c | 1 +
+ uml-linux-2.6.7-paolo/arch/um/kernel/time_kern.c | 4 +++-
+ uml-linux-2.6.7-paolo/fs/hostfs/hostfs_kern.c | 2 ++
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff -puN arch/um/kernel/time_kern.c~fix-warnings arch/um/kernel/time_kern.c
+--- uml-linux-2.6.7/arch/um/kernel/time_kern.c~fix-warnings 2004-06-29 21:03:02.266292840 +0200
++++ uml-linux-2.6.7-paolo/arch/um/kernel/time_kern.c 2004-06-29 21:03:02.271292080 +0200
+@@ -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 -puN arch/um/kernel/time.c~fix-warnings arch/um/kernel/time.c
+--- uml-linux-2.6.7/arch/um/kernel/time.c~fix-warnings 2004-06-29 21:03:02.267292688 +0200
++++ uml-linux-2.6.7-paolo/arch/um/kernel/time.c 2004-06-29 21:03:02.271292080 +0200
+@@ -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 -puN fs/hostfs/hostfs_kern.c~fix-warnings fs/hostfs/hostfs_kern.c
+--- uml-linux-2.6.7/fs/hostfs/hostfs_kern.c~fix-warnings 2004-06-29 21:03:02.268292536 +0200
++++ uml-linux-2.6.7-paolo/fs/hostfs/hostfs_kern.c 2004-06-29 21:03:02.271292080 +0200
+@@ -59,6 +59,7 @@ static struct inode_operations hostfs_io
+ 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)
+ {
+_