diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:46:11 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:46:11 -0500 |
| commit | 72b3729657a0c46f187e4a6c500b239a0e4d391a (patch) | |
| tree | 47c746511fa3f4ef828d70bc2011f71d2cec86f1 /linux-2.6-32bit-mmap-exec-randomization.patch | |
| parent | 738764956426a09304f07623f75f711a013ef55a (diff) | |
| download | kernel-72b3729657a0c46f187e4a6c500b239a0e4d391a.tar.gz kernel-72b3729657a0c46f187e4a6c500b239a0e4d391a.tar.xz kernel-72b3729657a0c46f187e4a6c500b239a0e4d391a.zip | |
Revert "Merge branch 'kernel-git' strategy 'theirs'"
This reverts commit a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf, reversing
changes made to ee99a68c51ebd08409e45b63796f3c971c27e3d6.
Diffstat (limited to 'linux-2.6-32bit-mmap-exec-randomization.patch')
| -rw-r--r-- | linux-2.6-32bit-mmap-exec-randomization.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-2.6-32bit-mmap-exec-randomization.patch b/linux-2.6-32bit-mmap-exec-randomization.patch index d42638c2..fe91e0ab 100644 --- a/linux-2.6-32bit-mmap-exec-randomization.patch +++ b/linux-2.6-32bit-mmap-exec-randomization.patch @@ -14,9 +14,9 @@ --- b/mm/mmap.c +++ b/mm/mmap.c @@ -28,6 +28,7 @@ + #include <linux/rmap.h> #include <linux/mmu_notifier.h> #include <linux/perf_event.h> - #include <linux/audit.h> +#include <linux/random.h> #include <asm/uaccess.h> |