From dc5412b71e2183729b9de33b06d6dfa4705cf31b Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 23 Jun 2007 02:29:23 +0200 Subject: [PATCH] --- yaml --- r: 57965 b: refs/heads/master c: 9d9bbd4d247a674deb43565582151acdc22e90d1 h: refs/heads/master i: 57963: 4c562bb12655b860fa871e634a707fa6c203d943 v: v3 --- [refs] | 2 +- trunk/arch/i386/Kconfig | 2 +- trunk/arch/i386/Kconfig.cpu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 05161a361673..4792ff73163d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f2c6d0f4f0dafdc99af0df71edba57e7815cb13 +refs/heads/master: 9d9bbd4d247a674deb43565582151acdc22e90d1 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index 8770a5d0b143..d2f6a247414d 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -541,7 +541,7 @@ config HIGHMEM4G config HIGHMEM64G bool "64GB" - depends on X86_CMPXCHG64 + depends on !M386 && !M486 help Select this if you have a 32-bit processor and more than 4 gigabytes of physical RAM. diff --git a/trunk/arch/i386/Kconfig.cpu b/trunk/arch/i386/Kconfig.cpu index d7f6fb0b30f2..5c95ceb7f122 100644 --- a/trunk/arch/i386/Kconfig.cpu +++ b/trunk/arch/i386/Kconfig.cpu @@ -299,7 +299,7 @@ config X86_POPAD_OK config X86_CMPXCHG64 bool - depends on !M386 && !M486 + depends on X86_PAE default y config X86_ALIGNMENT_16