From e8409b1dce1d927283cb4999d9902b8cda4f86fc Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Fri, 20 Jan 2012 13:32:57 -0500
Subject: Rebase to Linux 3.3-rc1

The utrace patch is left unapplied as it doesn't apply cleanly any longer
---
 config-x86_64-generic | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config-x86_64-generic')

diff --git a/config-x86_64-generic b/config-x86_64-generic
index 344a3932..945ad0c0 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -11,6 +11,7 @@ CONFIG_K8_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
+# CONFIG_X86_NUMACHIP is not set
 
 CONFIG_NR_CPUS=64
 CONFIG_PHYSICAL_START=0x1000000
@@ -20,6 +21,7 @@ CONFIG_IA32_EMULATION=y
 
 CONFIG_AMD_IOMMU=y
 CONFIG_AMD_IOMMU_STATS=y
+CONFIG_AMD_IOMMU_V2=m
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_SWIOTLB=y
 # CONFIG_CALGARY_IOMMU is not set
@@ -35,6 +37,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_HOTPLUG_PCI_SHPC=m
 
 CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-- 
cgit