diff for duplicates of <4c73f3ed34663af90@agluck-desktop.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index 3a57962..f23d692 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,11 +41,11 @@ index 2ed2267..5127b1c 100644 static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address) { - address &= PAGE_MASK; -- if ((vma->vm_flags & VM_GROWSDOWN) && address = vma->vm_start) { +- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) { - struct vm_area_struct *prev = vma->vm_prev; + if (vma->vm_flags & VM_GROWSDOWN) { + address &= PAGE_MASK; -+ if (address = vma->vm_start) { ++ if (address == vma->vm_start) { + struct vm_area_struct *prev = vma->vm_prev; - /* @@ -54,7 +54,7 @@ index 2ed2267..5127b1c 100644 - * That's only ok if it's the same stack mapping - * that has gotten split.. - */ -- if (prev && prev->vm_end = address) +- if (prev && prev->vm_end == address) - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM; + /* + * Is there a mapping abutting this one below? @@ -62,7 +62,7 @@ index 2ed2267..5127b1c 100644 + * That's only ok if it's the same stack mapping + * that has gotten split.. + */ -+ if (prev && prev->vm_end = address) ++ if (prev && prev->vm_end == address) + return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM; - expand_stack(vma, address - PAGE_SIZE); @@ -72,11 +72,11 @@ index 2ed2267..5127b1c 100644 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64) + else if (vma->vm_flags & VM_GROWSUP) { + address = PAGE_ALIGN(address + 1); -+ if (address = vma->vm_end) { ++ if (address == vma->vm_end) { + struct vm_area_struct *next = vma->vm_next; + + /* As VM_GROWSDOWN but s/below/above/ */ -+ if (next && next->vm_start = address) ++ if (next && next->vm_start == address) + return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM; + + expand_upwards(vma, address); diff --git a/a/content_digest b/N1/content_digest index c08f913..c4a746e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Luck, Tony <tony.luck@intel.com>\0" "Subject\0[PATCH] guard page for stacks that grow upwards\0" - "Date\0Tue, 24 Aug 2010 16:31:41 +0000\0" + "Date\0Tue, 24 Aug 2010 09:31:41 -0700\0" "To\0Linus Torvalds <torvalds@linux-foundation.org>\0" "Cc\0linux-kernel@vger.kernel.org" linux-parisc@vger.kernel.org @@ -50,11 +50,11 @@ " static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)\n" " {\n" "-\taddress &= PAGE_MASK;\n" - "-\tif ((vma->vm_flags & VM_GROWSDOWN) && address = vma->vm_start) {\n" + "-\tif ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {\n" "-\t\tstruct vm_area_struct *prev = vma->vm_prev;\n" "+\tif (vma->vm_flags & VM_GROWSDOWN) {\n" "+\t\taddress &= PAGE_MASK;\n" - "+\t\tif (address = vma->vm_start) {\n" + "+\t\tif (address == vma->vm_start) {\n" "+\t\t\tstruct vm_area_struct *prev = vma->vm_prev;\n" " \n" "-\t\t/*\n" @@ -63,7 +63,7 @@ "-\t\t * That's only ok if it's the same stack mapping\n" "-\t\t * that has gotten split..\n" "-\t\t */\n" - "-\t\tif (prev && prev->vm_end = address)\n" + "-\t\tif (prev && prev->vm_end == address)\n" "-\t\t\treturn prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;\n" "+\t\t\t/*\n" "+\t\t\t * Is there a mapping abutting this one below?\n" @@ -71,7 +71,7 @@ "+\t\t\t * That's only ok if it's the same stack mapping\n" "+\t\t\t * that has gotten split..\n" "+\t\t\t */\n" - "+\t\t\tif (prev && prev->vm_end = address)\n" + "+\t\t\tif (prev && prev->vm_end == address)\n" "+\t\t\t\treturn prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;\n" " \n" "-\t\texpand_stack(vma, address - PAGE_SIZE);\n" @@ -81,11 +81,11 @@ "+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)\n" "+\telse if (vma->vm_flags & VM_GROWSUP) {\n" "+\t\taddress = PAGE_ALIGN(address + 1);\n" - "+\t\tif (address = vma->vm_end) {\n" + "+\t\tif (address == vma->vm_end) {\n" "+\t\t\tstruct vm_area_struct *next = vma->vm_next;\n" "+\n" "+\t\t\t/* As VM_GROWSDOWN but s/below/above/ */\n" - "+\t\t\tif (next && next->vm_start = address)\n" + "+\t\t\tif (next && next->vm_start == address)\n" "+\t\t\t\treturn next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;\n" "+\n" "+\t\t\texpand_upwards(vma, address);\n" @@ -110,4 +110,4 @@ " {\n" " \tint error;" -42a56dfc8383ecdf8edfe4bf2af794650a90d4b359f09ad6ca2a75d16539063e +fee112b3acc702c418ee6536f2c751bd94f99023b537c1d3d1f5321a9c0656b3
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.