packages (Titanium): kernel-bare-grsecurity/kernel-bare-grsecurity-x86.conf...

[hawk]

Author: hawk                         Date: Wed Aug 19 00:16:05 2009 GMT
Module: packages                      Tag: Titanium
---- Log message:
- sync with kernel-vanilla:Titanium config, should fix PAE build

---- Files affected:
packages/kernel-bare-grsecurity:
   kernel-bare-grsecurity-x86.config (1.1.2.26 -> 1.1.2.27) 

---- Diffs:

================================================================
Index: packages/kernel-bare-grsecurity/kernel-bare-grsecurity-x86.config
diff -u packages/kernel-bare-grsecurity/kernel-bare-grsecurity-x86.config:1.1.2.26 packages/kernel-bare-grsecurity/kernel-bare-grsecurity-x86.config:1.1.2.27
--- packages/kernel-bare-grsecurity/kernel-bare-grsecurity-x86.config:1.1.2.26	Mon Aug 17 01:21:40 2009
+++ packages/kernel-bare-grsecurity/kernel-bare-grsecurity-x86.config	Wed Aug 19 02:16:00 2009
@@ -268,6 +268,9 @@
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=3
+CONFIG_MIGRATION=y
 # CONFIG_X86_MCE_NONFATAL is not set
 # CONFIG_X86_MCE_P4THERMAL is not set
 CONFIG_VM86=y
@@ -369,6 +372,7 @@
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_NUMA is not set
 CONFIG_ACPI_CUSTOM_DSDT_FILE=""
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
@@ -1735,6 +1739,7 @@
 CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG=m
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-bare-grsecurity/kernel-bare-grsecurity-x86.config?r1=1.1.2.26&r2=1.1.2.27&f=u