commit: 714b85c450678167c02f339d0d6990c0b50a74c8 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Apr 5 10:49:47 2018 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Thu Apr 5 15:34:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714b85c4
sys-boot/silo: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/7826 sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch | 54 ------------------------- 1 file changed, 54 deletions(-) diff --git a/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch b/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch deleted file mode 100644 index afcfc462ea8..00000000000 --- a/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch +++ /dev/null @@ -1,54 +0,0 @@ -# Patch to make silo compile and work with >=e2fsprogs-1.4.14 -# http://bugs.gentoo.org/show_bug.cgi?id=350677 -# http://marc.info/?l=linux-sparc&m=129468771631829&w=2 ---- silo.orig/common/malloc.c 2010-02-28 12:11:51.000000000 +0100 -+++ silo/common/malloc.c 2011-01-22 12:06:42.849946213 +0100 -@@ -27,6 +27,12 @@ - - static char *last_alloc = 0; - -+static char *align_ptr_to(char *ptr, unsigned long align) -+{ -+ return (char *) ((((unsigned long) ptr) + (align - 1UL)) & -+ ~(align - 1UL)); -+} -+ - void *malloc (int size) - { - char *caddr; -@@ -34,10 +40,34 @@ - caddr = malloc_ptr; - malloc_ptr += size; - last_alloc = caddr; -- malloc_ptr = (char *) ((((unsigned long) malloc_ptr) + 7) & (~7)); -+ malloc_ptr = align_ptr_to(malloc_ptr, 8UL); - return caddr; - } - -+int posix_memalign(void **memptr, unsigned long alignment, unsigned long size) -+{ -+ char *caddr; -+ -+ if (alignment & (alignment - 1UL)) -+ return -1; -+ if (alignment & (sizeof(void *) - 1UL)) -+ return -1; -+ -+ if (size == 0) { -+ *memptr = (void *) 0; -+ return 0; -+ } -+ -+ caddr = align_ptr_to(malloc_ptr, alignment); -+ malloc_ptr = (caddr + size); -+ last_alloc = caddr; -+ malloc_ptr = align_ptr_to(malloc_ptr, 8UL); -+ -+ *memptr = caddr; -+ -+ return 0; -+} -+ - void free (void *m) - { - if (m == last_alloc)
