- finished.

[packages/kernel.git] / 2.6.7-ppc-strncasecmp.patch

diff --git a/2.6.7-ppc-strncasecmp.patch b/2.6.7-ppc-strncasecmp.patch
index f34a8a6147a4e508d58d1efd584d843546c10d9e..ea489c0dca9f7bd62a02baf67fd756bc2f8be8b3 100644 (file)
--- a/2.6.7-ppc-strncasecmp.patch
+++ b/2.6.7-ppc-strncasecmp.patch
@@ -1,20 +1,41 @@
---- linux-2.6.7/fs/gfs_locking/lock_gulm//utils_verb_flags.c.orig      2004-07-07 01:40:49.879527400 +0200
-+++ linux-2.6.7/fs/gfs_locking/lock_gulm//utils_verb_flags.c   2004-07-07 01:41:10.846339960 +0200
-@@ -20,6 +20,7 @@
- 
+--- linux-2.6.8-rc1/fs/gfs_locking/lock_gulm/utils_verb_flags.c.orig   2004-07-12 10:46:12.000000000 +0200
++++ linux-2.6.8-rc1/fs/gfs_locking/lock_gulm/utils_verb_flags.c        2004-07-12 10:46:36.015314232 +0200
+@@ -21,7 +21,7 @@
  #include "gulm_log_msg_bits.h"
  
-+#ifndef CONFIG_PPC
  static __inline__ int
- strncasecmp (const char *s1, const char *s2, size_t l)
+-strncasecmp (const char *s1, const char *s2, size_t l)
++__strncasecmp (const char *s1, const char *s2, size_t l)
  {
-@@ -40,6 +41,9 @@
-       }
-       return (c1 - c2);
- }
-+#else
-+#include <asm/string.h>
-+#endif
- 
- static int bit_array[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 };
+       char c1 = '\0', c2 = '\0';
  
+@@ -231,7 +231,7 @@
+               if (token[0] == '-') {
+                       token++;
+                       for (i = 0; i < len; i++) {
+-                              if (strncasecmp
++                              if (__strncasecmp
+                                   (token, verbose_flags[i].name, tl) == 0) {
+                                       (*verb) &= ~(verbose_flags[i].val);
+                               }
+@@ -239,17 +239,17 @@
+               } else if (token[0] == '+') {
+                       token++;
+                       for (i = 0; i < len; i++) {
+-                              if (strncasecmp
++                              if (__strncasecmp
+                                   (token, verbose_flags[i].name, tl) == 0) {
+                                       (*verb) |= verbose_flags[i].val;
+                               }
+                       }
+               } else {
+-                      if (strncasecmp (token, "clear", tl) == 0) {
++                      if (__strncasecmp (token, "clear", tl) == 0) {
+                               (*verb) = 0;
+                       } else {
+                               for (i = 0; i < len; i++) {
+-                                      if (strncasecmp
++                                      if (__strncasecmp
+                                           (token, verbose_flags[i].name,
+                                            tl) == 0) {
+                                               (*verb) |= verbose_flags[i].val;