X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fqsnet-rhel4-2.6.patch;h=f198a43d9ef5a09a66854a4be29ce38c7ec0172f;hp=b4a82803b99760b32dcfe64e2ad191d51e0bca37;hb=4f958e8d4ebe2b040d4ee01e9f205e15aecf8498;hpb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c

diff --git a/lustre/kernel_patches/patches/qsnet-rhel4-2.6.patch b/lustre/kernel_patches/patches/qsnet-rhel4-2.6.patch
index b4a8280..f198a43 100644
--- a/lustre/kernel_patches/patches/qsnet-rhel4-2.6.patch
+++ b/lustre/kernel_patches/patches/qsnet-rhel4-2.6.patch
@@ -1198,9 +1198,9 @@ Index: linux-269-5502/mm/memory.c
  out:
  	return VM_FAULT_MINOR;
 @@ -1813,6 +1824,7 @@ retry:
+ 
  	/* no need to invalidate: a not-present page shouldn't be cached */
  	update_mmu_cache(vma, address, entry);
- 	lazy_mmu_prot_update(entry);
 +	ioproc_update_page(vma, address);
  	spin_unlock(&mm->page_table_lock);
  out:
@@ -1693,7 +1693,7 @@ Index: linux-269-5502/include/linux/ptrack.h
 +	.ptrack_list = LIST_HEAD_INIT(tsk.ptrack_list)
 +
 +#else
-+#define ptrack_call_callbacks (phase, child) (0)
++#define ptrack_call_callbacks(phase, child) (0)
 +
 +#define INIT_TASK_PTRACK(tsk)
 +