Patched in Tegra support.

1 files changed, 14 insertions, 14 deletions

diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c
index 4918d91bc3a..28fa6ece9d3 100644
--- a/arch/tile/kernel/module.c
+++ b/arch/tile/kernel/module.c
@@ -20,9 +20,19 @@
 #include <linux/fs.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
+#include <asm/opcode-tile.h>
 #include <asm/pgtable.h>
 #include <asm/homecache.h>
-#include <arch/opcode.h>
+
+#ifdef __tilegx__
+# define Elf_Rela Elf64_Rela
+# define ELF_R_SYM ELF64_R_SYM
+# define ELF_R_TYPE ELF64_R_TYPE
+#else
+# define Elf_Rela Elf32_Rela
+# define ELF_R_SYM ELF32_R_SYM
+# define ELF_R_TYPE ELF32_R_TYPE
+#endif
 
 #ifdef MODULE_DEBUG
 #define DEBUGP printk
@@ -42,6 +52,8 @@ void *module_alloc(unsigned long size)
         int i = 0;
         int npages;
 
+        if (size == 0)
+                return NULL;
         npages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
         pages = kmalloc(npages * sizeof(struct page *), GFP_KERNEL);
         if (pages == NULL)
@@ -55,8 +67,6 @@ void *module_alloc(unsigned long size)
         area = __get_vm_area(size, VM_ALLOC, MEM_MODULE_START, MEM_MODULE_END);
         if (!area)
                 goto error;
-        area->nr_pages = npages;
-        area->pages = pages;
 
         if (map_vm_area(area, prot_rwx, &pages)) {
                 vunmap(area->addr);
@@ -147,17 +157,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
 
                 switch (ELF_R_TYPE(rel[i].r_info)) {
 
-#ifdef __LITTLE_ENDIAN
-# define MUNGE(func) \
-        (*location = ((*location & ~func(-1)) | func(value)))
-#else
-/*
- * Instructions are always little-endian, so when we read them as data,
- * we have to swap them around before and after modifying them.
- */
-# define MUNGE(func) \
-        (*location = swab64((swab64(*location) & ~func(-1)) | func(value)))
-#endif
+#define MUNGE(func) (*location = ((*location & ~func(-1)) | func(value)))
 
 #ifndef __tilegx__
                 case R_TILE_32: