From 45cd3c6036faf8d9ef96a9b795629fd5c2c7a8dd Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Sat, 28 Apr 2012 11:13:04 -0300 Subject: [PATCH] --- yaml --- r: 302646 b: refs/heads/master c: f106eac91edbd28de23b0bc58be82f68d976e24f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/flat.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 57178fc3e288..1aa3551752ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c22fafd312cd8658ca23f6067a20aec0781c02a +refs/heads/master: f106eac91edbd28de23b0bc58be82f68d976e24f diff --git a/trunk/arch/m68k/include/asm/flat.h b/trunk/arch/m68k/include/asm/flat.h index a0e290793978..f9454b89a51b 100644 --- a/trunk/arch/m68k/include/asm/flat.h +++ b/trunk/arch/m68k/include/asm/flat.h @@ -11,6 +11,11 @@ #define flat_get_addr_from_rp(rp, relval, flags, p) get_unaligned(rp) #define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp) #define flat_get_relocate_addr(rel) (rel) -#define flat_set_persistent(relval, p) 0 + +static inline int flat_set_persistent(unsigned long relval, + unsigned long *persistent) +{ + return 0; +} #endif /* __M68KNOMMU_FLAT_H__ */