diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
| commit | a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf (patch) | |
| tree | f24c9da1c1927f290aa3d1b640d7fa272860520d /linux-2.6-32bit-mmap-exec-randomization.patch | |
| parent | ee99a68c51ebd08409e45b63796f3c971c27e3d6 (diff) | |
| parent | 98e6119f39d3b83af3b533bed6bcff0e096f2397 (diff) | |
| download | kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.gz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.xz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.zip | |
Merge branch 'kernel-git' strategy 'theirs'
Conflicts:
xhci_hcd-suspend-resume.patch
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 fe91e0ab..d42638c2 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> |