Removed old versions

Package-Manager: portage-2.0.51-r15

6 files changed, 0 insertions, 1013 deletions

diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest
index f893b714cae8..69fe4355c0a0 100644
--- a/sys-kernel/sparc-sources/Manifest
+++ b/sys-kernel/sparc-sources/Manifest
@@ -2,12 +2,7 @@ MD5 ad6df38f1e71fad5f989b3069c4a681a ChangeLog 13208
 MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381
 MD5 f6d3178a1f20c715f19636da0bb66784 sparc-sources-2.4.29.ebuild 1106
 MD5 da04d7d928b197b9e193ec1c1d7b8063 sparc-sources-2.4.28-r6.ebuild 2196
-MD5 7c9ed2b4468617c2381f04413c746deb sparc-sources-2.4.28-r5.ebuild 2402
 MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
-MD5 6ed89b8ac0b47a4c25d3a616ef9245cc files/2.4.28-vma-PaX.patch 11369
 MD5 18898e8c936c287f66f4f234a997f93e files/digest-sparc-sources-2.4.29 140
 MD5 387e70ce7c98618810dea0f521df76eb files/generate-asm-sparc 1661
-MD5 757ee1239c3f14645ccea3640d551e11 files/linux-2.4.28-CAN-2004-1056.patch 11249
 MD5 ef36754fed8860804c3c8666200b3013 files/digest-sparc-sources-2.4.28-r6 143
-MD5 29e531cdd3f2effce5e31a1f2afb5b5d files/2.4-brk-locked-plasmaroo.PaX.patch 8912
-MD5 ae7509dcd16fac1bc6c6f42cc821b16b files/digest-sparc-sources-2.4.28-r5 143
diff --git a/sys-kernel/sparc-sources/files/2.4-brk-locked-plasmaroo.PaX.patch b/sys-kernel/sparc-sources/files/2.4-brk-locked-plasmaroo.PaX.patch
deleted file mode 100644
index c275b0b1649e..000000000000
--- a/sys-kernel/sparc-sources/files/2.4-brk-locked-plasmaroo.PaX.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -ur linux-2.4.28-gentoo-r4/arch/mips/kernel/irixelf.c linux-2.4.28-gentoo-r5/arch/mips/kernel/irixelf.c
---- linux-2.4.28-gentoo-r4/arch/mips/kernel/irixelf.c	2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/arch/mips/kernel/irixelf.c	2005-01-07 20:20:32.000000000 +0000
-@@ -130,7 +130,7 @@
- 	end = PAGE_ALIGN(end);
- 	if (end <= start)
- 		return;
--	do_brk(start, end - start);
-+	do_brk_locked(start, end - start);
- }
- 
- 
-@@ -379,7 +379,7 @@
- 
- 	/* Map the last of the bss segment */
- 	if (last_bss > len) {
--		do_brk(len, (last_bss - len));
-+		do_brk_locked(len, (last_bss - len));
- 	}
- 	kfree(elf_phdata);
- 
-@@ -567,7 +567,7 @@
- 	unsigned long v;
- 	struct prda *pp;
- 
--	v =  do_brk (PRDA_ADDRESS, PAGE_SIZE);
-+	v =  do_brk_locked (PRDA_ADDRESS, PAGE_SIZE);
- 
- 	if (v < 0)
- 		return;
-@@ -859,7 +859,7 @@
- 	len = (elf_phdata->p_filesz + elf_phdata->p_vaddr+ 0xfff) & 0xfffff000;
- 	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
- 	if (bss > len)
--	  do_brk(len, bss-len);
-+	  do_brk_locked(len, bss-len);
- 	kfree(elf_phdata);
- 	return 0;
- }
-diff -ur linux-2.4.28-gentoo-r4/arch/sparc64/kernel/binfmt_aout32.c linux-2.4.28-gentoo-r5/arch/sparc64/kernel/binfmt_aout32.c
---- linux-2.4.28-gentoo-r4/arch/sparc64/kernel/binfmt_aout32.c	2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/arch/sparc64/kernel/binfmt_aout32.c	2005-01-07 20:20:32.000000000 +0000
-@@ -49,7 +49,7 @@
- 	end = PAGE_ALIGN(end);
- 	if (end <= start)
- 		return;
--	do_brk(start, end - start);
-+	do_brk_locked(start, end - start);
- }
- 
- /*
-@@ -246,10 +246,10 @@
- 	if (N_MAGIC(ex) == NMAGIC) {
- 		loff_t pos = fd_offset;
- 		/* Fuck me plenty... */
--		error = do_brk(N_TXTADDR(ex), ex.a_text);
-+		error = do_brk_locked(N_TXTADDR(ex), ex.a_text);
- 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
- 			  ex.a_text, &pos);
--		error = do_brk(N_DATADDR(ex), ex.a_data);
-+		error = do_brk_locked(N_DATADDR(ex), ex.a_data);
- 		bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
- 			  ex.a_data, &pos);
- 		goto beyond_if;
-@@ -257,7 +257,7 @@
- 
- 	if (N_MAGIC(ex) == OMAGIC) {
- 		loff_t pos = fd_offset;
--		do_brk(N_TXTADDR(ex) & PAGE_MASK,
-+		do_brk_locked(N_TXTADDR(ex) & PAGE_MASK,
- 			ex.a_text+ex.a_data + PAGE_SIZE - 1);
- 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
- 			  ex.a_text+ex.a_data, &pos);
-@@ -272,7 +272,7 @@
- 
- 		if (!bprm->file->f_op->mmap) {
- 			loff_t pos = fd_offset;
--			do_brk(0, ex.a_text+ex.a_data);
-+			do_brk_locked(0, ex.a_text+ex.a_data);
- 			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
- 				  ex.a_text+ex.a_data, &pos);
- 			goto beyond_if;
-@@ -388,7 +388,7 @@
- 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
- 	bss = ex.a_text + ex.a_data + ex.a_bss;
- 	if (bss > len) {
--		error = do_brk(start_addr + len, bss - len);
-+		error = do_brk_locked(start_addr + len, bss - len);
- 		retval = error;
- 		if (error != start_addr + len)
- 			goto out;
-diff -ur linux-2.4.28-gentoo-r4/fs/binfmt_aout.c linux-2.4.28-gentoo-r5/fs/binfmt_aout.c
---- linux-2.4.28-gentoo-r4/fs/binfmt_aout.c	2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/fs/binfmt_aout.c	2005-01-07 20:20:32.000000000 +0000
-@@ -46,7 +46,7 @@
- 	start = PAGE_ALIGN(start);
- 	end = PAGE_ALIGN(end);
- 	if (end > start) {
--		unsigned long addr = do_brk(start, end - start);
-+		unsigned long addr = do_brk_locked(start, end - start);
- 		if (BAD_ADDR(addr))
- 			return addr;
- 	}
-@@ -341,10 +341,10 @@
- 		loff_t pos = fd_offset;
- 		/* Fuck me plenty... */
- 		/* <AOL></AOL> */
--		error = do_brk(N_TXTADDR(ex), ex.a_text);
-+		error = do_brk_locked(N_TXTADDR(ex), ex.a_text);
- 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
- 			  ex.a_text, &pos);
--		error = do_brk(N_DATADDR(ex), ex.a_data);
-+		error = do_brk_locked(N_DATADDR(ex), ex.a_data);
- 		bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
- 			  ex.a_data, &pos);
- 		goto beyond_if;
-@@ -365,7 +365,7 @@
- 		map_size = ex.a_text+ex.a_data;
- #endif
- 
--		error = do_brk(text_addr & PAGE_MASK, map_size);
-+		error = do_brk_locked(text_addr & PAGE_MASK, map_size);
- 		if (error != (text_addr & PAGE_MASK)) {
- 			send_sig(SIGKILL, current, 0);
- 			return error;
-@@ -399,7 +399,7 @@
- 
- 		if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
- 			loff_t pos = fd_offset;
--			do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
-+			do_brk_locked(N_TXTADDR(ex), ex.a_text+ex.a_data);
- 			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
- 					ex.a_text+ex.a_data, &pos);
- 			flush_icache_range((unsigned long) N_TXTADDR(ex),
-@@ -500,7 +500,7 @@
- 			error_time = jiffies;
- 		}
- 
--		do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
-+		do_brk_locked(start_addr, ex.a_text + ex.a_data + ex.a_bss);
- 		
- 		file->f_op->read(file, (char *)start_addr,
- 			ex.a_text + ex.a_data, &pos);
-@@ -524,7 +524,7 @@
- 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
- 	bss = ex.a_text + ex.a_data + ex.a_bss;
- 	if (bss > len) {
--		error = do_brk(start_addr + len, bss - len);
-+		error = do_brk_locked(start_addr + len, bss - len);
- 		retval = error;
- 		if (error != start_addr + len)
- 			goto out;
-diff -ur linux-2.4.28-gentoo-r4/fs/binfmt_elf.c linux-2.4.28-gentoo-r5/fs/binfmt_elf.c
---- linux-2.4.28-gentoo-r4/fs/binfmt_elf.c	2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/fs/binfmt_elf.c	2005-01-07 20:20:46.000000000 +0000
-@@ -88,6 +88,7 @@ static void set_brk(unsigned long start,
- 	end = ELF_PAGEALIGN(end);
- 	if (end <= start)
- 		return;
-+	down_write(&current->mm->mmap_sem);
- 	do_brk(start, end - start);
- 
- #ifdef CONFIG_GRKERNSEC_PAX_RANDEXEC
-@@ -95,6 +96,7 @@ static void set_brk(unsigned long start,
- 		__do_mmap_pgoff(NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start);
- #endif
- 
-+	up_write(&current->mm->mmap_sem);
- }
- 
- 
-@@ -295,7 +297,9 @@ static unsigned long load_elf_interp(str
- 	 */
- 	if (interp_elf_ex->e_phentsize != sizeof(struct elf_phdr))
- 		goto out;
--	if (interp_elf_ex->e_phnum > 65536U / sizeof(struct elf_phdr))
-+
-+	if (interp_elf_ex->e_phnum < 1 ||
-+	    interp_elf_ex->e_phnum > 65536U / sizeof(struct elf_phdr))
- 		goto out;
- 
- 	/* Now read in all of the header information */ 
-@@ -370,7 +370,7 @@
- 
- 	/* Map the last of the bss segment */
- 	if (last_bss > elf_bss)
--		do_brk(elf_bss, last_bss - elf_bss);
-+		do_brk_locked(elf_bss, last_bss - elf_bss);
- 
- 	*interp_load_addr = load_addr;
- 	error = ((unsigned long) interp_elf_ex->e_entry) + load_addr;
-@@ -407,7 +407,7 @@
- 		goto out;
- 	}
- 
--	do_brk(0, text_data);
-+	do_brk_locked(0, text_data);
- 	if (!interpreter->f_op || !interpreter->f_op->read)
- 		goto out;
- 	if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0)
-@@ -415,7 +415,7 @@
- 	flush_icache_range((unsigned long)addr,
- 	                   (unsigned long)addr + text_data);
- 
--	do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
-+	do_brk_locked(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
- 		interp_ex->a_bss);
- 	elf_entry = interp_ex->a_entry;
- 
-@@ -1271,7 +1271,7 @@
- 	len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1);
- 	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
- 	if (bss > len)
--		do_brk(len, bss - len);
-+		do_brk_locked(len, bss - len);
- 	error = 0;
- 
- out_free_ph:
-diff -ur linux-2.4.28-gentoo-r4/include/linux/mm.h linux-2.4.28-gentoo-r5/include/linux/mm.h
---- linux-2.4.28-gentoo-r4/include/linux/mm.h	2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/include/linux/mm.h	2005-01-07 20:20:32.000000000 +0000
-@@ -601,6 +601,7 @@
- extern int do_munmap(struct mm_struct *, unsigned long, size_t);
- 
- extern unsigned long do_brk(unsigned long, unsigned long);
-+extern unsigned long do_brk_locked(unsigned long, unsigned long);
- 
- static inline void __vma_unlink(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct * prev)
- {
-diff -ur linux-2.4.28-gentoo-r4/kernel/ksyms.c linux-2.4.28-gentoo-r5/kernel/ksyms.c
---- linux-2.4.28-gentoo-r4/kernel/ksyms.c	2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/kernel/ksyms.c	2005-01-07 20:20:32.000000000 +0000
-@@ -90,6 +90,7 @@
- EXPORT_SYMBOL(__do_mmap_pgoff);
- EXPORT_SYMBOL(do_munmap);
- EXPORT_SYMBOL(do_brk);
-+EXPORT_SYMBOL(do_brk_locked);
- EXPORT_SYMBOL(exit_mm);
- EXPORT_SYMBOL(exit_files);
- EXPORT_SYMBOL(exit_fs);
-diff -ur linux-2.4.28-gentoo-r4/mm/mmap.c linux-2.4.28-gentoo-r5/mm/mmap.c
---- linux-2.4.28-gentoo-r4/mm/mmap.c	2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/mm/mmap.c	2005-01-07 20:20:32.000000000 +0000
-@@ -1401,6 +1401,21 @@
- 	return addr;
- }
- 
-+/* locking version of do_brk. */
-+unsigned long do_brk_locked(unsigned long addr, unsigned long len)
-+{
-+	unsigned long ret;
-+
-+	down_write(&current->mm->mmap_sem);
-+	ret = do_brk(addr, len);
-+	up_write(&current->mm->mmap_sem);
-+
-+	return ret;
-+}
-+
-+
-+
-+
- /* Build the RB tree corresponding to the VMA list. */
- void build_mmap_rb(struct mm_struct * mm)
- {
diff --git a/sys-kernel/sparc-sources/files/2.4.28-vma-PaX.patch b/sys-kernel/sparc-sources/files/2.4.28-vma-PaX.patch
deleted file mode 100644
index 188da50f6655..000000000000
--- a/sys-kernel/sparc-sources/files/2.4.28-vma-PaX.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-diff -ur linux-2.4.28-gentoo-r2/arch/ia64/ia32/binfmt_elf32.c linux-2.4.28-gentoo-r3/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.4.28-gentoo-r2/arch/ia64/ia32/binfmt_elf32.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/ia64/ia32/binfmt_elf32.c	2004-12-24 14:34:29.531899728 +0000
-@@ -95,7 +95,11 @@
- 		vma->vm_private_data = NULL;
- 		down_write(&current->mm->mmap_sem);
- 		{
--			insert_vm_struct(current->mm, vma);
-+			if (insert_vm_struct(current->mm, vma)) {
-+				kmem_cache_free(vm_area_cachep, vma);
-+				up_write(&current->mm->mmap_sem);
-+				return;
-+			}
- 		}
- 		up_write(&current->mm->mmap_sem);
- 	}
-@@ -117,7 +121,11 @@
- 		vma->vm_private_data = NULL;
- 		down_write(&current->mm->mmap_sem);
- 		{
--			insert_vm_struct(current->mm, vma);
-+			if (insert_vm_struct(current->mm, vma)) {
-+				kmem_cache_free(vm_area_cachep, vma);
-+				up_write(&current->mm->mmap_sem);
-+				return;
-+			}
- 		}
- 		up_write(&current->mm->mmap_sem);
- 	}
-@@ -164,7 +172,7 @@
- {
- 	unsigned long stack_base;
- 	struct vm_area_struct *mpnt;
--	int i;
-+	int i, ret;
- 
- 	stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE;
- 
-@@ -188,7 +196,11 @@
- 		mpnt->vm_pgoff = 0;
- 		mpnt->vm_file = NULL;
- 		mpnt->vm_private_data = 0;
--		insert_vm_struct(current->mm, mpnt);
-+		if ((ret = insert_vm_struct(current->mm, mpnt))) {
-+			up_write(&current->mm->mmap_sem);
-+			kmem_cache_free(vm_area_cachep, mpnt);
-+			return ret;
-+		}
- 		current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- 	}
- 
-diff -ur linux-2.4.28-gentoo-r2/arch/ia64/kernel/perfmon.c linux-2.4.28-gentoo-r3/arch/ia64/kernel/perfmon.c
---- linux-2.4.28-gentoo-r2/arch/ia64/kernel/perfmon.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/ia64/kernel/perfmon.c	2004-12-24 14:34:29.534899272 +0000
-@@ -967,7 +967,8 @@
- 	 * now insert the vma in the vm list for the process, must be
- 	 * done with mmap lock held
- 	 */
--	insert_vm_struct(mm, vma);
-+	if(insert_vm_struct(mm, vma)) /* Handle -ENOMEM et al. */
-+		goto error;
- 
- 	mm->total_vm  += size >> PAGE_SHIFT;
- 
-diff -ur linux-2.4.28-gentoo-r2/arch/ia64/mm/init.c linux-2.4.28-gentoo-r3/arch/ia64/mm/init.c
---- linux-2.4.28-gentoo-r2/arch/ia64/mm/init.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/ia64/mm/init.c	2004-12-24 14:34:29.535899120 +0000
-@@ -105,7 +105,13 @@
- 		vma->vm_pgoff = 0;
- 		vma->vm_file = NULL;
- 		vma->vm_private_data = NULL;
--		insert_vm_struct(current->mm, vma);
-+		down_write(&current->mm->mmap_sem);
-+		if (insert_vm_struct(current->mm, vma)) {
-+			up_write(&current->mm->mmap_sem);
-+			kmem_cache_free(vm_area_cachep, vma);
-+			return;
-+		}
-+		up_write(&current->mm->mmap_sem);
- 	}
- 
- 	/* map NaT-page at address zero to speed up speculative dereferencing of NULL: */
-@@ -117,7 +123,13 @@
- 			vma->vm_end = PAGE_SIZE;
- 			vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT);
- 			vma->vm_flags = VM_READ | VM_MAYREAD | VM_IO | VM_RESERVED;
--			insert_vm_struct(current->mm, vma);
-+			down_write(&current->mm->mmap_sem);
-+			if (insert_vm_struct(current->mm, vma)) {
-+				up_write(&current->mm->mmap_sem);
-+				kmem_cache_free(vm_area_cachep, vma);
-+				return;
-+			}
-+			up_write(&current->mm->mmap_sem);
- 		}
- 	}
- }
-diff -ur linux-2.4.28-gentoo-r2/arch/ppc/mm/fault.c linux-2.4.28-gentoo-r3/arch/ppc/mm/fault.c
---- linux-2.4.28-gentoo-r2/arch/ppc/mm/fault.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/ppc/mm/fault.c	2004-12-24 14:34:29.543897904 +0000
-@@ -83,8 +83,10 @@
- 	nopage:		pax_syscall_nopage,
- };
- 
--static void pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
-+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
- {
-+	int ret;
-+
- 	vma->vm_mm = current->mm;
- 	vma->vm_start = addr;
- 	vma->vm_end = addr + PAGE_SIZE;
-@@ -94,8 +96,15 @@
- 	vma->vm_pgoff = 0UL;
- 	vma->vm_file = NULL;
- 	vma->vm_private_data = NULL;
--	insert_vm_struct(current->mm, vma);
-+	ret = insert_vm_struct(current->mm, vma);
-+	if(ret != 0)
-+	{
-+		up_write(&current->mm->mmap_sem);
-+		kmem_cache_free(vm_area_cachep, vma);
-+		return ret;
-+	}
- 	++current->mm->total_vm;
-+	return 0;
- }
- #endif
- 
-@@ -333,7 +342,8 @@
- 				return 1;
- 			}
- 
--			pax_insert_vma(vma, call_syscall);
-+			if(pax_insert_vma(vma, call_syscall))
-+				return 1; /* VMA overlapping attempt; bye bye! */
- 			current->mm->call_syscall = call_syscall;
- 			up_write(&current->mm->mmap_sem);
- 
-@@ -377,7 +387,8 @@
- 				return 1;
- 			}
- 
--			pax_insert_vma(vma, call_syscall);
-+			if(pax_insert_vma(vma, call_syscall))
-+				return 1; /* VMA overlapping attempt; bye bye! */
- 			current->mm->call_syscall = call_syscall;
- 			up_write(&current->mm->mmap_sem);
- 
-diff -ur linux-2.4.28-gentoo-r2/arch/s390x/kernel/exec32.c linux-2.4.28-gentoo-r3/arch/s390x/kernel/exec32.c
---- linux-2.4.28-gentoo-r2/arch/s390x/kernel/exec32.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/s390x/kernel/exec32.c	2004-12-24 14:34:29.543897904 +0000
-@@ -41,7 +41,7 @@
- {
- 	unsigned long stack_base;
- 	struct vm_area_struct *mpnt;
--	int i;
-+	int i, ret;
- 
- 	stack_base = STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE;
- 
-@@ -65,7 +65,11 @@
- 		mpnt->vm_pgoff = 0;
- 		mpnt->vm_file = NULL;
- 		mpnt->vm_private_data = (void *) 0;
--		insert_vm_struct(current->mm, mpnt);
-+		if ((ret = insert_vm_struct(current->mm, mpnt))) {
-+			up_write(&current->mm->mmap_sem);
-+			kmem_cache_free(vm_area_cachep, mpnt);
-+			return ret;
-+		}
- 		current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- 	} 
- 
-diff -ur linux-2.4.28-gentoo-r2/arch/sparc/mm/fault.c linux-2.4.28-gentoo-r3/arch/sparc/mm/fault.c
---- linux-2.4.28-gentoo-r2/arch/sparc/mm/fault.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/sparc/mm/fault.c	2004-12-24 14:34:29.544897752 +0000
-@@ -250,8 +250,10 @@
- 	nopage:		pax_emuplt_nopage,
- };
- 
--static void pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
-+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
- {
-+	int ret;
-+
- 	vma->vm_mm = current->mm;
- 	vma->vm_start = addr;
- 	vma->vm_end = addr + PAGE_SIZE;
-@@ -261,8 +263,15 @@
- 	vma->vm_pgoff = 0UL;
- 	vma->vm_file = NULL;
- 	vma->vm_private_data = NULL;
--	insert_vm_struct(current->mm, vma);
-+	ret = insert_vm_struct(current->mm, vma);
-+	if(ret != 0)
-+	{
-+		up_write(&current->mm->mmap_sem);
-+		kmem_cache_free(vm_area_cachep, vma);
-+		return ret;
-+	}
- 	++current->mm->total_vm;
-+	return 0;
- }
- 
- /*
-@@ -423,7 +432,8 @@
- 					return 1;
- 				}
- 
--				pax_insert_vma(vma, call_dl_resolve);
-+				if(pax_insert_vma(vma, call_dl_resolve))
-+					return 1; /* VMA overlapping attempt; bye bye! */
- 				current->mm->call_dl_resolve = call_dl_resolve;
- 				up_write(&current->mm->mmap_sem);
- 
-diff -ur linux-2.4.28-gentoo-r2/arch/sparc64/mm/fault.c linux-2.4.28-gentoo-r3/arch/sparc64/mm/fault.c
---- linux-2.4.28-gentoo-r2/arch/sparc64/mm/fault.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/sparc64/mm/fault.c	2004-12-24 14:34:29.559895472 +0000
-@@ -338,8 +338,10 @@
- 	nopage:		pax_emuplt_nopage,
- };
- 
--static void pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
-+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
- {
-+	int ret;
-+
- 	vma->vm_mm = current->mm;
- 	vma->vm_start = addr;
- 	vma->vm_end = addr + PAGE_SIZE;
-@@ -349,8 +351,15 @@
- 	vma->vm_pgoff = 0UL; 
- 	vma->vm_file = NULL;
- 	vma->vm_private_data = NULL;
--	insert_vm_struct(current->mm, vma);
-+	ret = insert_vm_struct(current->mm, vma);
-+	if(ret != 0)
-+	{
-+		up_write(&current->mm->mmap_sem);
-+		kmem_cache_free(vm_area_cachep, vma);
-+		return ret;
-+	}
- 	++current->mm->total_vm;
-+	return 0;
- }
- #endif
- 
-@@ -609,7 +618,8 @@
- 					return 1;
- 				}
- 
--				pax_insert_vma(vma, call_dl_resolve);
-+				if(pax_insert_vma(vma, call_dl_resolve))
-+					return 1; /* VMA overlapping attempt; bye bye! */
- 				current->mm->call_dl_resolve = call_dl_resolve;
- 				up_write(&current->mm->mmap_sem);
- 
-diff -ur linux-2.4.28-gentoo-r2/arch/x86_64/ia32/ia32_binfmt.c linux-2.4.28-gentoo-r3/arch/x86_64/ia32/ia32_binfmt.c
---- linux-2.4.28-gentoo-r2/arch/x86_64/ia32/ia32_binfmt.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/x86_64/ia32/ia32_binfmt.c	2004-12-24 14:34:29.559895472 +0000
-@@ -225,7 +225,7 @@
- {
- 	unsigned long stack_base;
- 	struct vm_area_struct *mpnt;
--	int i;
-+	int i, ret;
- 
- 	stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE;
- 
-@@ -250,7 +250,11 @@
- 		mpnt->vm_pgoff = 0;
- 		mpnt->vm_file = NULL;
- 		mpnt->vm_private_data = (void *) 0;
--		insert_vm_struct(current->mm, mpnt);
-+		if ((ret = insert_vm_struct(current->mm, mpnt))) {
-+			up_write(&current->mm->mmap_sem);
-+			kmem_cache_free(vm_area_cachep, mpnt);
-+			return ret;
-+		}
- 		current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- 	} 
- 
-diff -ur linux-2.4.28-gentoo-r2/fs/exec.c linux-2.4.28-gentoo-r3/fs/exec.c
---- linux-2.4.28-gentoo-r2/fs/exec.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/fs/exec.c	2004-12-24 14:35:52.000000000 +0000
-@@ -358,7 +358,7 @@
- {
- 	unsigned long stack_base;
- 	struct vm_area_struct *mpnt;
--	int i;
-+	int i, ret;
- 
- #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
- 	struct vm_area_struct *mpnt_m = NULL;
-@@ -387,7 +387,6 @@
- 
- 	down_write(&current->mm->mmap_sem);
- 	{
--		struct vm_area_struct *vma;
- 		mpnt->vm_mm = current->mm;
- 		mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
- 		mpnt->vm_end = STACK_TOP;
-@@ -402,13 +401,11 @@
- 		mpnt->vm_pgoff = 0;
- 		mpnt->vm_file = NULL;
- 		mpnt->vm_private_data = (void *) 0;
--		vma = find_vma(current->mm, mpnt->vm_start);
--		if (vma) {
-+		if ((ret = insert_vm_struct(current->mm, mpnt))) {
- 			up_write(&current->mm->mmap_sem);
- 			kmem_cache_free(vm_area_cachep, mpnt);
--			return -ENOMEM;
-+			return ret;
- 		}
--		insert_vm_struct(current->mm, mpnt);
- 		current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- 
- #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
-diff -ur linux-2.4.28-gentoo-r2/include/linux/mm.h linux-2.4.28-gentoo-r3/include/linux/mm.h
---- linux-2.4.28-gentoo-r2/include/linux/mm.h	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/include/linux/mm.h	2004-12-24 14:34:29.000000000 +0000
-@@ -577,7 +577,7 @@
- /* mmap.c */
- extern void lock_vma_mappings(struct vm_area_struct *);
- extern void unlock_vma_mappings(struct vm_area_struct *);
--extern void insert_vm_struct(struct mm_struct *, struct vm_area_struct *);
-+extern int insert_vm_struct(struct mm_struct *, struct vm_area_struct *);
- extern void __insert_vm_struct(struct mm_struct *, struct vm_area_struct *);
- extern void build_mmap_rb(struct mm_struct *);
- extern void exit_mmap(struct mm_struct *);
-diff -ur linux-2.4.28-gentoo-r2/mm/mmap.c linux-2.4.28-gentoo-r3/mm/mmap.c
---- linux-2.4.28-gentoo-r2/mm/mmap.c	2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/mm/mmap.c	2004-12-24 14:34:29.000000000 +0000
-@@ -1480,14 +1480,15 @@
- 	validate_mm(mm);
- }
- 
--void insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
-+int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
- {
- 	struct vm_area_struct * __vma, * prev;
- 	rb_node_t ** rb_link, * rb_parent;
- 
- 	__vma = find_vma_prepare(mm, vma->vm_start, &prev, &rb_link, &rb_parent);
- 	if (__vma && __vma->vm_start < vma->vm_end)
--		BUG();
-+		return -ENOMEM;
- 	vma_link(mm, vma, prev, rb_link, rb_parent);
- 	validate_mm(mm);
-+	return 0;
- }
diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.28-r5 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.28-r5
deleted file mode 100644
index 793d42303c26..000000000000
--- a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.28-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 05e09ac56cf3f1f8133dd1ed69909819 patches-2.4.28-sparc-r2.tar.bz2 181346
diff --git a/sys-kernel/sparc-sources/files/linux-2.4.28-CAN-2004-1056.patch b/sys-kernel/sparc-sources/files/linux-2.4.28-CAN-2004-1056.patch
deleted file mode 100644
index 53b777acaac5..000000000000
--- a/sys-kernel/sparc-sources/files/linux-2.4.28-CAN-2004-1056.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff -ur linux-2.4.28/drivers/char/drm/i810.h linux-2.4.28.plasmaroo/drivers/char/drm/i810.h
---- linux-2.4.28/drivers/char/drm/i810.h	2003-11-28 18:26:20.000000000 +0000
-+++ linux-2.4.28.plasmaroo/drivers/char/drm/i810.h	2004-12-23 16:26:31.000000000 +0000
-@@ -114,4 +114,14 @@
- #define DRIVER_AGP_BUFFERS_MAP( dev )					\
- 	((drm_i810_private_t *)((dev)->dev_private))->buffer_map
- 
-+#define LOCK_TEST_WITH_RETURN( dev )                                    \
-+do {                                                                    \
-+        if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||           \
-+             dev->lock.pid != current->pid ) {                          \
-+                DRM_ERROR( "%s called without lock held\n",             \
-+                           __FUNCTION__ );                              \
-+                return -EINVAL;                                         \
-+        }                                                               \
-+} while (0)
-+
- #endif
-diff -ur linux-2.4.28/drivers/char/drm/i810_dma.c linux-2.4.28.plasmaroo/drivers/char/drm/i810_dma.c
---- linux-2.4.28/drivers/char/drm/i810_dma.c	2004-02-18 13:36:31.000000000 +0000
-+++ linux-2.4.28.plasmaroo/drivers/char/drm/i810_dma.c	2004-12-23 16:27:16.000000000 +0000
-@@ -948,10 +948,7 @@
-    	drm_file_t	  *priv	  = filp->private_data;
-    	drm_device_t	  *dev	  = priv->dev;
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_flush_ioctl called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev);
- 
-    	i810_flush_queue(dev);
-    	return 0;
-@@ -973,10 +970,7 @@
- 	if (copy_from_user(&vertex, (drm_i810_vertex_t *)arg, sizeof(vertex)))
- 		return -EFAULT;
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_dma_vertex called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev);
- 
- 	if(vertex.idx < 0 || vertex.idx > dma->buf_count) return -EINVAL;
- 
-@@ -1004,10 +998,7 @@
-    	if (copy_from_user(&clear, (drm_i810_clear_t *)arg, sizeof(clear)))
- 		return -EFAULT;
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_clear_bufs called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev);
- 
-  	/* GH: Someone's doing nasty things... */
-  	if (!dev->dev_private) {
-@@ -1026,10 +1017,7 @@
- 	drm_file_t *priv = filp->private_data;
- 	drm_device_t *dev = priv->dev;
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_swap_buf called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
- 	i810_dma_dispatch_swap( dev );
-    	return 0;
-@@ -1064,10 +1052,7 @@
-    	if (copy_from_user(&d, (drm_i810_dma_t *)arg, sizeof(d)))
- 		return -EFAULT;
- 
--	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_dma called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
- 	d.granted = 0;
- 
-@@ -1174,11 +1159,7 @@
- 	if (copy_from_user(&mc, (drm_i810_mc_t *)arg, sizeof(mc)))
- 		return -EFAULT;
- 
--
--	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_dma_mc called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
- 	i810_dma_dispatch_mc(dev, dma->buflist[mc.idx], mc.used,
- 		mc.last_render );
-@@ -1223,10 +1204,7 @@
- 	drm_device_t *dev = priv->dev;
- 	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
- 
--	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_fstatus called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 	return I810_READ(0x30008);
- }
- 
-@@ -1237,10 +1215,7 @@
- 	drm_device_t *dev = priv->dev;
- 	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
- 
--	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_ov0_flip called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
- 	//Tell the overlay to update
- 	I810_WRITE(0x30000,dev_priv->overlay_physical | 0x80000000);
-diff -ur linux-2.4.28/drivers/char/drm/i830.h linux-2.4.28.plasmaroo/drivers/char/drm/i830.h
---- linux-2.4.28/drivers/char/drm/i830.h	2003-11-28 18:26:20.000000000 +0000
-+++ linux-2.4.28.plasmaroo/drivers/char/drm/i830.h	2004-12-23 16:31:33.000000000 +0000
-@@ -154,4 +154,14 @@
- #define DRIVER_AGP_BUFFERS_MAP( dev )					\
- 	((drm_i830_private_t *)((dev)->dev_private))->buffer_map
- 
-+#define LOCK_TEST_WITH_RETURN( dev )                                    \
-+do {                                                                    \
-+        if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||           \
-+             dev->lock.pid != current->pid ) {                          \
-+                DRM_ERROR( "%s called without lock held\n",             \
-+                           __FUNCTION__ );                              \
-+                return -EINVAL;                                         \
-+        }                                                               \
-+} while (0)
-+
- #endif
-diff -ur linux-2.4.28/drivers/char/drm/i830_dma.c linux-2.4.28.plasmaroo/drivers/char/drm/i830_dma.c
---- linux-2.4.28/drivers/char/drm/i830_dma.c	2004-02-18 13:36:31.000000000 +0000
-+++ linux-2.4.28.plasmaroo/drivers/char/drm/i830_dma.c	2004-12-23 16:32:08.000000000 +0000
-@@ -1330,10 +1330,7 @@
-    	drm_file_t	  *priv	  = filp->private_data;
-    	drm_device_t	  *dev	  = priv->dev;
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i830_flush_ioctl called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
-    	i830_flush_queue(dev);
-    	return 0;
-@@ -1354,10 +1351,7 @@
- 	if (copy_from_user(&vertex, (drm_i830_vertex_t *)arg, sizeof(vertex)))
- 		return -EFAULT;
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i830_dma_vertex called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
- 	DRM_DEBUG("i830 dma vertex, idx %d used %d discard %d\n",
- 		  vertex.idx, vertex.used, vertex.discard);
-@@ -1384,10 +1378,7 @@
-    	if (copy_from_user(&clear, (drm_i830_clear_t *)arg, sizeof(clear)))
- 		return -EFAULT;
-    
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i830_clear_bufs called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
- 	/* GH: Someone's doing nasty things... */
- 	if (!dev->dev_private) {
-@@ -1409,10 +1400,7 @@
-    
- 	DRM_DEBUG("i830_swap_bufs\n");
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i830_swap_buf called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
- 	i830_dma_dispatch_swap( dev );
-    	return 0;
-@@ -1453,10 +1441,7 @@
- 
- 	DRM_DEBUG("%s\n", __FUNCTION__);
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i830_flip_buf called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
- 	if (!dev_priv->page_flipping) 
- 		i830_do_init_pageflip( dev );
-@@ -1495,10 +1480,7 @@
-    	if (copy_from_user(&d, (drm_i830_dma_t *)arg, sizeof(d)))
- 		return -EFAULT;
-    
--	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i830_dma called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 	
- 	d.granted = 0;
- 
-diff -ur linux-2.4.28/drivers/char/drm/i830_irq.c linux-2.4.28.plasmaroo/drivers/char/drm/i830_irq.c
---- linux-2.4.28/drivers/char/drm/i830_irq.c	2003-11-28 18:26:20.000000000 +0000
-+++ linux-2.4.28.plasmaroo/drivers/char/drm/i830_irq.c	2004-12-23 16:39:47.000000000 +0000
-@@ -130,10 +130,7 @@
- 	drm_i830_irq_emit_t emit;
- 	int result;
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i830_irq_emit called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev); 
- 
- 	if ( !dev_priv ) {
- 		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-diff -ur linux-2.4.28/drivers/char/drm-4.0/drmP.h linux-2.4.28.plasmaroo/drivers/char/drm-4.0/drmP.h
---- linux-2.4.28/drivers/char/drm-4.0/drmP.h	2004-02-18 13:36:31.000000000 +0000
-+++ linux-2.4.28.plasmaroo/drivers/char/drm-4.0/drmP.h	2004-12-23 16:21:30.000000000 +0000
-@@ -294,6 +294,16 @@
- #define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x))
- #define DRM_WAITCOUNT(dev,idx) DRM_BUFCOUNT(&dev->queuelist[idx]->waitlist)
- 
-+#define LOCK_TEST_WITH_RETURN( dev )                                    \
-+do {                                                                    \
-+        if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||           \
-+             dev->lock.pid != current->pid ) {                          \
-+                DRM_ERROR( "%s called without lock held\n",             \
-+                           __FUNCTION__ );                              \
-+                return -EINVAL;                                         \
-+        }                                                               \
-+} while (0)
-+
- typedef int drm_ioctl_t(struct inode *inode, struct file *filp,
- 			unsigned int cmd, unsigned long arg);
- 
-diff -ur linux-2.4.28/drivers/char/drm-4.0/i810_dma.c linux-2.4.28.plasmaroo/drivers/char/drm-4.0/i810_dma.c
---- linux-2.4.28/drivers/char/drm-4.0/i810_dma.c	2004-02-18 13:36:31.000000000 +0000
-+++ linux-2.4.28.plasmaroo/drivers/char/drm-4.0/i810_dma.c	2004-12-23 16:21:30.000000000 +0000
-@@ -1249,10 +1249,7 @@
-    	drm_device_t	  *dev	  = priv->dev;
-    
-    	DRM_DEBUG("i810_flush_ioctl\n");
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_flush_ioctl called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev);
- 
-    	i810_flush_queue(dev);
-    	return 0;
-@@ -1274,10 +1271,7 @@
- 	if (copy_from_user(&vertex, (drm_i810_vertex_t *)arg, sizeof(vertex)))
- 		return -EFAULT;
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_dma_vertex called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev);
- 
- 	DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n",
- 		  vertex.idx, vertex.used, vertex.discard);
-@@ -1308,10 +1302,7 @@
-    	if (copy_from_user(&clear, (drm_i810_clear_t *)arg, sizeof(clear)))
- 		return -EFAULT;
-    
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_clear_bufs called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev);
- 
- 	i810_dma_dispatch_clear( dev, clear.flags, 
- 				 clear.clear_color, 
-@@ -1327,10 +1318,7 @@
-    
- 	DRM_DEBUG("i810_swap_bufs\n");
- 
--   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_swap_buf called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev);
- 
- 	i810_dma_dispatch_swap( dev );
-    	return 0;
-@@ -1366,10 +1354,7 @@
-    	if (copy_from_user(&d, (drm_i810_dma_t *)arg, sizeof(d)))
- 		return -EFAULT;
-    
--	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_dma called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev);
- 	
- 	d.granted = 0;
- 
-@@ -1399,10 +1384,7 @@
- 	drm_i810_buf_priv_t *buf_priv;
- 	drm_device_dma_t *dma = dev->dma;
- 
--	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
--		DRM_ERROR("i810_dma called without lock held\n");
--		return -EINVAL;
--	}
-+	LOCK_TEST_WITH_RETURN(dev);
-    
-    	if (copy_from_user(&d, (drm_i810_copy_t *)arg, sizeof(d)))
- 		return -EFAULT;
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.28-r5.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.28-r5.ebuild
deleted file mode 100644
index e44f91fb781c..000000000000
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.28-r5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.28-r5.ebuild,v 1.1 2005/01/09 21:44:28 joker Exp $
-
-IUSE="ultra1"
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="grsecurity" would not patch any patches whose names match
-# *grsecurity*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-inherit kernel eutils
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-[ "$OKV" == "" ] && OKV="${PV}"
-
-EXTRAVERSION="-${PN/-*/}"
-[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-PATCH_VERSION="2.4.28-sparc-r2"
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/sparc-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	mirror://gentoo/patches-${PATCH_VERSION}.tar.bz2"
-
-S=${WORKDIR}/linux-${KV}
-KEYWORDS="~x86 -ppc sparc"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
-	cd ${PATCH_VERSION} || die "Unable to cd into ${PATCH_VERSION}"
-
-	kernel_src_unpack
-
-	# Security fix for #72452, #74464 and #77025
-	epatch ${FILESDIR}/2.4.28-vma-PaX.patch
-	epatch ${FILESDIR}/linux-2.4.28-CAN-2004-1056.patch
-	epatch ${FILESDIR}/2.4-brk-locked-plasmaroo.PaX.patch
-
-	# Patch the HME driver only on Ultra1 machines.
-	use ultra1 && epatch ${FILESDIR}/U1-hme-lockup.patch
-}
-
-pkg_postinst() {
-
-	kernel_pkg_postinst
-
-	# Display SUN Ultra 1 HME warning if it can be detected or if the machinetype is unknown.
-	if [ ! -r "/proc/openprom/name" -o "`cat /proc/openprom/name 2>/dev/null`" = "'SUNW,Ultra-1'" ]; then
-		einfo
-		einfo "For users with an Enterprise model Ultra 1 using the HME network interface,"
-		einfo "please emerge the kernel using the following command:"
-		einfo
-		einfo "USE=ultra1 emerge sparc-sources"
-		einfo
-	fi
-}