From: Mikael Pettersson <mikpe@csd.uu.se>
To: torvalds@transmeta.com
Cc: linux-kernel@vger.kernel.org
Subject: 2.4.0-test11pre2: one more Pentium IV CPU naming fix
Date: Sat, 11 Nov 2000 17:48:38 +0100 (MET) [thread overview]
Message-ID: <200011111648.RAA27710@harpo.it.uu.se> (raw)
Linus,
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.)
/Mikael
--- 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)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
reply other threads:[~2000-11-11 16:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200011111648.RAA27710@harpo.it.uu.se \
--to=mikpe@csd.uu.se \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).