[pve-devel] r6175 - pve-kernel-2.6.32-rh/pve2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-27 07:34:47 +0200 (Mon, 27 Jun 2011)
New Revision: 6175

Modified:
   pve-kernel-2.6.32-rh/pve2/README
   pve-kernel-2.6.32-rh/pve2/config-2.6.32.diff
Log:
disable kernel mode setting


Modified: pve-kernel-2.6.32-rh/pve2/README
===================================================================
--- pve-kernel-2.6.32-rh/pve2/README	2011-06-27 05:11:44 UTC (rev 6174)
+++ pve-kernel-2.6.32-rh/pve2/README	2011-06-27 05:34:47 UTC (rev 6175)
@@ -85,8 +85,13 @@
   	 CONFIG_BLK_DEV_SD=y
   	 CONFIG_BLK_DEV_SR=y
   	 CONFIG_BLK_DEV_DM=y
- 
 
+- disable kernel mode setting
+
+   disable CONFIG_DRM_I915_KMS
+   disable CONFIG_DRM_RADEON_KMS
+
+
 Testing final kernel with kvm
 -----------------------------
 

Modified: pve-kernel-2.6.32-rh/pve2/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32-rh/pve2/config-2.6.32.diff	2011-06-27 05:11:44 UTC (rev 6174)
+++ pve-kernel-2.6.32-rh/pve2/config-2.6.32.diff	2011-06-27 05:34:47 UTC (rev 6175)
@@ -1,5 +1,5 @@
---- config-2.6.32-042stab018.1.x86_64	2011-06-24 07:48:34.000000000 +0200
-+++ config-2.6.32	2011-06-24 10:50:39.000000000 +0200
+--- config-2.6.32-042stab018.1.x86_64	2011-06-24 12:43:39.000000000 +0200
++++ config-2.6.32	2011-06-27 07:31:18.000000000 +0200
 @@ -101,7 +101,7 @@
  CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
  CONFIG_GROUP_SCHED=y
@@ -18,7 +18,7 @@
  # CONFIG_MODULE_SIG_FORCE is not set
  CONFIG_MODULE_VERIFY=y
  CONFIG_STOP_MACHINE=y
-@@ -1322,10 +1323,10 @@
+@@ -1322,10 +1322,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -31,7 +31,7 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1523,7 +1524,7 @@
+@@ -1523,7 +1523,7 @@
  # CONFIG_MULTICORE_RAID456 is not set
  # CONFIG_MD_MULTIPATH is not set
  CONFIG_MD_FAULTY=m
@@ -40,7 +40,21 @@
  CONFIG_DM_DEBUG=y
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -3092,6 +3093,11 @@
+@@ -2964,11 +2964,11 @@
+ # CONFIG_DRM_TDFX is not set
+ CONFIG_DRM_R128=m
+ CONFIG_DRM_RADEON=m
+-CONFIG_DRM_RADEON_KMS=y
++# CONFIG_DRM_RADEON_KMS is not set
+ # CONFIG_DRM_I810 is not set
+ # CONFIG_DRM_I830 is not set
+ CONFIG_DRM_I915=m
+-CONFIG_DRM_I915_KMS=y
++# CONFIG_DRM_I915_KMS is not set
+ CONFIG_DRM_MGA=m
+ CONFIG_DRM_SIS=m
+ CONFIG_DRM_VIA=m
+@@ -3092,6 +3092,11 @@
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
  CONFIG_LOGO_LINUX_CLUT224=y
@@ -52,7 +66,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-@@ -4043,7 +4049,7 @@
+@@ -4043,7 +4048,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,7 +75,7 @@
  # CONFIG_ENABLE_WARN_DEPRECATED is not set
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4087,7 +4093,7 @@
+@@ -4087,7 +4092,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y