Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a9f1365e5e4963705f85a6381cbed74c5615dbac
Commit:     a9f1365e5e4963705f85a6381cbed74c5615dbac
Parent:     cd01204b82933754a7276838656420477f64d4b8
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 10 16:06:32 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 13:19:00 2008 +0900

    sh: Use utsname()->machine for ELF_PLATFORM.
    
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 include/asm-sh/elf.h |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/asm-sh/elf.h b/include/asm-sh/elf.h
index 6196040..9a95f8c 100644
--- a/include/asm-sh/elf.h
+++ b/include/asm-sh/elf.h
@@ -63,11 +63,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpu_struct elf_fpregset_t;
 
 /*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ( (x)->e_machine == EM_SH )
-
-/*
  * These are used to set parameters in the core dumps.
  */
 #define ELF_CLASS      ELFCLASS32
@@ -78,6 +73,12 @@ typedef struct user_fpu_struct elf_fpregset_t;
 #endif
 #define ELF_ARCH       EM_SH
 
+#ifdef __KERNEL__
+/*
+ * This is used to ensure we don't load something for the wrong architecture.
+ */
+#define elf_check_arch(x) ( (x)->e_machine == EM_SH )
+
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE      PAGE_SIZE
 
@@ -106,7 +107,7 @@ typedef struct user_fpu_struct elf_fpregset_t;
    For the moment, we have only optimizations for the Intel generations,
    but that could change... */
 
-#define ELF_PLATFORM  (NULL)
+#define ELF_PLATFORM   (utsname()->machine)
 
 #ifdef __SH5__
 #define ELF_PLAT_INIT(_r, load_addr) \
@@ -182,4 +183,5 @@ do {                                                        
        \
        NEW_AUX_ENT(AT_L2_CACHESHAPE, l2_cache_shape);          \
 } while (0)
 
+#endif /* __KERNEL__ */
 #endif /* __ASM_SH_ELF_H */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to