diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-04 00:34:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-04 00:34:07 +0200 |
| commit | 66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4 (patch) | |
| tree | 277fd9f6ae0ea7aaf34dbbcb5439bc8391068f4e /include/asm-h8300/flat.h | |
| parent | ocfs2: Unlock mutex in local alloc failure case (diff) | |
| parent | Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki... (diff) | |
| download | linux-66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4.tar.xz linux-66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4.zip | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki <kalle.pokki@iki.fi>
Blackfin arch: gpio pinmux and resource allocation API required by BF537 on chip ethernet mac driver
Blackfin arch: add some missing syscall
binfmt_flat: checkpatch fixing minimum support for the blackfin relocations
Binfmt_flat: Add minimum support for the Blackfin relocations
Diffstat (limited to 'include/asm-h8300/flat.h')
| -rw-r--r-- | include/asm-h8300/flat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-h8300/flat.h b/include/asm-h8300/flat.h index c20eee767d6f..2a873508a9a1 100644 --- a/include/asm-h8300/flat.h +++ b/include/asm-h8300/flat.h @@ -9,6 +9,7 @@ #define flat_argvp_envp_on_stack() 1 #define flat_old_ram_flag(flags) 1 #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) +#define flat_set_persistent(relval, p) 0 /* * on the H8 a couple of the relocations have an instruction in the @@ -18,7 +19,7 @@ */ #define flat_get_relocate_addr(rel) (rel) -#define flat_get_addr_from_rp(rp, relval, flags) \ +#define flat_get_addr_from_rp(rp, relval, flags, persistent) \ (get_unaligned(rp) & ((flags & FLAT_FLAG_GOTPIC) ? 0xffffffff: 0x00ffffff)) #define flat_put_addr_at_rp(rp, addr, rel) \ put_unaligned (((*(char *)(rp)) << 24) | ((addr) & 0x00ffffff), rp) |