SOURCES: kernel-sparc.config - sparc64.config merged-in (now both sparc32 a...

[sparky]

Author: sparky                       Date: Tue Mar 31 20:21:16 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- sparc64.config merged-in (now both sparc32 and sparc64 share same source
  tree: sparc)

---- Files affected:
SOURCES:
   kernel-sparc.config (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: SOURCES/kernel-sparc.config
diff -u SOURCES/kernel-sparc.config:1.64 SOURCES/kernel-sparc.config:1.65
--- SOURCES/kernel-sparc.config:1.64	Tue Mar 31 22:05:06 2009
+++ SOURCES/kernel-sparc.config	Tue Mar 31 22:21:11 2009
@@ -4,12 +4,21 @@
 #-
 OPROFILE sparc=m
 OPROFILE_IBS sparc=n
+KPROBES sparc64=y
 
 #-
 #- *** FILE: arch/sparc/Kconfig ***
 #-
+64BIT sparc=n sparc64=y
 SPARC sparc=y
-SPARC32 sparc=y
+SPARC32 sparc=y sparc64=n
+SPARC64 sparc=n sparc64=y
+GENERIC_TIME sparc64=y
+GENERIC_CLOCKEVENTS sparc64=y
+QUICKLIST sparc64=y
+STACKTRACE_SUPPORT sparc64=y
+LOCKDEP_SUPPORT sparc64=y
+AUDIT_ARCH sparc64=y
 MMU sparc=y
 HIGHMEM sparc=y
 ZONE_DMA sparc=y
@@ -17,17 +26,34 @@
 #- file init/Kconfig goes here
 #- file kernel/Kconfig.freezer goes here
 SMP sparc=y
-NR_CPUS sparc=32
+NR_CPUS sparc=32 sparc64=64
 #- file kernel/Kconfig.hz goes here
 RWSEM_GENERIC_SPINLOCK sparc=y
+RWSEM_XCHGADD_ALGORITHM sparc64=y
 GENERIC_FIND_NEXT_BIT sparc=y
 GENERIC_HWEIGHT sparc=y
 GENERIC_CALIBRATE_DELAY sparc=y
 ARCH_MAY_HAVE_PC_FDC sparc=y
 EMULATED_CMPXCHG sparc=y
+SPARC64_PAGE_SIZE_8KB sparc64=y
+SPARC64_PAGE_SIZE_64KB sparc64=n
+SECCOMP sparc64=y
+HOTPLUG_CPU sparc64=y
+GENERIC_HARDIRQS sparc64=y
 #- file kernel/time/Kconfig goes here
 #- file drivers/cpufreq/Kconfig goes here
+US3_FREQ sparc64=m
+US2E_FREQ sparc64=m
+HUGETLB_PAGE_SIZE_4MB sparc64=y
+HUGETLB_PAGE_SIZE_512K sparc64=n
+HUGETLB_PAGE_SIZE_64K sparc64=n
+NUMA sparc64=y
+ARCH_SELECT_MEMORY_MODEL sparc64=y
+ARCH_SPARSEMEM_ENABLE sparc64=y
+ARCH_SPARSEMEM_DEFAULT sparc64=y
 #- file mm/Kconfig goes here
+SCHED_SMT sparc64=y
+SCHED_MC sparc64=y
 #- file kernel/Kconfig.preempt goes here
 CMDLINE_BOOL sparc=n
 SUN_PM sparc=y
@@ -35,10 +61,14 @@
 SERIAL_CONSOLE sparc=y
 SBUS sparc=y
 SBUSCHAR sparc=y
+SUN_LDOMS sparc64=y
+PCI_DOMAINS sparc64=y
 #- file drivers/pci/Kconfig goes here
 #- file drivers/pcmcia/Kconfig goes here
 SUN_OPENPROMFS sparc=m
 #- file fs/Kconfig.binfmt goes here
+COMPAT sparc64=y
+SYSVIPC_COMPAT sparc64=y
 #- file net/Kconfig goes here
 #- file drivers/Kconfig goes here
 #- file drivers/sbus/char/Kconfig goes here
@@ -55,12 +85,6 @@
 TRACE_IRQFLAGS_SUPPORT sparc=y
 #- file lib/Kconfig.debug goes here
 DEBUG_STACK_USAGE sparc=n
-
-#-
-#- *** PROBABLY REMOVED OPTIONS ***
-#-
-ARCH_HAS_ILOG2_U32 sparc=n
-ARCH_HAS_ILOG2_U64 sparc=n
-SUN4 sparc=n
-SUN_AUXIO sparc=y
-SUN_IO sparc=y
+DEBUG_DCFLUSH sparc64=n
+STACK_DEBUG sparc64=n
+DEBUG_PAGEALLOC sparc64=n
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-sparc.config?r1=1.64&r2=1.65&f=u