[lc-checkins] CVS: linux/arch/i386 config.in,1.24,1.25

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/linuxcompressed/linux/arch/i386
In directory sc8-pr-cvs1:/tmp/cvs-serv25395/arch/i386

Modified Files:
	config.in 
Log Message:
o Port code to 2.4.20

Bug fix (?)
o Changes checks in vswap.c to avoid oopses. It will BUG()
instead. Some of the checks were done after the value had been
accessed.

Note
o Virtual swap addresses are temporarily disabled, due to debugging
sessions related to the use of swap files instead of swap partitions.

Index: config.in
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/arch/i386/config.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** config.in	22 Nov 2002 16:01:33 -0000	1.24
--- config.in	19 May 2003 01:38:45 -0000	1.25
***************
*** 6,10 ****

  define_bool CONFIG_X86 y
- define_bool CONFIG_ISA y
  define_bool CONFIG_SBUS n

--- 6,9 ----
***************
*** 43,47 ****
  	 Winchip-2				CONFIG_MWINCHIP2 \
  	 Winchip-2A/Winchip-3			CONFIG_MWINCHIP3D \
! 	 CyrixIII/C3				CONFIG_MCYRIXIII" Pentium-Pro
  #
  # Define implied options from the CPU selection here
--- 42,46 ----
  	 Winchip-2				CONFIG_MWINCHIP2 \
  	 Winchip-2A/Winchip-3			CONFIG_MWINCHIP3D \
! 	 CyrixIII/VIA-C3/VIA-C5			CONFIG_MCYRIXIII" Pentium-Pro
  #
  # Define implied options from the CPU selection here
***************
*** 55,58 ****
--- 54,58 ----
     define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
     define_bool CONFIG_X86_PPRO_FENCE y
+    define_bool CONFIG_X86_F00F_WORKS_OK n
  else
     define_bool CONFIG_X86_WP_WORKS_OK y
***************
*** 70,73 ****
--- 70,74 ----
     define_bool CONFIG_X86_ALIGNMENT_16 y
     define_bool CONFIG_X86_PPRO_FENCE y
+    define_bool CONFIG_X86_F00F_WORKS_OK n
  fi
  if [ "$CONFIG_M586" = "y" ]; then
***************
*** 76,79 ****
--- 77,81 ----
     define_bool CONFIG_X86_ALIGNMENT_16 y
     define_bool CONFIG_X86_PPRO_FENCE y
+    define_bool CONFIG_X86_F00F_WORKS_OK n
  fi
  if [ "$CONFIG_M586TSC" = "y" ]; then
***************
*** 81,86 ****
     define_bool CONFIG_X86_USE_STRING_486 y
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_PPRO_FENCE y
  fi
  if [ "$CONFIG_M586MMX" = "y" ]; then
--- 83,89 ----
     define_bool CONFIG_X86_USE_STRING_486 y
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_PPRO_FENCE y
+    define_bool CONFIG_X86_F00F_WORKS_OK n
  fi
  if [ "$CONFIG_M586MMX" = "y" ]; then
***************
*** 88,130 ****
     define_bool CONFIG_X86_USE_STRING_486 y
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_PPRO_FENCE y
  fi
  if [ "$CONFIG_M686" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_PGE y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
     define_bool CONFIG_X86_PPRO_FENCE y
  fi
  if [ "$CONFIG_MPENTIUMIII" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_PGE y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
  fi
  if [ "$CONFIG_MPENTIUM4" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 7
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_PGE y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
  fi
  if [ "$CONFIG_MK6" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
  fi
  if [ "$CONFIG_MK7" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 6
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_USE_3DNOW y
     define_bool CONFIG_X86_PGE y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
  fi
  if [ "$CONFIG_MELAN" = "y" ]; then
--- 91,138 ----
     define_bool CONFIG_X86_USE_STRING_486 y
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_PPRO_FENCE y
+    define_bool CONFIG_X86_F00F_WORKS_OK n
  fi
  if [ "$CONFIG_M686" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_PGE y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
     define_bool CONFIG_X86_PPRO_FENCE y
+    define_bool CONFIG_X86_F00F_WORKS_OK y
  fi
  if [ "$CONFIG_MPENTIUMIII" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_PGE y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
+    define_bool CONFIG_X86_F00F_WORKS_OK y
  fi
  if [ "$CONFIG_MPENTIUM4" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 7
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_PGE y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
+    define_bool CONFIG_X86_F00F_WORKS_OK y
  fi
  if [ "$CONFIG_MK6" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
  fi
  if [ "$CONFIG_MK7" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 6
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_GOOD_APIC y
     define_bool CONFIG_X86_USE_3DNOW y
     define_bool CONFIG_X86_PGE y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
+    define_bool CONFIG_X86_F00F_WORKS_OK y
  fi
  if [ "$CONFIG_MELAN" = "y" ]; then
***************
*** 132,139 ****
     define_bool CONFIG_X86_USE_STRING_486 y
     define_bool CONFIG_X86_ALIGNMENT_16 y
  fi
  if [ "$CONFIG_MCYRIXIII" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_ALIGNMENT_16 y
     define_bool CONFIG_X86_USE_3DNOW y
--- 140,148 ----
     define_bool CONFIG_X86_USE_STRING_486 y
     define_bool CONFIG_X86_ALIGNMENT_16 y
+    define_bool CONFIG_X86_F00F_WORKS_OK y
  fi
  if [ "$CONFIG_MCYRIXIII" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_ALIGNMENT_16 y
     define_bool CONFIG_X86_USE_3DNOW y
***************
*** 142,146 ****
  if [ "$CONFIG_MCRUSOE" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
!    define_bool CONFIG_X86_TSC y
  fi
  if [ "$CONFIG_MWINCHIPC6" = "y" ]; then
--- 151,156 ----
  if [ "$CONFIG_MCRUSOE" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
!    define_bool CONFIG_X86_HAS_TSC y
!    define_bool CONFIG_X86_F00F_WORKS_OK y
  fi
  if [ "$CONFIG_MWINCHIPC6" = "y" ]; then
***************
*** 149,167 ****
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
     define_bool CONFIG_X86_OOSTORE y
  fi
  if [ "$CONFIG_MWINCHIP2" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
     define_bool CONFIG_X86_OOSTORE y
  fi
  if [ "$CONFIG_MWINCHIP3D" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_TSC y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
     define_bool CONFIG_X86_OOSTORE y
  fi
  tristate 'Toshiba Laptop support' CONFIG_TOSHIBA
  tristate 'Dell laptop support' CONFIG_I8K
--- 159,183 ----
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
     define_bool CONFIG_X86_OOSTORE y
+    define_bool CONFIG_X86_F00F_WORKS_OK y
  fi
  if [ "$CONFIG_MWINCHIP2" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
     define_bool CONFIG_X86_OOSTORE y
+    define_bool CONFIG_X86_F00F_WORKS_OK y
  fi
  if [ "$CONFIG_MWINCHIP3D" = "y" ]; then
     define_int  CONFIG_X86_L1_CACHE_SHIFT 5
     define_bool CONFIG_X86_ALIGNMENT_16 y
!    define_bool CONFIG_X86_HAS_TSC y
     define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
     define_bool CONFIG_X86_OOSTORE y
+    define_bool CONFIG_X86_F00F_WORKS_OK y
  fi
+ 
+ bool 'Machine Check Exception' CONFIG_X86_MCE
+ 
  tristate 'Toshiba Laptop support' CONFIG_TOSHIBA
  tristate 'Dell laptop support' CONFIG_I8K
***************
*** 175,186 ****
  	 4GB    CONFIG_HIGHMEM4G \
  	 64GB   CONFIG_HIGHMEM64G" off
! if [ "$CONFIG_HIGHMEM4G" = "y" ]; then
     define_bool CONFIG_HIGHMEM y
  fi
  if [ "$CONFIG_HIGHMEM64G" = "y" ]; then
-    define_bool CONFIG_HIGHMEM y
     define_bool CONFIG_X86_PAE y
  fi

  bool 'Math emulation' CONFIG_MATH_EMULATION
  bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR
--- 191,207 ----
  	 4GB    CONFIG_HIGHMEM4G \
  	 64GB   CONFIG_HIGHMEM64G" off
! if [ "$CONFIG_HIGHMEM4G" = "y" -o "$CONFIG_HIGHMEM64G" = "y" ]; then
     define_bool CONFIG_HIGHMEM y
+ else
+    define_bool CONFIG_HIGHMEM n
  fi
  if [ "$CONFIG_HIGHMEM64G" = "y" ]; then
     define_bool CONFIG_X86_PAE y
  fi

+ if [ "$CONFIG_HIGHMEM" = "y" ]; then
+    bool 'HIGHMEM I/O support' CONFIG_HIGHIO
+ fi
+ 
  bool 'Math emulation' CONFIG_MATH_EMULATION
  bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR
***************
*** 199,202 ****
--- 220,228 ----
  fi

+ bool 'Unsynced TSC support' CONFIG_X86_TSC_DISABLE
+ if [ "$CONFIG_X86_TSC_DISABLE" != "y" -a "$CONFIG_X86_HAS_TSC" = "y" ]; then
+    define_bool CONFIG_X86_TSC y
+ fi
+ 
  if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then
     define_bool CONFIG_HAVE_DEC_LOCK y
***************
*** 231,234 ****
--- 257,261 ----
     define_bool CONFIG_X86_LOCAL_APIC y
     define_bool CONFIG_PCI y
+    define_bool CONFIG_ISA n
  else
     if [ "$CONFIG_SMP" = "y" ]; then
***************
*** 249,252 ****
--- 276,280 ----
        fi
     fi
+    bool 'ISA bus support' CONFIG_ISA
  fi

***************
*** 379,390 ****
  endmenu

! mainmenu_option next_comment
! comment 'Old CD-ROM drivers (not SCSI, not IDE)'
! 
! bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI
! if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
!    source drivers/cdrom/Config.in
  fi
- endmenu

  #
--- 407,420 ----
  endmenu

! if [ "$CONFIG_ISA" = "y" ]; then
!     mainmenu_option next_comment
!     comment 'Old CD-ROM drivers (not SCSI, not IDE)'
! 
!     bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI
!     if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
!        source drivers/cdrom/Config.in
!     fi
!     endmenu
  fi

  #
***************
*** 423,429 ****
  source drivers/usb/Config.in

! if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
!    source net/bluetooth/Config.in
! fi

  mainmenu_option next_comment
--- 453,457 ----
  source drivers/usb/Config.in

! source net/bluetooth/Config.in

  mainmenu_option next_comment
***************
*** 432,435 ****
--- 460,464 ----
  bool 'Kernel debugging' CONFIG_DEBUG_KERNEL
  if [ "$CONFIG_DEBUG_KERNEL" != "n" ]; then
+    bool '  Check for stack overflows' CONFIG_DEBUG_STACKOVERFLOW
     bool '  Debug high memory support' CONFIG_DEBUG_HIGHMEM
     bool '  Debug memory allocations' CONFIG_DEBUG_SLAB
***************
*** 437,442 ****
     bool '  Magic SysRq key' CONFIG_MAGIC_SYSRQ
     bool '  Spinlock debugging' CONFIG_DEBUG_SPINLOCK
!    bool '  Verbose BUG() reporting (adds 70K)' CONFIG_DEBUG_BUGVERBOSE
  fi

  endmenu
--- 466,473 ----
     bool '  Magic SysRq key' CONFIG_MAGIC_SYSRQ
     bool '  Spinlock debugging' CONFIG_DEBUG_SPINLOCK
!    bool '  Compile the kernel with frame pointers' CONFIG_FRAME_POINTER
  fi

  endmenu
+ 
+ source lib/Config.in