Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / scripts / mod / modpost.h

diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 861d866fcd8394bf2fdcec228fe8b7c81f145804..4156dd34c5def71a04c899b1b4a0cdf0a2ae832f 100644 (file)
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -60,6 +60,9 @@ typedef union
 #define ELF64_MIPS_R_SYM(i) \
   ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym)
 
+#define ELF64_MIPS_R_TYPE(i) \
+  ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1)
+
 #if KERNEL_ELFDATA != HOST_ELFDATA
 
 static inline void __endian(const void *src, void *dest, unsigned int size)
@@ -100,6 +103,7 @@ buf_write(struct buffer *buf, const char *s, int len);
 struct module {
        struct module *next;
        const char *name;
+       int gpl_compatible;
        struct symbol *unres;
        int seen;
        int skip;
@@ -115,6 +119,11 @@ struct elf_info {
        Elf_Shdr     *sechdrs;
        Elf_Sym      *symtab_start;
        Elf_Sym      *symtab_stop;
+       Elf_Section  export_sec;
+       Elf_Section  export_unused_sec;
+       Elf_Section  export_gpl_sec;
+       Elf_Section  export_unused_gpl_sec;
+       Elf_Section  export_gpl_future_sec;
        const char   *strtab;
        char         *modinfo;
        unsigned int modinfo_len;
@@ -139,3 +148,4 @@ void release_file(void *file, unsigned long size);
 
 void fatal(const char *fmt, ...);
 void warn(const char *fmt, ...);
+void merror(const char *fmt, ...);