Kaynağa Gözat

kernel: disable PCI MSI by default (CONFIG_PCI_MSI_DEFAULT_ON)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3900 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 yıl önce
ebeveyn
işleme
33a535b53e

+ 1 - 1
k/kernel/kernel-2.6.35-i686-pae.config

@@ -584,7 +584,7 @@ CONFIG_PCIEASPM=y
 CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_DEFAULT_ON=y
+# CONFIG_PCI_MSI_DEFAULT_ON is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y

+ 1 - 1
k/kernel/kernel-2.6.35-i686.config

@@ -581,7 +581,7 @@ CONFIG_PCIEASPM=y
 CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_DEFAULT_ON=y
+# CONFIG_PCI_MSI_DEFAULT_ON is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y

+ 1 - 1
k/kernel/kernel-2.6.35-x86_64.config

@@ -565,7 +565,7 @@ CONFIG_PCIEASPM=y
 CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_DEFAULT_ON=y
+# CONFIG_PCI_MSI_DEFAULT_ON is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y

+ 10 - 6
k/kernel/kernel-vl.spec

@@ -28,7 +28,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define patchlevel 13
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release 17%{?_dist_release}
+%define release 18%{?_dist_release}
 
 %define make_target bzImage
 %define hdrarch %_target_cpu
@@ -584,8 +584,8 @@ cd linux-%{kversion}
 
 # drm fixes
 %if %{_apply_drm_patches}
-%patch2700 -p1 -b .drm-update
-%patch2710 -p1 -b .ignore-invalid-edid-extensions
+%patch2700 -p1
+%patch2710 -p1
 %endif
 
 # v4l
@@ -608,11 +608,11 @@ cd linux-%{kversion}
 
 %if !%{_minimum_patches}
 # unionfs
-%patch6030 -p1 -b .unionfs
-%patch6031 -p1 -b .open-unlink-ftruncate-crash-fix
+%patch6030 -p1
+%patch6031 -p1
 
 # tuxonice
-%patch9000 -p1 -b .tuxonice
+%patch9000 -p1
 %endif
 
 #
@@ -1116,6 +1116,10 @@ fi
 
 
 %changelog
+* Mon May 16 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-18
+- update configs
+  - disable PCI MSI by default (CONFIG_PCI_MSI_DEFAULT_ON)
+
 * Sun May 15 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-17
 - update to unionfs 2.5.9.1
 - update to tuxonice 3.2