diff options
| author |   Daniel Drake <dsd@gentoo.org> | 2005-05-01 22:58:17 +0000 |
|---|---|---|
| committer | Daniel Drake <dsd@gentoo.org> | 2005-05-01 22:58:17 +0000 |
| commit | 4c914d744682dae4d2c43c63fe6e2dd7068018b8 (patch) | |
| tree | 335e896820d4923a43f967bf4c807d5bb9ec5cba /sys-kernel | |
| parent | Remove stale versions (diff) | |
| download | historical-4c914d744682dae4d2c43c63fe6e2dd7068018b8.tar.gz historical-4c914d744682dae4d2c43c63fe6e2dd7068018b8.tar.bz2 historical-4c914d744682dae4d2c43c63fe6e2dd7068018b8.zip | |
remove another unused patch
Package-Manager: portage-1.589-cvs
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/wolk-sources/Manifest | 7 | ||||
| -rw-r--r-- | sys-kernel/wolk-sources/files/binfmt_elf.patch | 38 |
2 files changed, 3 insertions, 42 deletions
diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest index dccd4f00fc5d..5dda4428c1cd 100644 --- a/sys-kernel/wolk-sources/Manifest +++ b/sys-kernel/wolk-sources/Manifest @@ -27,12 +27,11 @@ MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/wolk-sources.CAN-2004-0497.patch 707 MD5 0f93b46ae17cbd0fc9b4d1cf5d704296 files/wolk-sources.81106.patch 2243 MD5 370cc17582bbb17605090009d24eba51 files/wolk-sources.CAN-2004-1016.patch 2168 -MD5 2ca46d61e534cfd18a965e9ae8e870e2 files/binfmt_elf.patch 2347 MD5 6ed89b8ac0b47a4c25d3a616ef9245cc files/wolk-sources.vma.patch 11369 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCdV1KiJcSIUGNthERAk3gAJ486C/0FhuBv4vvDEnasxA1kwuSNQCeLFuN -Da28iJ4JcETSkHjo9v8jzSQ= -=nXmg +iD8DBQFCdWAfiJcSIUGNthERAsd2AKCAyGpStIu8wNGFeGb7cCrdIyXuBQCeJ+uC +/qk0D10YvJKk6AO3Qf4JLyA= +=YMQQ -----END PGP SIGNATURE----- diff --git a/sys-kernel/wolk-sources/files/binfmt_elf.patch b/sys-kernel/wolk-sources/files/binfmt_elf.patch deleted file mode 100644 index 81590821bd01..000000000000 --- a/sys-kernel/wolk-sources/files/binfmt_elf.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- fs/binfmt_elf.c 2004-07-20 14:54:17.000000000 -0500 -+++ fs/binfmt_elf.c.new 2004-07-21 10:04:29.000000000 -0500 -@@ -105,7 +105,7 @@ - - #ifdef CONFIG_GRKERNSEC_PAX_RANDEXEC - if (current->flags & PF_PAX_RANDEXEC) -- __do_mmap_pgoff(NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start); -+ __do_mmap_pgoff(current->mm, NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start); - #endif - - } -@@ -983,7 +983,7 @@ - if (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len) - continue; - down_write(¤t->mm->mmap_sem); -- error = __do_mmap_pgoff(bprm->file, addr, len, elf_prot, elf_flags, (elf_ppnt->p_offset - ELF_PAGEOFFSET(elf_ppnt->p_vaddr)) >> PAGE_SHIFT); -+ error = error = __do_mmap_pgoff(current->mm, bprm->file, addr, len, elf_prot, elf_flags, (elf_ppnt->p_offset - ELF_PAGEOFFSET(elf_ppnt->p_vaddr)) >> PAGE_SHIFT); - up_write(¤t->mm->mmap_sem); - } - #endif -@@ -1011,14 +1011,14 @@ - #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC - if (current->flags & PF_PAX_SEGMEXEC) { - if (elf_prot & PROT_EXEC) { -- load_addr_random = __do_mmap_pgoff(NULL, ELF_PAGESTART(load_bias_random + vaddr), elf_ppnt->p_memsz + ELF_PAGEOFFSET(elf_ppnt->p_vaddr), PROT_NONE, MAP_PRIVATE | MAP_FIXED, 0UL); -+ load_addr_random = __do_mmap_pgoff(current->mm, NULL, ELF_PAGESTART(load_bias_random + vaddr), elf_ppnt->p_memsz + ELF_PAGEOFFSET(elf_ppnt->p_vaddr), PROT_NONE, MAP_PRIVATE | MAP_FIXED, 0UL); - if (!BAD_ADDR(load_addr_random)) { -- load_addr_random = __do_mmap_pgoff(NULL, ELF_PAGESTART(load_bias_random + vaddr + SEGMEXEC_TASK_SIZE), 0UL, elf_prot, elf_flags | MAP_MIRROR, error); -+ load_addr_random = __do_mmap_pgoff(current->mm, NULL, ELF_PAGESTART(load_bias_random + vaddr + SEGMEXEC_TASK_SIZE), 0UL, elf_prot, elf_flags | MAP_MIRROR, error); - if (!BAD_ADDR(load_addr_random)) - load_addr_random -= SEGMEXEC_TASK_SIZE; - } - } else -- load_addr_random = __do_mmap_pgoff(NULL, ELF_PAGESTART(load_bias_random + vaddr), 0UL, elf_prot, elf_flags | MAP_MIRROR, error); -+ load_addr_random = __do_mmap_pgoff(current->mm, NULL, ELF_PAGESTART(load_bias_random + vaddr), 0UL, elf_prot, elf_flags | MAP_MIRROR, error); - } - #endif - |