packages (Titanium): kernel-vanilla/kernel-vanilla-x86.config - fix i686/pa...

[hawk]

Author: hawk                         Date: Thu Apr 28 19:29:30 2011 GMT
Module: packages                      Tag: Titanium
---- Log message:
- fix i686/pae builds

---- Files affected:
packages/kernel-vanilla:
   kernel-vanilla-x86.config (1.1.2.34 -> 1.1.2.35) 

---- Diffs:

================================================================
Index: packages/kernel-vanilla/kernel-vanilla-x86.config
diff -u packages/kernel-vanilla/kernel-vanilla-x86.config:1.1.2.34 packages/kernel-vanilla/kernel-vanilla-x86.config:1.1.2.35
--- packages/kernel-vanilla/kernel-vanilla-x86.config:1.1.2.34	Thu Apr 28 20:19:18 2011
+++ packages/kernel-vanilla/kernel-vanilla-x86.config	Thu Apr 28 21:29:25 2011
@@ -156,11 +156,13 @@
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
 
 #
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+CONFIG_PERF_COUNTERS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
@@ -344,6 +346,7 @@
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
 CONFIG_NUMA=y
@@ -357,6 +360,7 @@
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_FLATMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-vanilla/kernel-vanilla-x86.config?r1=1.1.2.34&r2=1.1.2.35&f=u