[pve-devel] r5160 - pve-kernel-2.6.32/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-09-15 10:08:40 +0000 (Wed, 15 Sep 2010)
New Revision: 5160

Modified:
   pve-kernel-2.6.32/trunk/config-2.6.32.diff
   pve-kernel-2.6.32/trunk/config-2.6.32.org
Log:


Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-09-15 10:01:05 UTC (rev 5159)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-09-15 10:08:40 UTC (rev 5160)
@@ -1,14 +1,5 @@
 --- config-2.6.32.org	2010-08-03 12:36:25.000000000 +0200
 +++ config-2.6.32	2010-09-08 11:28:43.000000000 +0200
-@@ -354,7 +354,7 @@
- CONFIG_HAVE_MLOCK=y
- CONFIG_HAVE_MLOCKED_PAGE_BIT=y
- CONFIG_MMU_NOTIFIER=y
--CONFIG_KSM=y
-+# CONFIG_KSM is not set
- CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
- CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
- CONFIG_MEMORY_FAILURE=y
 @@ -484,7 +484,7 @@
  CONFIG_PCI_MMCONFIG=y
  CONFIG_PCI_DOMAINS=y
@@ -78,22 +69,6 @@
  # CONFIG_DM_DEBUG is not set
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -3921,6 +3922,7 @@
- CONFIG_COMEDI_PCI_DRIVERS=m
- CONFIG_COMEDI_PCMCIA_DRIVERS=m
- CONFIG_COMEDI_USB_DRIVERS=m
-+CONFIG_COMEDI_8255=m
- # CONFIG_ASUS_OLED is not set
- # CONFIG_PANEL is not set
- # CONFIG_ALTERA_PCIE_CHDMA is not set
-@@ -3994,6 +3996,7 @@
- CONFIG_SPEAKUP_SYNTH_TXPRT=m
- CONFIG_SPEAKUP_SYNTH_DUMMY=m
- # CONFIG_FB_XGI is not set
-+# CONFIG_SAMSUNG_LAPTOP is not set
- CONFIG_X86_PLATFORM_DEVICES=y
- CONFIG_ACER_WMI=m
- CONFIG_ACERHDF=m
 @@ -4346,7 +4349,7 @@
  # Kernel hacking
  #

Modified: pve-kernel-2.6.32/trunk/config-2.6.32.org
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.org	2010-09-15 10:01:05 UTC (rev 5159)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.org	2010-09-15 10:08:40 UTC (rev 5160)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Sat Jul 24 01:09:59 2010
+# Mon Sep 13 18:54:35 2010
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -54,6 +54,7 @@
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 # CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
 
@@ -231,6 +232,7 @@
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_XEN=y
+CONFIG_XEN_PVHVM=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=32
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
@@ -354,7 +356,7 @@
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
+# CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
@@ -557,6 +559,7 @@
 CONFIG_VE_IPTABLES=y
 CONFIG_VZ_WDOG=m
 CONFIG_VZ_CHECKPOINT=m
+CONFIG_VZ_EVENT=m
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
@@ -3900,6 +3903,7 @@
 CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_PLATFORM_PCI=y
 CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
 CONFIG_ET131X=m
@@ -3914,6 +3918,8 @@
 CONFIG_PRISM2_USB=m
 # CONFIG_ECHO is not set
 # CONFIG_POCH is not set
+CONFIG_BRCM80211=m
+CONFIG_BRCM80211_PCI=y
 CONFIG_RT2860=m
 CONFIG_RT2870=m
 CONFIG_COMEDI=m
@@ -3921,6 +3927,7 @@
 CONFIG_COMEDI_PCI_DRIVERS=m
 CONFIG_COMEDI_PCMCIA_DRIVERS=m
 CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_8255=m
 # CONFIG_ASUS_OLED is not set
 # CONFIG_PANEL is not set
 # CONFIG_ALTERA_PCIE_CHDMA is not set
@@ -3994,6 +4001,7 @@
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 # CONFIG_FB_XGI is not set
+CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m