2000-11-11 16:49:06

by Mikael Pettersson

[permalink] [raw]
Subject: 2.4.0-test11pre2: one more Pentium IV CPU naming fix


The patch below (for 2.4.0-test11pre2) makes include/asm-i386/elf.h's
ELF_PLATFORM be an alias for system_utsname.machine. bugs.h (which
initialises system_utsname.machine) and elf.h use the same algorithm
to map boot_cpu_data.x86 to a name, so it makes sense to share the
name between them, especially if we ever come up with a better naming
scheme (just one place to fix, not two).

This doesn't change any current 2.4 behaviour wrt to the Pentium IV.
However, 2.2.18pre's version of elf.h is currently broken for
the Pentium IV, and I want the same "nice" fix in both kernels.
(I'm sending an equivalent patch to Alan for 2.2.18pre.)


--- linux-2.4.0-test11pre2/include/asm-i386/elf.h.~1~ Tue Oct 31 23:34:20 2000
+++ linux-2.4.0-test11pre2/include/asm-i386/elf.h Fri Nov 10 16:37:12 2000
@@ -7,6 +7,7 @@

#include <asm/ptrace.h>
#include <asm/user.h>
+#include <linux/utsname.h>

typedef unsigned long elf_greg_t;

@@ -93,7 +94,7 @@
For the moment, we have only optimizations for the Intel generations,
but that could change... */

-#define ELF_PLATFORM ("i386\0i486\0i586\0i686"+(((boot_cpu_data.x86>6?6:boot_cpu_data.x86)-3)*5))
+#define ELF_PLATFORM (system_utsname.machine)

#ifdef __KERNEL__
#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)