Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[sfrench/cifs-2.6.git] / arch / c6x / include / asm / flat.h

diff --git a/arch/c6x/include/asm/flat.h b/arch/c6x/include/asm/flat.h
index 76fd0bb962a3801c2a097767564d9caee7538d23..9e6544b51386a17eed91bf30a7207998dcbf1fa8 100644 (file)
--- a/arch/c6x/include/asm/flat.h
+++ b/arch/c6x/include/asm/flat.h
@@ -4,11 +4,8 @@
 
 #include <asm/unaligned.h>
 
-#define flat_argvp_envp_on_stack()                     0
-#define flat_old_ram_flag(flags)                       (flags)
-#define flat_reloc_valid(reloc, size)                  ((reloc) <= (size))
 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
-                                       u32 *addr, u32 *persistent)
+                                       u32 *addr)
 {
        *addr = get_unaligned((__force u32 *)rp);
        return 0;
@@ -18,7 +15,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
        put_unaligned(addr, (__force u32 *)rp);
        return 0;
 }
-#define flat_get_relocate_addr(rel)                    (rel)
-#define flat_set_persistent(relval, p)                 0
 
 #endif /* __ASM_C6X_FLAT_H */