diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-10 11:04:46 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-10 11:04:46 -0800 |
commit | 8d13812761dc893d77d0ab3d913eb286b6e22555 (patch) | |
tree | c75d8ecadc544785c4a7f516745fe53a2fbd0463 /driver | |
parent | a646e750fd3bd36d9d9aeeefa1281d284ed99dd3 (diff) | |
download | patches-8d13812761dc893d77d0ab3d913eb286b6e22555.tar.gz |
export-symbol-gpl fix for module versions
other refresh for 2.6.16-rc2-git8
Diffstat (limited to 'driver')
-rw-r--r-- | driver/export_symbol_gpl_future.patch | 195 | ||||
-rw-r--r-- | driver/handle-errors-returned-by-platform_get_irq.patch | 2 |
2 files changed, 191 insertions, 6 deletions
diff --git a/driver/export_symbol_gpl_future.patch b/driver/export_symbol_gpl_future.patch index 521db158cc39f..c151ba84b8d29 100644 --- a/driver/export_symbol_gpl_future.patch +++ b/driver/export_symbol_gpl_future.patch @@ -8,10 +8,12 @@ printed out to the system log. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - include/asm-generic/vmlinux.lds.h | 14 ++++++++++ - include/linux/module.h | 8 ++++++ - kernel/module.c | 49 ++++++++++++++++++++++++++++++++++++-- - 3 files changed, 69 insertions(+), 2 deletions(-) + include/asm-generic/vmlinux.lds.h | 14 +++++ + include/linux/module.h | 8 +++ + kernel/module.c | 49 ++++++++++++++++++- + scripts/genksyms/keywords.c_shipped | 91 ++++++++++++++++++------------------ + scripts/genksyms/keywords.gperf | 1 + 5 files changed, 116 insertions(+), 47 deletions(-) --- gregkh-2.6.orig/include/asm-generic/vmlinux.lds.h +++ gregkh-2.6/include/asm-generic/vmlinux.lds.h @@ -98,7 +100,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + "details.\n"); + } + *crc = symversion(__start___kcrctab_gpl_future, -+ (ks - __start_ksymtab_gpl_future)); ++ (ks - __start___ksymtab_gpl_future)); + return ks->value; + } @@ -167,3 +169,186 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> printk(KERN_WARNING "%s: No versions for exported symbols." " Tainting kernel.\n", mod->name); add_taint(TAINT_FORCED_MODULE); +--- gregkh-2.6.orig/scripts/genksyms/keywords.gperf ++++ gregkh-2.6/scripts/genksyms/keywords.gperf +@@ -4,6 +4,7 @@ struct resword { const char *name; int t + %% + EXPORT_SYMBOL, EXPORT_SYMBOL_KEYW + EXPORT_SYMBOL_GPL, EXPORT_SYMBOL_KEYW ++EXPORT_SYMBOL_GPL_FUTURE, EXPORT_SYMBOL_KEYW + __asm, ASM_KEYW + __asm__, ASM_KEYW + __attribute, ATTRIBUTE_KEYW +--- gregkh-2.6.orig/scripts/genksyms/keywords.c_shipped ++++ gregkh-2.6/scripts/genksyms/keywords.c_shipped +@@ -52,9 +52,9 @@ is_reserved_hash (register const char *s + 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, +- 71, 71, 71, 71, 71, 71, 71, 71, 71, 15, +- 71, 71, 71, 71, 71, 71, 15, 71, 71, 71, +- 10, 71, 71, 71, 71, 71, 71, 71, 71, 71, ++ 71, 71, 71, 71, 71, 71, 71, 71, 71, 0, ++ 71, 71, 71, 71, 71, 71, 35, 71, 71, 71, ++ 5, 71, 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 0, 71, 0, 71, 5, + 5, 0, 10, 20, 71, 25, 71, 71, 20, 0, + 20, 30, 25, 71, 10, 5, 0, 20, 15, 71, +@@ -84,9 +84,9 @@ is_reserved_word (register const char *s + { + enum + { +- TOTAL_KEYWORDS = 41, ++ TOTAL_KEYWORDS = 42, + MIN_WORD_LENGTH = 3, +- MAX_WORD_LENGTH = 17, ++ MAX_WORD_LENGTH = 24, + MIN_HASH_VALUE = 3, + MAX_HASH_VALUE = 70 + }; +@@ -94,104 +94,105 @@ is_reserved_word (register const char *s + static const struct resword wordlist[] = + { + {""}, {""}, {""}, +-#line 24 "scripts/genksyms/keywords.gperf" ++#line 25 "scripts/genksyms/keywords.gperf" + {"asm", ASM_KEYW}, + {""}, +-#line 7 "scripts/genksyms/keywords.gperf" ++#line 8 "scripts/genksyms/keywords.gperf" + {"__asm", ASM_KEYW}, + {""}, +-#line 8 "scripts/genksyms/keywords.gperf" ++#line 9 "scripts/genksyms/keywords.gperf" + {"__asm__", ASM_KEYW}, + {""}, +-#line 21 "scripts/genksyms/keywords.gperf" ++#line 22 "scripts/genksyms/keywords.gperf" + {"_restrict", RESTRICT_KEYW}, +-#line 50 "scripts/genksyms/keywords.gperf" ++#line 51 "scripts/genksyms/keywords.gperf" + {"__typeof__", TYPEOF_KEYW}, +-#line 9 "scripts/genksyms/keywords.gperf" ++#line 10 "scripts/genksyms/keywords.gperf" + {"__attribute", ATTRIBUTE_KEYW}, +-#line 11 "scripts/genksyms/keywords.gperf" ++#line 12 "scripts/genksyms/keywords.gperf" + {"__const", CONST_KEYW}, +-#line 10 "scripts/genksyms/keywords.gperf" ++#line 11 "scripts/genksyms/keywords.gperf" + {"__attribute__", ATTRIBUTE_KEYW}, +-#line 12 "scripts/genksyms/keywords.gperf" ++#line 13 "scripts/genksyms/keywords.gperf" + {"__const__", CONST_KEYW}, +-#line 16 "scripts/genksyms/keywords.gperf" ++#line 17 "scripts/genksyms/keywords.gperf" + {"__signed__", SIGNED_KEYW}, +-#line 42 "scripts/genksyms/keywords.gperf" ++#line 43 "scripts/genksyms/keywords.gperf" + {"static", STATIC_KEYW}, + {""}, +-#line 15 "scripts/genksyms/keywords.gperf" ++#line 16 "scripts/genksyms/keywords.gperf" + {"__signed", SIGNED_KEYW}, +-#line 30 "scripts/genksyms/keywords.gperf" ++#line 31 "scripts/genksyms/keywords.gperf" + {"char", CHAR_KEYW}, + {""}, +-#line 43 "scripts/genksyms/keywords.gperf" ++#line 44 "scripts/genksyms/keywords.gperf" + {"struct", STRUCT_KEYW}, +-#line 22 "scripts/genksyms/keywords.gperf" +- {"__restrict__", RESTRICT_KEYW}, + #line 23 "scripts/genksyms/keywords.gperf" ++ {"__restrict__", RESTRICT_KEYW}, ++#line 24 "scripts/genksyms/keywords.gperf" + {"restrict", RESTRICT_KEYW}, +-#line 33 "scripts/genksyms/keywords.gperf" ++#line 34 "scripts/genksyms/keywords.gperf" + {"enum", ENUM_KEYW}, +-#line 17 "scripts/genksyms/keywords.gperf" ++#line 18 "scripts/genksyms/keywords.gperf" + {"__volatile", VOLATILE_KEYW}, +-#line 34 "scripts/genksyms/keywords.gperf" ++#line 35 "scripts/genksyms/keywords.gperf" + {"extern", EXTERN_KEYW}, +-#line 18 "scripts/genksyms/keywords.gperf" ++#line 19 "scripts/genksyms/keywords.gperf" + {"__volatile__", VOLATILE_KEYW}, +-#line 37 "scripts/genksyms/keywords.gperf" ++#line 38 "scripts/genksyms/keywords.gperf" + {"int", INT_KEYW}, +- {""}, +-#line 31 "scripts/genksyms/keywords.gperf" +- {"const", CONST_KEYW}, ++#line 7 "scripts/genksyms/keywords.gperf" ++ {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW}, + #line 32 "scripts/genksyms/keywords.gperf" ++ {"const", CONST_KEYW}, ++#line 33 "scripts/genksyms/keywords.gperf" + {"double", DOUBLE_KEYW}, + {""}, +-#line 13 "scripts/genksyms/keywords.gperf" ++#line 14 "scripts/genksyms/keywords.gperf" + {"__inline", INLINE_KEYW}, +-#line 29 "scripts/genksyms/keywords.gperf" ++#line 30 "scripts/genksyms/keywords.gperf" + {"auto", AUTO_KEYW}, +-#line 14 "scripts/genksyms/keywords.gperf" ++#line 15 "scripts/genksyms/keywords.gperf" + {"__inline__", INLINE_KEYW}, +-#line 41 "scripts/genksyms/keywords.gperf" ++#line 42 "scripts/genksyms/keywords.gperf" + {"signed", SIGNED_KEYW}, + {""}, +-#line 46 "scripts/genksyms/keywords.gperf" ++#line 47 "scripts/genksyms/keywords.gperf" + {"unsigned", UNSIGNED_KEYW}, + {""}, +-#line 40 "scripts/genksyms/keywords.gperf" ++#line 41 "scripts/genksyms/keywords.gperf" + {"short", SHORT_KEYW}, +-#line 49 "scripts/genksyms/keywords.gperf" ++#line 50 "scripts/genksyms/keywords.gperf" + {"typeof", TYPEOF_KEYW}, +-#line 44 "scripts/genksyms/keywords.gperf" ++#line 45 "scripts/genksyms/keywords.gperf" + {"typedef", TYPEDEF_KEYW}, +-#line 48 "scripts/genksyms/keywords.gperf" ++#line 49 "scripts/genksyms/keywords.gperf" + {"volatile", VOLATILE_KEYW}, + {""}, +-#line 35 "scripts/genksyms/keywords.gperf" ++#line 36 "scripts/genksyms/keywords.gperf" + {"float", FLOAT_KEYW}, + {""}, {""}, +-#line 39 "scripts/genksyms/keywords.gperf" ++#line 40 "scripts/genksyms/keywords.gperf" + {"register", REGISTER_KEYW}, +-#line 47 "scripts/genksyms/keywords.gperf" ++#line 48 "scripts/genksyms/keywords.gperf" + {"void", VOID_KEYW}, + {""}, +-#line 36 "scripts/genksyms/keywords.gperf" ++#line 37 "scripts/genksyms/keywords.gperf" + {"inline", INLINE_KEYW}, + {""}, + #line 5 "scripts/genksyms/keywords.gperf" + {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW}, + {""}, +-#line 20 "scripts/genksyms/keywords.gperf" ++#line 21 "scripts/genksyms/keywords.gperf" + {"_Bool", BOOL_KEYW}, + {""}, + #line 6 "scripts/genksyms/keywords.gperf" + {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW}, + {""}, {""}, {""}, {""}, {""}, {""}, +-#line 38 "scripts/genksyms/keywords.gperf" ++#line 39 "scripts/genksyms/keywords.gperf" + {"long", LONG_KEYW}, + {""}, {""}, {""}, {""}, {""}, +-#line 45 "scripts/genksyms/keywords.gperf" ++#line 46 "scripts/genksyms/keywords.gperf" + {"union", UNION_KEYW} + }; + diff --git a/driver/handle-errors-returned-by-platform_get_irq.patch b/driver/handle-errors-returned-by-platform_get_irq.patch index 01d0925499a6f..8a680cc3a4cf2 100644 --- a/driver/handle-errors-returned-by-platform_get_irq.patch +++ b/driver/handle-errors-returned-by-platform_get_irq.patch @@ -258,7 +258,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> cf = kcalloc(1, sizeof *cf, GFP_KERNEL); --- gregkh-2.6.orig/drivers/serial/s3c2410.c +++ gregkh-2.6/drivers/serial/s3c2410.c -@@ -1062,6 +1062,8 @@ static int s3c24xx_serial_init_port(stru +@@ -1066,6 +1066,8 @@ static int s3c24xx_serial_init_port(stru port->mapbase = res->start; port->membase = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART); port->irq = platform_get_irq(platdev, 0); |