diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 14:55:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 14:55:52 -0700 |
| commit | 398477d4bd57cc33792fd93035c2763ad78629c4 (patch) | |
| tree | 8a9cc1cd2f371843f6242b877cbdce9e109a06ed /include/asm-cris/elf.h | |
| parent | 6e936d3e9a45a4307e7f4a29ee9829e7a0464af1 (diff) | |
| parent | 6d71627581e96efb3717960b79fc2167a4617977 (diff) | |
Merge git://git.infradead.org/~dwmw2/khdrs-2.6
* git://git.infradead.org/~dwmw2/khdrs-2.6:
New 'make headers_install_all' target.
Use dependencies for 'make headers_install'.
[S390] Unexport <asm/z90crypt.h>, export <asm/zcrypt.h> in its place.
Remove dead netfilter_logging.h from include/linux/Kbuild
Remove offsetof() from user-visible <linux/stddef.h>
Clean up exported headers on CRIS
Fix v850 exported headers
Don't advertise (or allow) headers_{install,check} where inappropriate.
Remove UML header export
Remove ARM26 header export.
Fix H8300 exported headers.
Fix m68knommu exported headers
Fix exported headers for SPARC, SPARC64
Fix 'make headers_check' on m32r
Fix 'make headers_check' on sh64
Fix 'make headers_check' on sh
[HEADERS] Fix ARM 'make headers_check'
Initial pass of manual conflict resolution in top-level Makefile over
conflicting build rule and headers_install changes.
Diffstat (limited to 'include/asm-cris/elf.h')
| -rw-r--r-- | include/asm-cris/elf.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-cris/elf.h b/include/asm-cris/elf.h index 87a60bd8e667..96a40c1de57c 100644 --- a/include/asm-cris/elf.h +++ b/include/asm-cris/elf.h @@ -5,7 +5,6 @@ * ELF register definitions.. */ -#include <asm/arch/elf.h> #include <asm/user.h> #define R_CRIS_NONE 0 @@ -46,6 +45,9 @@ typedef unsigned long elf_fpregset_t; #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_CRIS +#ifdef __KERNEL__ +#include <asm/arch/elf.h> + /* The master for these definitions is {binutils}/include/elf/cris.h: */ /* User symbols in this file have a leading underscore. */ #define EF_CRIS_UNDERSCORE 0x00000001 @@ -87,8 +89,8 @@ typedef unsigned long elf_fpregset_t; #define ELF_PLATFORM (NULL) -#ifdef __KERNEL__ #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) -#endif + +#endif /* __KERNEL__ */ #endif |