2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8770a5d0b143..d2f6a247414d 100644
--- a/arch/i386/Kconfig
+++ b/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/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu
index d7f6fb0b30f2..5c95ceb7f122 100644
--- a/arch/i386/Kconfig.cpu
+++ b/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

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 8770a5d0b143..d2f6a247414d 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig
@@ -541,7 +541,7 @@ config HIGHMEM4G
541		541
542	config HIGHMEM64G	542	config HIGHMEM64G
543	bool "64GB"	543	bool "64GB"
544	depends on X86_CMPXCHG64	544	depends on !M386 && !M486
545	help	545	help
546	Select this if you have a 32-bit processor and more than 4	546	Select this if you have a 32-bit processor and more than 4
547	gigabytes of physical RAM.	547	gigabytes of physical RAM.


diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu index d7f6fb0b30f2..5c95ceb7f122 100644 --- a/arch/i386/Kconfig.cpu +++ b/arch/i386/Kconfig.cpu
@@ -299,7 +299,7 @@ config X86_POPAD_OK
299		299
300	config X86_CMPXCHG64	300	config X86_CMPXCHG64
301	bool	301	bool
302	depends on !M386 && !M486	302	depends on X86_PAE
303	default y	303	default y
304		304
305	config X86_ALIGNMENT_16	305	config X86_ALIGNMENT_16