rpms/kernel/devel linux-2.6-execshield.patch,1.86,1.87

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6402

Modified Files:
	linux-2.6-execshield.patch 
Log Message:
checkpatch fluff

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- linux-2.6-execshield.patch	18 Feb 2008 18:49:20 -0000	1.86
+++ linux-2.6-execshield.patch	18 Feb 2008 19:55:06 -0000	1.87
@@ -328,7 +328,7 @@
 -			return -EINVAL;
 -		}
 -	}
-+	} else if (!strcmp(str,"off")) {
++	} else if (!strcmp(str, "off")) {
 +		disable_nx = 1;
 +		__supported_pte_mask &= ~_PAGE_NX;
 +		exec_shield = 0;
@@ -852,7 +852,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1430,8 +1442,75 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1430,8 +1442,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -880,9 +880,8 @@
 +		addr = PAGE_ALIGN(addr);
 +		vma = find_vma(mm, addr);
 +		if (TASK_SIZE - len >= addr &&
-+		    (!vma || addr + len <= vma->vm_start)) {
++		    (!vma || addr + len <= vma->vm_start))
 +			return addr;
-+		}
 +	}
 +
 +	addr = SHLIB_BASE;