From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 15 Dec 2009 08:22:23 +0000 (+0000)
Subject: build on f12
X-Git-Tag: linux-2.6-22-43~8
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=853c6b4365fed5e1d42bc765165e165abef1c6e8

build on f12
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index a43ac9c20..a863e4770 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -154,6 +154,7 @@ Patch010: linux-2.6-010-e1000e.patch
 Patch020: linux-2.6-020-build-id.patch
 Patch030: linux-2.6-030-netns.patch
 Patch040: linux-2.6-040-i_mutex-check.patch
+Patch050: linux-2.6-050-getline.patch
 
 # These are patches picked up from Fedora/RHEL
 Patch100: linux-2.6-100-build-nonintconfig.patch
@@ -384,6 +385,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 30
 %endif
 %ApplyPatch 40
+%ApplyPatch 50
 
 %ApplyPatch 100
 
diff --git a/linux-2.6-050-getline.patch b/linux-2.6-050-getline.patch
new file mode 100644
index 000000000..483330195
--- /dev/null
+++ b/linux-2.6-050-getline.patch
@@ -0,0 +1,31 @@
+diff --git a/scripts/unifdef.c b/scripts/unifdef.c
+index 552025e..977e682 100644
+--- a/scripts/unifdef.c
++++ b/scripts/unifdef.c
+@@ -206,7 +206,7 @@  static void             done(void);
+ static void             error(const char *);
+ static int              findsym(const char *);
+ static void             flushline(bool);
+-static Linetype         getline(void);
++static Linetype         parseline(void);
+ static Linetype         ifeval(const char **);
+ static void             ignoreoff(void);
+ static void             ignoreon(void);
+@@ -512,7 +512,7 @@  process(void)
+ 
+ 	for (;;) {
+ 		linenum++;
+-		lineval = getline();
++		lineval = parseline();
+ 		trans_table[ifstate[depth]][lineval]();
+ 		debug("process %s -> %s depth %d",
+ 		    linetype_name[lineval],
+@@ -526,7 +526,7 @@  process(void)
+  * help from skipcomment().
+  */
+ static Linetype
+-getline(void)
++parseline(void)
+ {
+ 	const char *cp;
+ 	int cursym;