re-enable barrier patches to test

[linux-2.6.git] / kernel-2.6.spec

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 3317bc5..922d493 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -217,8 +217,8 @@ Patch800: linux-2.6-800-fix-4-bit-apicid-assumption.patch
 
 Patch810: linux-2.6-810-ich10.patch
 
-#Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch
-#Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
+Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch
+Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
 
 Patch950: linux-2.6.950-ext3_backports.patch
 
@@ -459,10 +459,8 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 800
 %ApplyPatch 810
 
-%if 0
 %ApplyPatch 900
 %ApplyPatch 910
-%endif
 
 %ApplyPatch 950
 
@@ -557,6 +555,7 @@ BuildKernel() {
     make -s ARCH=$Arch INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr
     find $RPM_BUILD_ROOT/%{_includedir} -name \*.cmd -delete
     rm -f $RPM_BUILD_ROOT/%{_includedir}/{..,.}{check,install}*
+    rm -rf $RPM_BUILD_ROOT/usr/include/scsi
 %endif
 
 %if %{iwlwifi}