Merge tag 'armsoc-platforms' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[platform/kernel/linux-exynos.git] / scripts / genksyms / lex.lex.c_shipped

diff --git a/scripts/genksyms/lex.lex.c_shipped b/scripts/genksyms/lex.lex.c_shipped
index 985c554..ba2fda8 100644 (file)
--- a/scripts/genksyms/lex.lex.c_shipped
+++ b/scripts/genksyms/lex.lex.c_shipped
@@ -1905,7 +1905,7 @@ void yyfree (void * ptr )
 
 /* Bring in the keyword recognizer.  */
 
-#include "keywords.hash.c"
+#include "keywords.c"
 
 /* Macros to append to our phrase collection list.  */
 
@@ -1995,10 +1995,10 @@ repeat:
        case IDENT:
          APP;
          {
-           const struct resword *r = is_reserved_word(yytext, yyleng);
-           if (r)
+           int r = is_reserved_word(yytext, yyleng);
+           if (r >= 0)
              {
-               switch (token = r->token)
+               switch (token = r)
                  {
                  case ATTRIBUTE_KEYW:
                    lexstate = ST_ATTRIBUTE;
@@ -2101,7 +2101,7 @@ repeat:
     case ST_TYPEOF_1:
       if (token == IDENT)
        {
-         if (is_reserved_word(yytext, yyleng)
+         if (is_reserved_word(yytext, yyleng) >= 0
              || find_symbol(yytext, SYM_TYPEDEF, 1))
            {
              yyless(0);