From cb8bd37b62b82e80349aec13a39eafab823eba24 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 13 Jan 2005 17:24:52 +0000 Subject: [PATCH] Version bump to ck4 --- sys-kernel/ck-sources/ChangeLog | 12 +- ...-r2.ebuild => ck-sources-2.6.10-r4.ebuild} | 6 +- .../files/ck-sources-2.6.10-77094.patch | 90 ------ .../files/ck-sources-2.6.10-brk-locked.patch | 303 ------------------ .../ck-sources-2.6.10-disable-iopriowr.patch | 23 -- .../ck-sources-2.6.10-drm-i915-fix.patch | 66 ++++ ...-2.6.10-r2 => digest-ck-sources-2.6.10-r4} | 2 +- 7 files changed, 80 insertions(+), 422 deletions(-) rename sys-kernel/ck-sources/{ck-sources-2.6.10-r2.ebuild => ck-sources-2.6.10-r4.ebuild} (79%) delete mode 100644 sys-kernel/ck-sources/files/ck-sources-2.6.10-77094.patch delete mode 100644 sys-kernel/ck-sources/files/ck-sources-2.6.10-brk-locked.patch delete mode 100644 sys-kernel/ck-sources/files/ck-sources-2.6.10-disable-iopriowr.patch create mode 100644 sys-kernel/ck-sources/files/ck-sources-2.6.10-drm-i915-fix.patch rename sys-kernel/ck-sources/files/{digest-ck-sources-2.6.10-r2 => digest-ck-sources-2.6.10-r4} (51%) diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog index 64093e8c52d0..5318bd756c0d 100644 --- a/sys-kernel/ck-sources/ChangeLog +++ b/sys-kernel/ck-sources/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-kernel/ck-sources # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.81 2005/01/08 17:30:04 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.82 2005/01/13 17:24:52 marineam Exp $ + +*ck-sources-2.6.10-r4 (13 Jan 2005) + + 13 Jan 2005; Micheal Marineau,,, + -files/ck-sources-2.6.10-77094.patch, + -files/ck-sources-2.6.10-brk-locked.patch, + -files/ck-sources-2.6.10-disable-iopriowr.patch, + +files/ck-sources-2.6.10-drm-i915-fix.patch, -ck-sources-2.6.10-r2.ebuild, + +ck-sources-2.6.10-r4.ebuild: + Version bump to ck4 :-) *ck-sources-2.4.28-r2 (08 Jan 2005) diff --git a/sys-kernel/ck-sources/ck-sources-2.6.10-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.10-r4.ebuild similarity index 79% rename from sys-kernel/ck-sources/ck-sources-2.6.10-r2.ebuild rename to sys-kernel/ck-sources/ck-sources-2.6.10-r4.ebuild index 3cd12df7475d..5de59eb6f546 100644 --- a/sys-kernel/ck-sources/ck-sources-2.6.10-r2.ebuild +++ b/sys-kernel/ck-sources/ck-sources-2.6.10-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.10-r2.ebuild,v 1.3 2005/01/08 17:30:04 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.10-r4.ebuild,v 1.1 2005/01/13 17:24:52 marineam Exp $ K_PREPATCHED="yes" UNIPATCH_STRICTORDER="yes" @@ -14,9 +14,7 @@ detect_version CK_PATCH="patch-${KV_FULL}.bz2" UNIPATCH_LIST=" ${DISTDIR}/${CK_PATCH} - ${FILESDIR}/${P}-disable-iopriowr.patch - ${FILESDIR}/${P}-77094.patch - ${FILESDIR}/${P}-brk-locked.patch" + ${FILESDIR}/${P}-drm-i915-fix.patch" IUSE="" DESCRIPTION="Full sources for the Stock Linux kernel and Con Kolivas's high performance patchset" diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.10-77094.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.10-77094.patch deleted file mode 100644 index 6efea52c29f7..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.6.10-77094.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -urNp linux-2.6.10/drivers/char/moxa.c linux-2.6.10-new/drivers/char/moxa.c ---- linux-2.6.10/drivers/char/moxa.c 2005-01-07 10:51:23 -0500 -+++ linux-2.6.10-new/drivers/char/moxa.c 2005-01-07 10:51:33 -0500 -@@ -1668,6 +1668,8 @@ int MoxaDriverIoctl(unsigned int cmd, un - return -EFAULT; - if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS) - return -EINVAL; -+ if(dltmp.len < 0 || dltmp.len > sizeof(moxaBuff)) -+ return -EINVAL; - - switch(cmd) - { -@@ -2822,8 +2824,6 @@ static int moxaload320b(int cardno, unsi - void __iomem *baseAddr; - int i; - -- if(len > sizeof(moxaBuff)) -- return -EINVAL; - if(copy_from_user(moxaBuff, tmp, len)) - return -EFAULT; - baseAddr = moxaBaseAddr[cardno]; -diff -urNp linux-2.6.10/drivers/block/scsi_ioctl.c linux-2.6.10-new/drivers/block/scsi_ioctl.c ---- linux-2.6.10/drivers/block/scsi_ioctl.c 2005-01-07 10:51:24 -0500 -+++ linux-2.6.10-new/drivers/block/scsi_ioctl.c 2005-01-07 10:51:33 -0500 -@@ -339,7 +339,8 @@ static int sg_scsi_ioctl(struct file *fi - struct gendisk *bd_disk, Scsi_Ioctl_Command __user *sic) - { - struct request *rq; -- int err, in_len, out_len, bytes, opcode, cmdlen; -+ unsigned int in_len, out_len, bytes, opcode, cmdlen; -+ int err; - char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; - - /* -diff -urNp linux-2.6.10/drivers/char/random.c linux-2.6.10-new/drivers/char/random.c ---- linux-2.6.10/drivers/char/random.c 2005-01-07 10:51:23 -0500 -+++ linux-2.6.10-new/drivers/char/random.c 2005-01-07 10:51:33 -0500 -@@ -1912,7 +1912,7 @@ static int poolsize_strategy(ctl_table * - void __user *oldval, size_t __user *oldlenp, - void __user *newval, size_t newlen, void **context) - { -- int len; -+ size_t len; - - sysctl_poolsize = random_state->poolinfo.POOLBYTES; - -diff -urNp linux-2.6.10/mm/mmap.c linux-2.6.10-new/mm/mmap.c ---- linux-2.6.10/mm/mmap.c 2004-12-24 22:35:00.000000000 +0100 -+++ linux-2.6.10-new/mm/mmap.c 2004-12-27 16:37:47.000000000 +0100 -@@ -1360,6 +1360,13 @@ int expand_stack(struct vm_area_struct * - vm_unacct_memory(grow); - return -ENOMEM; - } -+ if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) && -+ ((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) > -+ current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) { -+ anon_vma_unlock(vma); -+ vm_unacct_memory(grow); -+ return -ENOMEM; -+ } - vma->vm_end = address; - vma->vm_mm->total_vm += grow; - if (vma->vm_flags & VM_LOCKED) -@@ -1422,6 +1429,13 @@ int expand_stack(struct vm_area_struct * - vm_unacct_memory(grow); - return -ENOMEM; - } -+ if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) && -+ ((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) > -+ current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) { -+ anon_vma_unlock(vma); -+ vm_unacct_memory(grow); -+ return -ENOMEM; -+ } - vma->vm_start = address; - vma->vm_pgoff -= grow; - vma->vm_mm->total_vm += grow; -diff -urNp linux-2.6.10/net/ipv4/netfilter/ip_conntrack_proto_tcp.c linux-2.6.10-new/net/ipv4/netfilter/ip_conntrack_proto_tcp.c ---- linux-2.6.10/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-01-07 10:51:24 -0500 -+++ linux-2.6.10-new/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-01-07 10:51:33 -0500 -@@ -906,7 +906,8 @@ static int tcp_packet(struct ip_conntrac - if (index == TCP_RST_SET - && ((test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status) - && conntrack->proto.tcp.last_index <= TCP_SYNACK_SET) -- || conntrack->proto.tcp.last_index == TCP_ACK_SET) -+ || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) -+ && conntrack->proto.tcp.last_index == TCP_ACK_SET)) - && after(ntohl(th->ack_seq), - conntrack->proto.tcp.last_seq)) { - /* Ignore RST closing down invalid SYN or ACK diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.10-brk-locked.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.10-brk-locked.patch deleted file mode 100644 index 6095e844d5f1..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.6.10-brk-locked.patch +++ /dev/null @@ -1,303 +0,0 @@ -diff -ur linux-2.6.10/arch/mips/kernel/irixelf.c linux-2.6.10.plasmaroo/arch/mips/kernel/irixelf.c ---- linux-2.6.10/arch/mips/kernel/irixelf.c 2004-12-24 21:35:50.000000000 +0000 -+++ linux-2.6.10.plasmaroo/arch/mips/kernel/irixelf.c 2005-01-07 15:36:00.383356800 +0000 -@@ -127,7 +127,7 @@ - end = PAGE_ALIGN(end); - if (end <= start) - return; -- do_brk(start, end - start); -+ do_brk_locked(start, end - start); - } - - -@@ -375,7 +375,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); - -@@ -562,7 +562,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; -@@ -853,7 +853,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.6.10/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.10.plasmaroo/arch/sparc64/kernel/binfmt_aout32.c ---- linux-2.6.10/arch/sparc64/kernel/binfmt_aout32.c 2004-12-24 21:34:45.000000000 +0000 -+++ linux-2.6.10.plasmaroo/arch/sparc64/kernel/binfmt_aout32.c 2005-01-07 15:36:00.432349352 +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 __user *)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 __user *)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 __user *)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 __user *)N_TXTADDR(ex), - ex.a_text+ex.a_data, &pos); -@@ -389,7 +389,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 -Nur linux-2.6.10/arch/x86_64/ia32/ia32_aout.c linux-2.6.10.plasmaroo/arch/x86_64/ia32/ia32_aout.c ---- linux-2.6.10/arch/x86_64/ia32/ia32_aout.c 2005-01-03 16:17:04.000000000 -0200 -+++ linux-2.6.10.plasmaroo/arch/x86_64/ia32/ia32_aout.c 2005-01-03 16:46:53.846823360 -0200 -@@ -115,7 +115,7 @@ - end = PAGE_ALIGN(end); - if (end <= start) - return; -- do_brk(start, end - start); -+ do_brk_locked(start, end - start); - } - - #if CORE_DUMP -@@ -325,7 +325,7 @@ - pos = 32; - map_size = ex.a_text+ex.a_data; - -- 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; -@@ -361,7 +361,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), -@@ -470,7 +470,7 @@ - } - #endif - -- 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); -@@ -494,7 +494,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.6.10/fs/binfmt_aout.c linux-2.6.10.plasmaroo/fs/binfmt_aout.c ---- linux-2.6.10/fs/binfmt_aout.c 2004-12-24 21:35:50.000000000 +0000 -+++ linux-2.6.10.plasmaroo/fs/binfmt_aout.c 2005-01-07 15:36:00.000000000 +0000 -@@ -50,7 +50,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; - } -@@ -323,10 +323,10 @@ - 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; -@@ -347,7 +347,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; -@@ -382,7 +382,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 __user *)N_TXTADDR(ex), - ex.a_text+ex.a_data, &pos); -@@ -488,7 +488,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 __user *)start_addr, - ex.a_text + ex.a_data, &pos); -@@ -512,7 +512,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.6.10/fs/binfmt_elf.c linux-2.6.10.plasmaroo/fs/binfmt_elf.c ---- linux-2.6.10/fs/binfmt_elf.c 2004-12-24 21:34:33.000000000 +0000 -+++ linux-2.6.10.plasmaroo/fs/binfmt_elf.c 2005-01-07 15:36:00.000000000 +0000 -@@ -88,7 +88,7 @@ - start = ELF_PAGEALIGN(start); - end = ELF_PAGEALIGN(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; - } -@@ -408,7 +408,7 @@ - - /* Map the last of the bss segment */ - if (last_bss > elf_bss) { -- error = do_brk(elf_bss, last_bss - elf_bss); -+ error = do_brk_locked(elf_bss, last_bss - elf_bss); - if (BAD_ADDR(error)) - goto out_close; - } -@@ -448,7 +448,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) -@@ -456,7 +456,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; - -@@ -1025,7 +1025,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.6.10/include/linux/mm.h linux-2.6.10.plasmaroo/include/linux/mm.h ---- linux-2.6.10/include/linux/mm.h 2004-12-24 21:33:50.000000000 +0000 -+++ linux-2.6.10.plasmaroo/include/linux/mm.h 2005-01-07 15:36:00.000000000 +0000 -@@ -704,6 +704,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); - - /* filemap.c */ - extern unsigned long page_unuse(struct page *); -diff -ur linux-2.6.10/mm/mmap.c linux-2.6.10.plasmaroo/mm/mmap.c ---- linux-2.6.10/mm/mmap.c 2004-12-24 21:35:00.000000000 +0000 -+++ linux-2.6.10.plasmaroo/mm/mmap.c 2005-01-07 15:36:04.000000000 +0000 -@@ -1826,6 +1826,20 @@ - - EXPORT_SYMBOL(do_brk); - -+/* locking version of do_brk. */ -+unsigned long do_brk_locked(unsigned long addr, unsigned long len) -+{ -+ unsigned long ret; -+ -+ down_write(¤t->mm->mmap_sem); -+ ret = do_brk(addr, len); -+ up_write(¤t->mm->mmap_sem); -+ -+ return ret; -+} -+ -+EXPORT_SYMBOL(do_brk_locked); -+ - /* Release all mmaps. */ - void exit_mmap(struct mm_struct *mm) - { -@@ -1952,3 +1966,4 @@ - } - return new_vma; - } -+ -diff -ur linux-2.6.10/mm/nommu.c linux-2.6.10.plasmaroo/mm/nommu.c ---- linux-2.6.10/mm/nommu.c 2004-12-24 21:35:25.000000000 +0000 -+++ linux-2.6.10.plasmaroo/mm/nommu.c 2005-01-07 15:30:24.000000000 +0000 -@@ -557,6 +557,11 @@ - return -ENOMEM; - } - -+unsigned long do_brk_locked(unsigned long addr, unsigned long len) -+{ -+ return -ENOMEM; -+} -+ - struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr) - { - return NULL; diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.10-disable-iopriowr.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.10-disable-iopriowr.patch deleted file mode 100644 index 7afd7938fe67..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.6.10-disable-iopriowr.patch +++ /dev/null @@ -1,23 +0,0 @@ -Con says this is broken - ---- linux-2.6.10-ck2/drivers/block/Kconfig.iosched.orig 2005-01-07 13:18:43.557859120 +0000 -+++ linux-2.6.10-ck2/drivers/block/Kconfig.iosched 2005-01-07 13:19:11.989536848 +0000 -@@ -39,16 +39,8 @@ config IOSCHED_CFQ - working environment, suitable for desktop systems. - - config IOPRIO_WRITE -- bool "Support for full write io fairness" -+ bool - depends on IOSCHED_CFQ -- ---help--- -- Most data writeout that isn't direct or raw happen asyncronously -- and thus not in the context of the process that originally dirtied -- the data. This type of writeback is typically handled by the pdflush -- kernel threads. The result is that a process dirtying a lot of pages -- gets proportionally more bandwidth than it should. -- -- Say Y here it you want to apply full fairness for file system -- asyncronous writes at the expense of using 4 bytes in struct page. -+ default n - - endmenu diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.10-drm-i915-fix.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.10-drm-i915-fix.patch new file mode 100644 index 000000000000..da46077e909c --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-sources-2.6.10-drm-i915-fix.patch @@ -0,0 +1,66 @@ +diff -ru linux-2.6.10-ck3.orig/drivers/char/drm/i915_dma.c linux-2.6.10-ck3/drivers/char/drm/i915_dma.c +--- linux-2.6.10-ck3.orig/drivers/char/drm/i915_dma.c 2004-12-24 13:34:31.000000000 -0800 ++++ linux-2.6.10-ck3/drivers/char/drm/i915_dma.c 2005-01-11 20:16:49.245435707 -0800 +@@ -545,10 +545,7 @@ + { + DRM_DEVICE; + +- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { +- DRM_ERROR("i915_flush_ioctl called without lock held\n"); +- return DRM_ERR(EINVAL); +- } ++ LOCK_TEST_WITH_RETURN( dev, filp ); + + return i915_quiescent(dev); + } +@@ -574,10 +571,7 @@ + DRM_DEBUG("i915 batchbuffer, start %x used %d cliprects %d\n", + batch.start, batch.used, batch.num_cliprects); + +- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { +- DRM_ERROR("i915_batchbuffer called without lock held\n"); +- return DRM_ERR(EINVAL); +- } ++ LOCK_TEST_WITH_RETURN( dev, filp ); + + if (batch.num_cliprects && DRM_VERIFYAREA_READ(batch.cliprects, + batch.num_cliprects * +@@ -606,10 +600,7 @@ + DRM_DEBUG("i915 cmdbuffer, buf %p sz %d cliprects %d\n", + cmdbuf.buf, cmdbuf.sz, cmdbuf.num_cliprects); + +- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { +- DRM_ERROR("i915_cmdbuffer called without lock held\n"); +- return DRM_ERR(EINVAL); +- } ++ LOCK_TEST_WITH_RETURN( dev, filp ); + + if (cmdbuf.num_cliprects && + DRM_VERIFYAREA_READ(cmdbuf.cliprects, +@@ -645,10 +636,7 @@ + DRM_DEVICE; + + DRM_DEBUG("%s\n", __FUNCTION__); +- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { +- DRM_ERROR("i915_flip_buf called without lock held\n"); +- return DRM_ERR(EINVAL); +- } ++ LOCK_TEST_WITH_RETURN( dev, filp ); + + return i915_dispatch_flip(dev); + } +diff -ru linux-2.6.10-ck3.orig/drivers/char/drm/i915_irq.c linux-2.6.10-ck3/drivers/char/drm/i915_irq.c +--- linux-2.6.10-ck3.orig/drivers/char/drm/i915_irq.c 2004-12-24 13:34:31.000000000 -0800 ++++ linux-2.6.10-ck3/drivers/char/drm/i915_irq.c 2005-01-11 20:16:49.246435564 -0800 +@@ -92,10 +92,7 @@ + drm_i915_irq_emit_t emit; + int result; + +- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { +- DRM_ERROR("i915_irq_emit called without lock held\n"); +- return DRM_ERR(EINVAL); +- } ++ LOCK_TEST_WITH_RETURN( dev, filp ); + + if (!dev_priv) { + DRM_ERROR("%s called with no initialization\n", __FUNCTION__); diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r4 similarity index 51% rename from sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r2 rename to sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r4 index c54cda55a9bd..9e5b35341074 100644 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r2 +++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r4 @@ -1,2 +1,2 @@ MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484 -MD5 7d56bf108c0a8f2459fc5f66da9d454d patch-2.6.10-ck2.bz2 49167 +MD5 d2640f4147a966d20a785e3c5bdce034 patch-2.6.10-ck4.bz2 56535 -- 2.26.2