From: ebiederm@xmission.com (Eric W. Biederman)
To: Andi Kleen <ak@suse.de>
Cc: virtualization <virtualization@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
Dave Jones <davej@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Jeremy Fitzhardinge <jeremy@goop.org>
Subject: [PATCH 06/12] i386: Minimum cpu detection cleanups.
Date: Mon, 30 Apr 2007 10:09:11 -0600 [thread overview]
Message-ID: <m1mz0p4zfc.fsf_-_@ebiederm.dsl.xmission.com> (raw)
In-Reply-To: <m1r6q14zow.fsf_-_@ebiederm.dsl.xmission.com> (Eric W. Biederman's message of "Mon, 30 Apr 2007 10:03:27 -0600")
This patch modifies verify_cpu to check for a 486 even when
REQUIRED_MASK1 == 0
This patch modifies REQUIRED_MASK1 to require PAE when CONFIG_X86_PAE
is set not when HIGHMEM64G is set, not that there is a functional
difference but it seems an obvious fix.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
arch/i386/kernel/verify_cpu.S | 7 ++-----
include/asm-i386/required-features.h | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/i386/kernel/verify_cpu.S b/arch/i386/kernel/verify_cpu.S
index ba9e03e..e51a869 100644
--- a/arch/i386/kernel/verify_cpu.S
+++ b/arch/i386/kernel/verify_cpu.S
@@ -4,10 +4,6 @@
#include <asm/cpufeature.h>
verify_cpu:
-#if REQUIRED_MASK1 == 0
- xorl %eax,%eax
- ret
-#endif
pushfl # Save caller passed flags
pushl $0 # Kill any dangerous flags
popfl
@@ -21,7 +17,7 @@ verify_cpu:
testl $(1<<18),%eax
jz bad
#endif
-
+#if REQUIRED_MASK1 != 0
pushfl # standard way to check for cpuid
popl %eax
movl %eax,%ebx
@@ -57,6 +53,7 @@ verify_cpu:
andl $REQUIRED_MASK1,%edx
xorl $REQUIRED_MASK1,%edx
jnz bad
+#endif /* REQUIRED_MASK1 */
popfl
xor %eax,%eax
diff --git a/include/asm-i386/required-features.h b/include/asm-i386/required-features.h
index 062407e..9db866c 100644
--- a/include/asm-i386/required-features.h
+++ b/include/asm-i386/required-features.h
@@ -11,7 +11,7 @@
The real information is in arch/i386/Kconfig.cpu, this just converts
the CONFIGs into a bitmask */
-#ifdef CONFIG_HIGHMEM64G
+#ifdef CONFIG_X86_PAE
#define NEED_PAE (1<<X86_FEATURE_PAE)
#else
#define NEED_PAE 0
--
1.5.1.1.181.g2de0
next prev parent reply other threads:[~2007-04-30 16:19 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-30 15:46 [PATCH 0/12] Early USB debug port and i386 boot cleanups Eric W. Biederman
2007-04-30 15:48 ` [PATCH 01/12] x86_64: Allow fixmaps to be used with the initial page table Eric W. Biederman
2007-04-30 15:49 ` [PATCH 02/12] i386 head.S: Remove unnecessary use of %ebx as the boot cpu flag Eric W. Biederman
2007-04-30 15:51 ` [PATCH 03/12] i386 head.S: Always run the full set of paging state Eric W. Biederman
2007-04-30 15:57 ` [PATCH 04/12] i386 voyager: Use modern techniques to setup and teardown low identiy mappings Eric W. Biederman
2007-04-30 16:03 ` [PATCH 05/12] i386: During page table initialization always set the leaf page table entries Eric W. Biederman
2007-04-30 16:09 ` Eric W. Biederman [this message]
2007-04-30 16:10 ` [PATCH 07/12] i386: Add missing !X86_PAE dependincy to the 2G/2G split Eric W. Biederman
2007-04-30 16:15 ` [PATCH 08/12] i386: Convert the boot time page tables to the kernels native format Eric W. Biederman
2007-04-30 16:26 ` Andi Kleen
2007-04-30 16:42 ` Eric W. Biederman
2007-04-30 16:32 ` [PATCH 09/12] i386/x86_64: EHCI usb debug port early printk support Eric W. Biederman
2007-04-30 16:32 ` [PATCH 10/12] i386: Introduce head32.c Eric W. Biederman
2007-04-30 16:33 ` [PATCH 11/12] i386: Move setup_idt from head.S to head32.c Eric W. Biederman
2007-04-30 16:35 ` [PATCH 12/12] i386: remove cpuid checking in head.S Eric W. Biederman
2007-04-30 17:56 ` [PATCH 09/12] i386/x86_64: EHCI usb debug port early printk support Andi Kleen
2007-04-30 20:54 ` Eric W. Biederman
2007-04-30 16:16 ` [PATCH 07/12] i386: Add missing !X86_PAE dependincy to the 2G/2G split H. Peter Anvin
2007-04-30 16:39 ` Eric W. Biederman
2007-04-30 16:13 ` [PATCH 06/12] i386: Minimum cpu detection cleanups H. Peter Anvin
2007-04-30 16:19 ` Andi Kleen
2007-04-30 16:21 ` [PATCH 05/12] i386: During page table initialization always set the leaf page table entries Andi Kleen
2007-04-30 16:34 ` Jeremy Fitzhardinge
2007-04-30 17:06 ` [PATCH 04/12] i386 voyager: Use modern techniques to setup and teardown low identiy mappings James Bottomley
2007-04-30 16:23 ` [PATCH 01/12] x86_64: Allow fixmaps to be used with the initial page table Andi Kleen
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=m1mz0p4zfc.fsf_-_@ebiederm.dsl.xmission.com \
--to=ebiederm@xmission.com \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=davej@redhat.com \
--cc=hpa@zytor.com \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/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
all inboxes | Powered by JetHome®