Linux 2.6.25.4
Subsystems (28)
We (the -stable team) are announcing the release of the 2.6.25.4 kernel.
It contains a bunch of bug fixes, and one security update, so all users of the 2.6.25 series are encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.25.3 and 2.6.25.4
The updated 2.6.25.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.25.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.25.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 arch/sparc/kernel/entry.S | 2 arch/sparc/kernel/process.c | 25 +- arch/sparc/kernel/ptrace.c | 6 arch/sparc/kernel/rtrap.S | 11 - arch/sparc/kernel/signal.c | 84 ++++---- arch/sparc/kernel/sys_sparc.c | 48 ---- arch/sparc64/kernel/etrap.S | 7 arch/sparc64/kernel/irq.c | 3 arch/sparc64/kernel/pci.c | 130 +++--------- arch/sparc64/kernel/pci_common.c | 6 arch/sparc64/kernel/pci_impl.h | 9 arch/sparc64/kernel/process.c | 18 + arch/sparc64/kernel/ptrace.c | 16 + arch/sparc64/kernel/rtrap.S | 1 arch/sparc64/kernel/signal.c | 88 ++++---- arch/sparc64/kernel/signal32.c | 48 +++- arch/sparc64/kernel/sys_sparc.c | 40 --- arch/sparc64/kernel/sys_sparc32.c | 33 --- arch/x86/Kconfig | 12 + drivers/ata/ata_piix.c | 25 ++ drivers/char/vt.c | 6 drivers/i2c/busses/i2c-piix4.c | 32 ++- drivers/md/raid5.c | 25 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 259 ++++++++++++++++++++++--- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 9 drivers/net/macvlan.c | 2 drivers/net/r8169.c | 8 drivers/rtc/rtc-lib.c | 2 drivers/scsi/aha152x.c | 8 drivers/scsi/libiscsi.c | 29 +- drivers/scsi/qla1280.c | 4 drivers/serial/serial_core.c | 3 drivers/serial/sunhv.c | 2 drivers/serial/sunsab.c | 2 drivers/serial/sunsu.c | 2 drivers/serial/sunzilog.c | 32 +-- drivers/usb/host/ohci-at91.c | 1 drivers/usb/host/ohci-ep93xx.c | 2 drivers/usb/host/ohci-hub.c | 43 ++++ drivers/usb/host/ohci-omap.c | 2 drivers/usb/host/ohci-pci.c | 43 ---- drivers/usb/host/ohci-pxa27x.c | 3 drivers/usb/host/ohci-sm501.c | 2 drivers/usb/host/ohci-ssb.c | 1 drivers/usb/serial/airprime.c | 2 include/asm-sparc/mman.h | 5 include/asm-sparc/psr.h | 1 include/asm-sparc/ptrace.h | 13 + include/asm-sparc/signal.h | 8 include/asm-sparc64/mman.h | 5 include/asm-sparc64/psrcompat.h | 2 include/asm-sparc64/pstate.h | 1 include/asm-sparc64/ptrace.h | 13 + include/asm-sparc64/signal.h | 8 include/asm-sparc64/ttable.h | 7 include/asm-x86/topology.h | 18 - include/net/ip_vs.h | 3 include/net/netfilter/nf_conntrack_tuple.h | 10 net/can/af_can.c | 16 + net/dccp/feat.c | 2 net/ipv4/ipvs/ip_vs_proto.c | 2 net/ipv4/ipvs/ip_vs_proto_ah.c | 1 net/ipv4/ipvs/ip_vs_proto_esp.c | 1 net/ipv4/ipvs/ip_vs_proto_tcp.c | 1 net/ipv4/ipvs/ip_vs_proto_udp.c | 1 net/ipv4/ipvs/ip_vs_sync.c | 80 +++++-- net/ipv4/netfilter/ip_queue.c | 5 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 net/ipv6/netfilter/ip6_queue.c | 5 net/netfilter/nf_conntrack_core.c | 4 net/netfilter/nfnetlink_queue.c | 5 net/sched/sch_htb.c | 8 net/xfrm/xfrm_state.c | 2 74 files changed, 808 insertions(+), 559 deletions(-)
Alan Stern (1):
OHCI: fix regression upon awakening from hibernation
Albert Comerma (1):
V4L/DVB (7473): PATCH for various Dibcom based devices
Arnaud Ebalard (1):
{nfnetlink, ip, ip6}_queue: fix skb_over_panic when enlarging packets
Chris Wright (1):
dccp: return -EINVAL on invalid feature length
Dan Williams (1):
md: fix raid5 'repair' operations
David S. Miller (10):
sparc: Fix SA_ONSTACK signal handling.
sparc: Fix fork/clone/vfork system call restart.
sparc64: Stop creating dummy root PCI host controller devices.
sparc64: Fix wedged irq regression.
SPARC64: Fix args to 64-bit sys_semctl() via sys_ipc().
serial: Fix sparc driver name strings.
sparc: Fix ptrace() detach.
sparc: Fix mremap address range validation.
sparc: Fix debugger syscall restart interactions.
sparc32: Don't twiddle PT_DTRACE in exec.
Greg Kroah-Hartman (1):
Linux 2.6.25.4
Ivan Vecera (1):
r8169: fix oops in r8169_get_mac_version
James Bottomley (2):
SCSI: aha152x: Fix oops on module removal
SCSI: aha152x: fix init suspiciously returned 1, it should follow 0/-E convention
Jarek Poplawski (1):
sch_htb: remove from event queue in htb_parent_to_leaf()
Jean Delvare (1):
i2c-piix4: Blacklist two mainboards
Jeremy Higdon (1):
SCSI: qla1280: Fix queue depth problem
Julian Anastasov (1):
ipvs: fix oops in backup for fwmark conn templates
Leonardo Chiquitto (1):
USB: airprime: unlock mutex instead of trying to lock it again
Maciej W. Rozycki (1):
rtc: rtc_time_to_tm: use unsigned arithmetic
Mike Christie (2):
SCSI: libiscsi regression in 2.6.25: fix nop timer handling
SCSI: libiscsi regression in 2.6.25: fix setting of recv timer
Oliver Hartkopp (1):
can: Fix can_send() handling on dev_queue_xmit() failures
Patrick McHardy (1):
macvlan: Fix memleak on device removal/crash on module removal
Philip Craig (1):
nf_conntrack: padding breaks conntrack hash on ARM
Robert Reif (1):
sparc: sunzilog uart order
Roel Kluin (1):
r8169: fix past rtl_chip_info array size for unknown chipsets
Sam Ravnborg (1):
x86: use defconfigs from x86/configs/*
Samuel Thibault (1):
vt: fix canonical input in UTF-8 mode
Tejun Heo (1):
ata_piix: verify SIDPR access before enabling it
Tetsuo Handa (1):
serial: access after NULL check in uart_flush_buffer()
Vaidyanathan Srinivasan (1):
x86: sysfs cpu?/topology is empty in 2.6.25 (32-bit Intel system)
YOSHIFUJI Hideaki (1):
XFRM: AUDIT: Fix flowlabel text format ambibuity.
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 25 -EXTRAVERSION = .3 +EXTRAVERSION = .4 NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION*
arch/sparc/kernel/entry.S +2 -0
@@ -1398,6 +1398,8 @@ ret_from_fork: .align 4 .globl linux_sparc_syscall linux_sparc_syscall: + sethi %hi(PSR_SYSCALL), %l4 + or %l0, %l4, %l0 /* Direct access to user regs, must faster. */ cmp %g1, NR_SYSCALLS bgeu linux_sparc_ni_syscall
arch/sparc/kernel/process.c +16 -9
@@ -421,14 +421,26 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, unsigned long stack_size) {unsigned long parent_tid_ptr, child_tid_ptr; +unsigned long orig_i1 = regs->u_regs[UREG_I1 ]; +long ret; parent_tid_ptr = regs->u_regs[UREG_I2 ]; child_tid_ptr = regs->u_regs[UREG_I4 ]; -return do_fork (clone_flags, stack_start, - regs, stack_size, - (int __user *) parent_tid_ptr, - (int __user *) child_tid_ptr); + ret =do_fork (clone_flags, stack_start, + regs, stack_size, + (int __user *) parent_tid_ptr, + (int __user *) child_tid_ptr); + +/* If we get an error and potentially restart the system +* call, we're screwed because copy_thread() clobbered +* the parent's %o1. So detect that case and restore it +* here. +*/ +if ((unsigned long )ret >= -ERESTART_RESTARTBLOCK ) + regs->u_regs[UREG_I1 ] = orig_i1; + +return ret; }/* Copy a Sparc thread. The fork() return value conventions
@@ -628,11 +640,6 @@ asmlinkage int sparc_execve(struct pt_regs *regs) (char __user *__user *)regs->u_regs[base +UREG_I2 ], regs);putname (filename); -if (error ==0 ) { -task_lock (current); - current->ptrace &= ~PT_DTRACE ; -task_unlock (current); - } out:return error; }
arch/sparc/kernel/ptrace.c +4 -2
@@ -170,8 +170,8 @@ static int genregs32_set(struct task_struct *target,switch (pos) {case 32 :/* PSR */ psr = regs->psr; - psr &= ~PSR_ICC ; - psr |= (reg &PSR_ICC ); + psr &= ~(PSR_ICC |PSR_SYSCALL ); + psr |= (reg & (PSR_ICC |PSR_SYSCALL )); regs->psr = psr;break ;case 33 :/* PC */
@@ -441,6 +441,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)break ;default : +if (request ==PTRACE_SPARC_DETACH ) + request =PTRACE_DETACH ; ret =ptrace_request (child, request, addr, data);break ; }
arch/sparc/kernel/rtrap.S +8 -3
@@ -50,8 +50,9 @@ rtrap_7win_patch5: and %g1, 0x7f, %g1 ret_trap_entry: ret_trap_lockless_ipi: andcc %t_psr, PSR_PS, %g0 + sethi %hi(PSR_SYSCALL), %g1 be 1f - nop + andn %t_psr, %g1, %t_psr wr %t_psr, 0x0, %psr b ret_trap_kernel
@@ -73,7 +74,6 @@ signal_p: ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr mov %l5, %o1 - mov %l6, %o2 call do_signal add %sp, STACKFRAME_SZ, %o0 ! pt_regs ptr
@@ -81,6 +81,8 @@ signal_p: ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr clr %l6 ret_trap_continue: + sethi %hi(PSR_SYSCALL), %g1 + andn %t_psr, %g1, %t_psr wr %t_psr, 0x0, %psr WRITE_PAUSE
@@ -137,8 +139,9 @@ ret_trap_userwins_ok: LOAD_PT_PRIV(sp, t_psr, t_pc, t_npc) or %t_pc, %t_npc, %g2 andcc %g2, 0x3, %g0 + sethi %hi(PSR_SYSCALL), %g2 be 1f - nop + andn %t_psr, %g2, %t_psr b ret_trap_unaligned_pc add %sp, STACKFRAME_SZ, %o0
@@ -201,6 +204,8 @@ rtrap_patch5: and %g1, 0xff, %g1 1: LOAD_PT_ALL(sp, t_psr, t_pc, t_npc, g1) 2: + sethi %hi(PSR_SYSCALL), %twin_tmp1 + andn %t_psr, %twin_tmp1, %t_psr wr %t_psr, 0x0, %psr WRITE_PAUSE
arch/sparc/kernel/signal.c +45 -39
146 lines not on this page · raw message
arch/sparc/kernel/sys_sparc.c +5 -43
64 lines not on this page · raw message
arch/sparc64/kernel/etrap.S +4 -3
@@ -27,11 +27,12 @@ .text .align 64 - .globl etrap, etrap_irq, etraptl1 + .globl etrap_syscall, etrap, etrap_irq, etraptl1 etrap: rdpr %pil, %g2 -etrap_irq: - TRAP_LOAD_THREAD_REG(%g6, %g1) +etrap_irq: clr %g3 +etrap_syscall: TRAP_LOAD_THREAD_REG(%g6, %g1) rdpr %tstate, %g1 + or %g1, %g3, %g1 sllx %g2, 20, %g3 andcc %g1, TSTATE_PRIV, %g0 or %g1, %g3, %g1
arch/sparc64/kernel/irq.c +2 -1
@@ -1,6 +1,6 @@/* irq.c: UltraSparc IRQ handling/init/registry. * -* Copyright (C) 1997, 2007 David S. Miller ([email protected]) +* Copyright (C) 1997, 2007, 2008 David S. Miller ([email protected]) * Copyright (C) 1998 Eddie C. Dost ([email protected]) * Copyright (C) 1998 Jakub Jelinek ([email protected]) */
@@ -308,6 +308,7 @@ static void sun4u_irq_enable(unsigned int virt_irq) IMAP_AID_SAFARI | IMAP_NID_SAFARI); val |= tid |IMAP_VALID ;upa_writeq (val, imap); +upa_writeq (ICLR_IDLE , data->iclr); } }
arch/sparc64/kernel/pci.c +33 -97
175 lines not on this page · raw message
arch/sparc64/kernel/pci_common.c +0 -6
@@ -264,9 +264,6 @@ static int sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,unsigned int func =PCI_FUNC (devfn);unsigned long ret; -if (!bus && devfn ==0x00 ) -return pci_host_bridge_read_pci_cfg (bus_dev, devfn, where, - size, value);if (config_out_of_range (pbm, bus, devfn, where)) { ret = ~0UL ; }else {
@@ -300,9 +297,6 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,unsigned int func =PCI_FUNC (devfn);unsigned long ret; -if (!bus && devfn ==0x00 ) -return pci_host_bridge_write_pci_cfg (bus_dev, devfn, where, - size, value);if (config_out_of_range (pbm, bus, devfn, where)) {/* Do nothing. */ }else {
arch/sparc64/kernel/pci_impl.h +0 -9
@@ -167,15 +167,6 @@ extern void pci_get_pbm_props(struct pci_pbm_info *pbm);extern struct pci_bus *pci_scan_one_pbm (struct pci_pbm_info *pbm);extern void pci_determine_mem_io_space (struct pci_pbm_info *pbm); -extern int pci_host_bridge_read_pci_cfg (struct pci_bus *bus_dev, -unsigned int devfn, -int where,int size, -u32 *value); -extern int pci_host_bridge_write_pci_cfg (struct pci_bus *bus_dev, -unsigned int devfn, -int where,int size, -u32 value); -/* Error reporting support. */ extern void pci_scan_for_target_abort (struct pci_pbm_info *,struct pci_bus *);extern void pci_scan_for_master_abort (struct pci_pbm_info *,struct pci_bus *);
arch/sparc64/kernel/process.c +15 -3
@@ -507,6 +507,8 @@ asmlinkage long sparc_do_fork(unsigned long clone_flags, unsigned long stack_size) {int __user *parent_tid_ptr, *child_tid_ptr; +unsigned long orig_i1 = regs->u_regs[UREG_I1 ]; +long ret;#ifdef CONFIG_COMPAT if (test_thread_flag (TIF_32BIT )) {
@@ -519,9 +521,19 @@ asmlinkage long sparc_do_fork(unsigned long clone_flags, child_tid_ptr = (int __user *) regs->u_regs[UREG_I4 ]; } -return do_fork (clone_flags, stack_start, - regs, stack_size, - parent_tid_ptr, child_tid_ptr); + ret =do_fork (clone_flags, stack_start, + regs, stack_size, + parent_tid_ptr, child_tid_ptr); + +/* If we get an error and potentially restart the system +* call, we're screwed because copy_thread() clobbered +* the parent's %o1. So detect that case and restore it +* here. +*/ +if ((unsigned long )ret >= -ERESTART_RESTARTBLOCK ) + regs->u_regs[UREG_I1 ] = orig_i1; + +return ret; }/* Copy a Sparc thread. The fork() return value conventions
arch/sparc64/kernel/ptrace.c +11 -5
@@ -287,11 +287,11 @@ static int genregs64_set(struct task_struct *target,32 *sizeof (u64), 33 * sizeof(u64));if (!ret) { -/* Only the condition codes can be modified -* in the %tstate register. +/* Only the condition codes and the "in syscall" +* state can be modified in the %tstate register. */ - tstate &= (TSTATE_ICC |TSTATE_XCC ); - regs->tstate &= ~(TSTATE_ICC |TSTATE_XCC ); + tstate &= (TSTATE_ICC |TSTATE_XCC |TSTATE_SYSCALL ); + regs->tstate &= ~(TSTATE_ICC |TSTATE_XCC |TSTATE_SYSCALL ); regs->tstate |= tstate; } }
@@ -657,8 +657,10 @@ static int genregs32_set(struct task_struct *target,switch (pos) {case 32 :/* PSR */ tstate = regs->tstate; - tstate &= ~(TSTATE_ICC |TSTATE_XCC ); + tstate &= ~(TSTATE_ICC |TSTATE_XCC |TSTATE_SYSCALL ); tstate |=psr_to_tstate_icc (reg); +if (reg &PSR_SYSCALL ) + tstate |=TSTATE_SYSCALL ; regs->tstate = tstate;break ;case 33 :/* PC */
@@ -944,6 +946,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,break ;default : +if (request ==PTRACE_SPARC_DETACH ) + request =PTRACE_DETACH ; ret =compat_ptrace_request (child, request, addr, data);break ; }
@@ -1036,6 +1040,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)break ;default : +if (request ==PTRACE_SPARC_DETACH ) + request =PTRACE_DETACH ; ret =ptrace_request (child, request, addr, data);break ; }
arch/sparc64/kernel/rtrap.S +1 -0
@@ -270,6 +270,7 @@ rt_continue: ldx [%sp + PTREGS_OFF + PT_V9_G1], %g1 wr %o3, %g0, %y wrpr %l4, 0x0, %pil wrpr %g0, 0x1, %tl + andn %l1, TSTATE_SYSCALL, %l1 wrpr %l1, %g0, %tstate wrpr %l2, %g0, %tpc wrpr %o2, %g0, %tnpc
arch/sparc64/kernel/signal.c +46 -42
149 lines not on this page · raw message
arch/sparc64/kernel/signal32.c +37 -11
96 lines not on this page · raw message
arch/sparc64/kernel/sys_sparc.c +6 -34
@@ -454,8 +454,8 @@ asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second, err =sys_semget (first, (int )second, (int )third); goto out;case SEMCTL : { - err =sys_semctl (first, third, - (int )second |IPC_64 , + err =sys_semctl (first, second, + (int )third |IPC_64 , (union semun ) ptr); goto out; }
@@ -542,8 +542,7 @@ asmlinkage long sparc64_personality(unsigned long personality)return ret; } -int sparc64_mmap_check (unsigned long addr,unsigned long len, -unsigned long flags) +int sparc64_mmap_check (unsigned long addr,unsigned long len) {if (test_thread_flag (TIF_32BIT )) {if (len >=STACK_TOP32 )
@@ -609,46 +608,19 @@ asmlinkage unsigned long sys64_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr) { - struct vm_area_struct *vma; unsigned long ret = -EINVAL;if (test_thread_flag (TIF_32BIT )) goto out;if (unlikely (new_len >=VA_EXCLUDE_START )) goto out; -if (unlikely (invalid_64bit_range (addr, old_len))) +if (unlikely (sparc64_mmap_check (addr, old_len))) + goto out; +if (unlikely (sparc64_mmap_check (new_addr, new_len))) goto out;down_write (¤t->mm->mmap_sem); -if (flags &MREMAP_FIXED ) { -if (invalid_64bit_range (new_addr, new_len)) - goto out_sem; - }else if (invalid_64bit_range (addr, new_len)) { -unsigned long map_flags =0 ; -struct file *file =NULL ; - - ret = -ENOMEM ; -if (!(flags &MREMAP_MAYMOVE )) - goto out_sem; - - vma =find_vma (current->mm, addr); -if (vma) { -if (vma->vm_flags &VM_SHARED ) - map_flags |=MAP_SHARED ; - file = vma->vm_file; - } - -/* MREMAP_FIXED checked above. */ - new_addr =get_unmapped_area (file, addr, new_len, - vma ? vma->vm_pgoff :0 , - map_flags); - ret = new_addr; -if (new_addr & ~PAGE_MASK ) - goto out_sem; - flags |=MREMAP_FIXED ; - } ret =do_mremap (addr, old_len, new_len, flags, new_addr); -out_sem:up_write (¤t->mm->mmap_sem); out:return ret;
arch/sparc64/kernel/sys_sparc32.c +2 -31
@@ -906,44 +906,15 @@ asmlinkage unsigned long sys32_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, u32 __new_addr) { - struct vm_area_struct *vma; unsigned long ret = -EINVAL;unsigned long new_addr = __new_addr; -if (old_len >STACK_TOP32 || new_len >STACK_TOP32 ) +if (unlikely (sparc64_mmap_check (addr, old_len))) goto out; -if (addr >STACK_TOP32 - old_len) +if (unlikely (sparc64_mmap_check (new_addr, new_len))) goto out;down_write (¤t->mm->mmap_sem); -if (flags &MREMAP_FIXED ) { -if (new_addr >STACK_TOP32 - new_len) - goto out_sem; - }else if (addr >STACK_TOP32 - new_len) { -unsigned long map_flags =0 ; -struct file *file =NULL ; - - ret = -ENOMEM ; -if (!(flags &MREMAP_MAYMOVE )) - goto out_sem; - - vma =find_vma (current->mm, addr); -if (vma) { -if (vma->vm_flags &VM_SHARED ) - map_flags |=MAP_SHARED ; - file = vma->vm_file; - } - -/* MREMAP_FIXED checked above. */ - new_addr =get_unmapped_area (file, addr, new_len, - vma ? vma->vm_pgoff :0 , - map_flags); - ret = new_addr; -if (new_addr & ~PAGE_MASK ) - goto out_sem; - flags |=MREMAP_FIXED ; - } ret =do_mremap (addr, old_len, new_len, flags, new_addr); -out_sem:up_write (¤t->mm->mmap_sem); out:return ret;
arch/x86/Kconfig +12 -0
@@ -24,6 +24,18 @@ config X86 select HAVE_KRETPROBES select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) +config DEFCONFIG_LIST + string + depends on X86_32 + option defconfig_list + default "arch/x86/configs/i386_defconfig" + +config DEFCONFIG_LIST + string + depends on X86_64 + option defconfig_list + default "arch/x86/configs/x86_64_defconfig" + config GENERIC_LOCKBREAK def_bool n
drivers/ata/ata_piix.c +25 -0
@@ -1531,6 +1531,8 @@ static void __devinit piix_init_sidpr(struct ata_host *host) {struct pci_dev *pdev =to_pci_dev (host->dev);struct piix_host_priv *hpriv = host->private_data; +struct ata_device *dev0 = &host->ports[0 ]->link.device[0 ]; +u32 scontrol;int i;/* check for availability */
@@ -1549,6 +1551,29 @@ static void __devinit piix_init_sidpr(struct ata_host *host)return ; hpriv->sidpr =pcim_iomap_table (pdev)[PIIX_SIDPR_BAR ]; + +/* SCR access via SIDPR doesn't work on some configurations. +* Give it a test drive by inhibiting power save modes which +* we'll do anyway. +*/ + scontrol =piix_sidpr_read (dev0,SCR_CONTROL ); + +/* if IPM is already 3, SCR access is probably working. Don't +* un-inhibit power save modes as BIOS might have inhibited +* them for a reason. +*/ +if ((scontrol &0xf00 ) !=0x300 ) { + scontrol |=0x300 ; +piix_sidpr_write (dev0,SCR_CONTROL , scontrol); + scontrol =piix_sidpr_read (dev0,SCR_CONTROL ); + +if ((scontrol &0xf00 ) !=0x300 ) { +dev_printk (KERN_INFO , host->dev,"SCR access via " +"SIDPR is available but doesn't work\n" ); +return ; + } + } + host->ports[0 ]->ops = &piix_sidpr_sata_ops; host->ports[1 ]->ops = &piix_sidpr_sata_ops; }
drivers/char/vt.c +6 -0
@@ -2723,6 +2723,10 @@ static int con_open(struct tty_struct *tty, struct file *filp) tty->winsize.ws_row = vc_cons[currcons].d->vc_rows; tty->winsize.ws_col = vc_cons[currcons].d->vc_cols; } +if (vc->vc_utf) + tty->termios->c_iflag |=IUTF8 ; +else + tty->termios->c_iflag &= ~IUTF8 ;release_console_sem ();vcs_make_sysfs (tty);return ret;
@@ -2899,6 +2903,8 @@ int __init vty_init(void) console_driver->minor_start =1 ; console_driver->type =TTY_DRIVER_TYPE_CONSOLE ; console_driver->init_termios = tty_std_termios; +if (default_utf8) + console_driver->init_termios.c_iflag |=IUTF8 ; console_driver->flags =TTY_DRIVER_REAL_RAW |TTY_DRIVER_RESET_TERMIOS ;tty_set_operations (console_driver, &con_ops);if (tty_register_driver (console_driver))
drivers/i2c/busses/i2c-piix4.c +30 -2
@@ -108,7 +108,27 @@ static unsigned short piix4_smba;static struct pci_driver piix4_driver;static struct i2c_adapter piix4_adapter; -static struct dmi_system_id __devinitdata piix4_dmi_table[] = { +static struct dmi_system_id __devinitdata piix4_dmi_blacklist[] = { + { + .ident ="Sapphire AM2RD790" , + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"SAPPHIRE Inc." ), +DMI_MATCH (DMI_BOARD_NAME ,"PC-AM2RD790" ), + }, + }, + { + .ident ="DFI Lanparty UT 790FX" , + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"DFI Inc." ), +DMI_MATCH (DMI_BOARD_NAME ,"LP UT 790FX" ), + }, + }, + { } +}; + +/* The IBM entry is in a separate table because we only check it +on Intel-based systems */ +static struct dmi_system_id __devinitdata piix4_dmi_ibm[] = { { .ident ="IBM" , .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"IBM" ), },
@@ -123,8 +143,16 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,dev_info (&PIIX4_dev->dev,"Found %s device\n" ,pci_name (PIIX4_dev)); +/* On some motherboards, it was reported that accessing the SMBus +caused severe hardware problems */ +if (dmi_check_system (piix4_dmi_blacklist)) { +dev_err (&PIIX4_dev->dev, +"Accessing the SMBus on this system is unsafe!\n" ); +return -EPERM ; + } +/* Don't access SMBus on IBM systems which get corrupted eeproms */ -if (dmi_check_system (piix4_dmi_table) && +if (dmi_check_system (piix4_dmi_ibm) && PIIX4_dev->vendor ==PCI_VENDOR_ID_INTEL ) {dev_err (&PIIX4_dev->dev,"IBM system detected; this module " "may corrupt your serial eeprom! Refusing to load "
drivers/md/raid5.c +13 -12
@@ -2354,8 +2354,8 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh,/* complete a check operation */ if (test_and_clear_bit (STRIPE_OP_CHECK , &sh->ops.complete)) { -clear_bit (STRIPE_OP_CHECK , &sh->ops.ack); -clear_bit (STRIPE_OP_CHECK , &sh->ops.pending); +clear_bit (STRIPE_OP_CHECK , &sh->ops.ack); +clear_bit (STRIPE_OP_CHECK , &sh->ops.pending);if (s->failed ==0 ) {if (sh->ops.zero_sum_result ==0 )/* parity is correct (on disc,
@@ -2385,16 +2385,6 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh, canceled_check =1 ;/* STRIPE_INSYNC is not set */ } -/* check if we can clear a parity disk reconstruct */ -if (test_bit (STRIPE_OP_COMPUTE_BLK , &sh->ops.complete) && -test_bit (STRIPE_OP_MOD_REPAIR_PD , &sh->ops.pending)) { - -clear_bit (STRIPE_OP_MOD_REPAIR_PD , &sh->ops.pending); -clear_bit (STRIPE_OP_COMPUTE_BLK , &sh->ops.complete); -clear_bit (STRIPE_OP_COMPUTE_BLK , &sh->ops.ack); -clear_bit (STRIPE_OP_COMPUTE_BLK , &sh->ops.pending); - } -/* start a new check operation if there are no failures, the stripe is * not insync, and a repair is not in flight */
@@ -2409,6 +2399,17 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh, } } +/* check if we can clear a parity disk reconstruct */ +if (test_bit (STRIPE_OP_COMPUTE_BLK , &sh->ops.complete) && +test_bit (STRIPE_OP_MOD_REPAIR_PD , &sh->ops.pending)) { + +clear_bit (STRIPE_OP_MOD_REPAIR_PD , &sh->ops.pending); +clear_bit (STRIPE_OP_COMPUTE_BLK , &sh->ops.complete); +clear_bit (STRIPE_OP_COMPUTE_BLK , &sh->ops.ack); +clear_bit (STRIPE_OP_COMPUTE_BLK , &sh->ops.pending); + } + +/* Wait for check parity and compute block operations to complete * before write-back. If a failure occurred while the check operation * was in flight we need to cycle this stripe through handle_stripe
drivers/media/dvb/dvb-usb/dib0700_devices.c +231 -28
323 lines not on this page · raw message
drivers/media/dvb/dvb-usb/dvb-usb-ids.h +7 -2
@@ -46,8 +46,8 @@#define USB_VID_ULTIMA_ELECTRONIC 0x05d8#define USB_VID_UNIWILL 0x1584#define USB_VID_WIDEVIEW 0x14aa -/* dom : pour gigabyte u7000 */ #define USB_VID_GIGABYTE 0x1044 +#define USB_VID_YUAN 0x1164/* Product IDs */
@@ -135,9 +135,14 @@#define USB_PID_AVERMEDIA_VOLAR 0xa807#define USB_PID_AVERMEDIA_VOLAR_2 0xb808#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a +#define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058 +#define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060 +#define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e#define USB_PID_PINNACLE_PCTV2000E 0x022c#define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228#define USB_PID_PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T 0x0229 +#define USB_PID_PINNACLE_PCTV72E 0x0236 +#define USB_PID_PINNACLE_PCTV73E 0x0237#define USB_PID_PCTV_200E 0x020e#define USB_PID_PCTV_400E 0x020f#define USB_PID_PCTV_450E 0x0222
@@ -183,9 +188,9 @@#define USB_PID_OPERA1_WARM 0x3829#define USB_PID_LIFEVIEW_TV_WALKER_TWIN_COLD 0x0514#define USB_PID_LIFEVIEW_TV_WALKER_TWIN_WARM 0x0513 -/* dom pour gigabyte u7000 */ #define USB_PID_GIGABYTE_U7000 0x7001#define USB_PID_ASUS_U3000 0x171f#define USB_PID_ASUS_U3100 0x173f +#define USB_PID_YUAN_EC372S 0x1edc#endif
drivers/net/macvlan.c +1 -1
@@ -450,7 +450,7 @@ static void macvlan_dellink(struct net_device *dev)unregister_netdevice (dev);if (list_empty (&port->vlans)) -macvlan_port_destroy (dev); +macvlan_port_destroy (port->dev); }static struct rtnl_link_ops macvlan_link_ops__read_mostly = {
drivers/net/r8169.c +4 -4
@@ -1617,6 +1617,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)SET_NETDEV_DEV (dev, &pdev->dev); tp =netdev_priv (dev); tp->dev = dev; + tp->pci_dev = pdev; tp->msg_enable =netif_msg_init (debug.msg_enable,R8169_MSG_DEFAULT );/* enable device (incl. PCI PM wakeup and hotplug setup) */
@@ -1705,18 +1706,18 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)rtl8169_print_mac_version (tp); -for (i =ARRAY_SIZE (rtl_chip_info) -1 ; i >=0 ; i--) { +for (i =0 ; i <ARRAY_SIZE (rtl_chip_info); i++) {if (tp->mac_version == rtl_chip_info[i].mac_version)break ; } -if (i <0 ) { +if (i ==ARRAY_SIZE (rtl_chip_info)) {/* Unknown chip: assume array element #0, original RTL-8169 */ if (netif_msg_probe (tp)) {dev_printk (KERN_DEBUG , &pdev->dev,"unknown chip version, assuming %s\n" , rtl_chip_info[0 ].name); } - i++; + i =0 ; } tp->chipset = i;
@@ -1777,7 +1778,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)#endif tp->intr_mask =0xffff ; - tp->pci_dev = pdev; tp->mmio_addr = ioaddr; tp->align = cfg->align; tp->hw_start = cfg->hw_start;
drivers/rtc/rtc-lib.c +1 -1
@@ -51,7 +51,7 @@ EXPORT_SYMBOL(rtc_year_days);*/ void rtc_time_to_tm (unsigned long time,struct rtc_time *tm) { - registerint days, month, year; +unsigned int days, month, year; days = time /86400 ; time -= days *86400 ;
drivers/scsi/aha152x.c +4 -4
@@ -3835,7 +3835,7 @@ static int __init aha152x_init(void) iounmap(p); }if (!ok && setup_count ==0 ) -return 0 ; +return -ENODEV ;printk (KERN_INFO "aha152x: BIOS test: passed, " );#else
@@ -3914,14 +3914,14 @@ static int __init aha152x_init(void)#endif } -return 1 ; +return 0 ; } static void __exit aha152x_exit(void) { -struct aha152x_hostdata *hd; +struct aha152x_hostdata *hd, *tmp; -list_for_each_entry (hd, &aha152x_host_list, host_list) { +list_for_each_entry_safe (hd, tmp, &aha152x_host_list, host_list) { struct Scsi_Host *shost = container_of((void *)hd, struct Scsi_Host, hostdata);aha152x_release (shost);
drivers/scsi/libiscsi.c +15 -14
@@ -635,7 +635,9 @@ static int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,if (iscsi_recv_pdu (conn->cls_conn, hdr, data, datalen)) rc =ISCSI_ERR_CONN_FAILED ; - } + }else +mod_timer (&conn->transport_timer, + jiffies + conn->recv_timeout);iscsi_free_mgmt_task (conn, mtask);break ;default :
@@ -1353,19 +1355,20 @@ static void iscsi_check_transport_timeouts(unsigned long data) {struct iscsi_conn *conn = (struct iscsi_conn *)data;struct iscsi_session *session = conn->session; -unsigned long timeout, next_timeout =0 , last_recv; +unsigned long recv_timeout, next_timeout =0 , last_recv;spin_lock (&session->lock);if (session->state !=ISCSI_STATE_LOGGED_IN ) goto done; - timeout = conn->recv_timeout; -if (!timeout) + recv_timeout = conn->recv_timeout; +if (!recv_timeout) goto done; - timeout *=HZ ; + recv_timeout *=HZ ; last_recv = conn->last_recv; -if (time_before_eq (last_recv + timeout + (conn->ping_timeout *HZ ), +if (conn->ping_mtask && +time_before_eq (conn->last_ping + (conn->ping_timeout *HZ ), jiffies)) {iscsi_conn_printk (KERN_ERR , conn,"ping timeout of %d secs " "expired, last rx %lu, last ping %lu, "
@@ -1376,15 +1379,13 @@ static void iscsi_check_transport_timeouts(unsigned long data)return ; } -if (time_before_eq (last_recv + timeout, jiffies)) { -if (time_before_eq (conn->last_ping, last_recv)) { -/* send a ping to try to provoke some traffic */ -debug_scsi ("Sending nopout as ping on conn %p\n" , conn); -iscsi_send_nopout (conn,NULL ); - } - next_timeout = last_recv + timeout + (conn->ping_timeout *HZ ); +if (time_before_eq (last_recv + recv_timeout, jiffies)) { +/* send a ping to try to provoke some traffic */ +debug_scsi ("Sending nopout as ping on conn %p\n" , conn); +iscsi_send_nopout (conn,NULL ); + next_timeout = conn->last_ping + (conn->ping_timeout *HZ ); }else - next_timeout = last_recv + timeout; + next_timeout = last_recv + recv_timeout;debug_scsi ("Setting next tmo %lu\n" , next_timeout);mod_timer (&conn->transport_timer, next_timeout);
drivers/scsi/qla1280.c +2 -2
@@ -2012,7 +2012,7 @@ qla1280_set_defaults(struct scsi_qla_host *ha) nv->bus[bus].config_2.req_ack_active_negation =1 ; nv->bus[bus].config_2.data_line_active_negation =1 ; nv->bus[bus].selection_timeout =250 ; - nv->bus[bus].max_queue_depth =256 ; + nv->bus[bus].max_queue_depth =32 ;if (IS_ISP1040 (ha)) { nv->bus[bus].bus_reset_delay =3 ;
@@ -2056,7 +2056,7 @@ qla1280_config_target(struct scsi_qla_host *ha, int bus, int target) status =qla1280_mailbox_command (ha,0x0f , mb);/* Save Tag queuing enable flag. */ - flag = (BIT_0 << target) & mb[0 ]; + flag = (BIT_0 << target);if (nv->bus[bus].target[target].parameter.tag_queuing) ha->bus_settings[bus].qtag_enables |= flag;
drivers/serial/serial_core.c +2 -1
@@ -535,7 +535,7 @@ static int uart_chars_in_buffer(struct tty_struct *tty)static void uart_flush_buffer (struct tty_struct *tty) {struct uart_state *state = tty->driver_data; -struct uart_port *port = state->port; +struct uart_port *port;unsigned long flags;/*
@@ -547,6 +547,7 @@ static void uart_flush_buffer(struct tty_struct *tty)return ; } + port = state->port;pr_debug ("uart_flush_buffer(%d) called\n" , tty->index);spin_lock_irqsave (&port->lock, flags);
drivers/serial/sunhv.c +1 -1
@@ -392,7 +392,7 @@ static struct uart_ops sunhv_pops = {static struct uart_driver sunhv_reg = { .owner =THIS_MODULE , - .driver_name ="serial" , + .driver_name ="sunhv" , .dev_name ="ttyS" , .major =TTY_MAJOR , };
drivers/serial/sunsab.c +1 -1
@@ -826,7 +826,7 @@ static struct uart_ops sunsab_pops = {static struct uart_driver sunsab_reg = { .owner =THIS_MODULE , - .driver_name ="serial" , + .driver_name ="sunsab" , .dev_name ="ttyS" , .major =TTY_MAJOR , };
drivers/serial/sunsu.c +1 -1
@@ -1173,7 +1173,7 @@ out:static struct uart_driver sunsu_reg = { .owner =THIS_MODULE , - .driver_name ="serial" , + .driver_name ="sunsu" , .dev_name ="ttyS" , .major =TTY_MAJOR , };
drivers/serial/sunzilog.c +18 -14
@@ -1015,6 +1015,7 @@ static struct uart_ops sunzilog_pops = { .verify_port = sunzilog_verify_port, }; +static int uart_chip_count;static struct uart_sunzilog_port *sunzilog_port_table;static struct zilog_layout __iomem **sunzilog_chip_regs;
@@ -1022,7 +1023,7 @@ static struct uart_sunzilog_port *sunzilog_irq_chain;static struct uart_driver sunzilog_reg = { .owner =THIS_MODULE , - .driver_name ="ttyS" , + .driver_name ="sunzilog" , .dev_name ="ttyS" , .major =TTY_MAJOR , };
@@ -1350,16 +1351,22 @@ static int zilog_irq = -1;static int __devinit zs_probe (struct of_device *op,const struct of_device_id *match) { -static int inst; +static int kbm_inst, uart_inst; +int inst;struct uart_sunzilog_port *up;struct zilog_layout __iomem *rp; -int keyboard_mouse; +int keyboard_mouse =0 ;int err; - keyboard_mouse =0 ;if (of_find_property (op->node,"keyboard" ,NULL )) keyboard_mouse =1 ; +/* uarts must come before keyboards/mice */ +if (keyboard_mouse) + inst = uart_chip_count + kbm_inst; +else + inst = uart_inst; + sunzilog_chip_regs[inst] =of_ioremap (&op->resource[0 ],0 ,sizeof (struct zilog_layout ),"zs" );
@@ -1427,6 +1434,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m rp, sizeof(struct zilog_layout));return err; } + uart_inst++; }else { printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) " "is a %s\n",
@@ -1438,12 +1446,11 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m op->dev.bus_id, (unsigned long long ) up[1 ].port.mapbase, op->irqs[0], sunzilog_type(&up[1].port)); + kbm_inst++; }dev_set_drvdata (&op->dev, &up[0 ]); - inst++; -return 0 ; }
@@ -1491,28 +1498,25 @@ static struct of_platform_driver zs_driver = {static int __init sunzilog_init (void ) {struct device_node *dp; -int err, uart_count; -int num_keybms; +int err; +int num_keybms =0 ;int num_sunzilog =0 ; - num_keybms =0 ;for_each_node_by_name (dp,"zs" ) { num_sunzilog++;if (of_find_property (dp,"keyboard" ,NULL )) num_keybms++; } - uart_count =0 ;if (num_sunzilog) { -int uart_count; - err =sunzilog_alloc_tables (num_sunzilog);if (err) goto out; - uart_count = (num_sunzilog *2 ) - (2 * num_keybms); + uart_chip_count = num_sunzilog - num_keybms; - err =sunserial_register_minors (&sunzilog_reg, uart_count); + err =sunserial_register_minors (&sunzilog_reg, + uart_chip_count *2 );if (err) goto out_free_tables; }
drivers/usb/host/ohci-at91.c +1 -0
@@ -348,6 +348,7 @@ static int ohci_hcd_at91_drv_resume(struct platform_device *pdev)if (!clocked)at91_start_clock (); +ohci_finish_controller_resume (hcd); return 0; }#else
drivers/usb/host/ohci-ep93xx.c +1 -1
@@ -194,8 +194,8 @@ static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)ep93xx_start_hc (&pdev->dev); pdev->dev.power.power_state =PMSG_ON ; -usb_hcd_resume_root_hub (hcd); +ohci_finish_controller_resume (hcd); return 0; }#endif
drivers/usb/host/ohci-hub.c +43 -0
49 lines not on this page · raw message
drivers/usb/host/ohci-omap.c +1 -1
@@ -519,7 +519,7 @@ static int ohci_omap_resume(struct platform_device *dev)omap_ohci_clock_power (1 ); dev->dev.power.power_state =PMSG_ON ; -usb_hcd_resume_root_hub (platform_get_drvdata (dev)); +ohci_finish_controller_resume (hcd);return 0 ; }
drivers/usb/host/ohci-pci.c +1 -42
56 lines not on this page · raw message
drivers/usb/host/ohci-pxa27x.c +1 -2
@@ -358,8 +358,7 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)return status; pdev->dev.power.power_state =PMSG_ON ; -usb_hcd_resume_root_hub (hcd); - +ohci_finish_controller_resume (hcd); return 0; }#endif
drivers/usb/host/ohci-sm501.c +1 -1
@@ -239,7 +239,7 @@ static int ohci_sm501_resume(struct platform_device *pdev)sm501_unit_power (dev->parent,SM501_GATE_USB_HOST ,1 ); dev->power.power_state =PMSG_ON ; -usb_hcd_resume_root_hub (platform_get_drvdata (pdev)); +ohci_finish_controller_resume (hcd); return 0; }#endif
drivers/usb/host/ohci-ssb.c +1 -0
@@ -224,6 +224,7 @@ static int ssb_ohci_resume(struct ssb_device *dev)ssb_device_enable (dev, ohcidev->enable_flags); +ohci_finish_controller_resume (hcd);return 0 ; }
drivers/usb/serial/airprime.c +1 -1
@@ -220,7 +220,7 @@ static void airprime_close(struct usb_serial_port *port, struct file * filp)mutex_lock (&port->serial->disc_mutex);if (!port->serial->disconnected)airprime_send_setup (port); -mutex_lock (&port->serial->disc_mutex); +mutex_unlock (&port->serial->disc_mutex);for (i =0 ; i <NUM_READ_URBS ; ++i) {usb_kill_urb (priv->read_urbp[i]);
include/asm-sparc/mman.h +2 -3
@@ -37,9 +37,8 @@#ifdef __KERNEL__#ifndef __ASSEMBLY__ -#define arch_mmap_check sparc_mmap_check -int sparc_mmap_check (unsigned long addr,unsigned long len, -unsigned long flags); +#define arch_mmap_check (addr,len,flags) sparc_mmap_check(addr,len) +int sparc_mmap_check (unsigned long addr,unsigned long len);#endif #endif
include/asm-sparc/psr.h +1 -0
@@ -25,6 +25,7 @@#define PSR_PIL 0x00000f00/* processor interrupt level */ #define PSR_EF 0x00001000/* enable floating point */ #define PSR_EC 0x00002000/* enable co-processor */ +#define PSR_SYSCALL 0x00004000/* inside of a syscall */ #define PSR_LE 0x00008000/* SuperSparcII little-endian */ #define PSR_ICC 0x00f00000/* integer condition codes */ #define PSR_C 0x00100000/* carry bit */
include/asm-sparc/ptrace.h +13 -0
@@ -10,6 +10,8 @@ #ifndef __ASSEMBLY__ +#include <linux/types.h> + struct pt_regs { unsigned long psr; unsigned long pc;
@@ -39,6 +41,16 @@ struct pt_regs {#define UREG_FP UREG_I6#define UREG_RETPC UREG_I7 +static inline bool pt_regs_is_syscall (struct pt_regs *regs) +{ +return (regs->psr &PSR_SYSCALL ); +} + +static inline bool pt_regs_clear_syscall (struct pt_regs *regs) +{ +return (regs->psr &= ~PSR_SYSCALL ); +} +/* A register window */ struct reg_window {unsigned long locals[8 ];
@@ -149,6 +161,7 @@ extern void show_regs(struct pt_regs *);#define SF_XXARG 0x5c/* Stuff for the ptrace system call */ +#define PTRACE_SPARC_DETACH 11#define PTRACE_GETREGS 12#define PTRACE_SETREGS 13#define PTRACE_GETFPREGS 14
include/asm-sparc/signal.h +1 -7
@@ -199,13 +199,7 @@ typedef struct sigaltstack { size_t ss_size; } stack_t; -struct sparc_deliver_cookie { -int restart_syscall; -unsigned long orig_i0; -}; - -struct pt_regs ; -extern void ptrace_signal_deliver (struct pt_regs *regs,void *cookie); +#define ptrace_signal_deliver (regs, cookie) do { } while (0)#endif /* !(__KERNEL__) */
include/asm-sparc64/mman.h +2 -3
@@ -37,9 +37,8 @@#ifdef __KERNEL__#ifndef __ASSEMBLY__ -#define arch_mmap_check sparc64_mmap_check -int sparc64_mmap_check (unsigned long addr,unsigned long len, -unsigned long flags); +#define arch_mmap_check (addr,len,flags) sparc64_mmap_check(addr,len) +int sparc64_mmap_check (unsigned long addr,unsigned long len);#endif #endif
include/asm-sparc64/psrcompat.h +2 -0
@@ -12,6 +12,7 @@#define PSR_PIL 0x00000f00/* processor interrupt level */ #define PSR_EF 0x00001000/* enable floating point */ #define PSR_EC 0x00002000/* enable co-processor */ +#define PSR_SYSCALL 0x00004000/* inside of a syscall */ #define PSR_LE 0x00008000/* SuperSparcII little-endian */ #define PSR_ICC 0x00f00000/* integer condition codes */ #define PSR_C 0x00100000/* carry bit */
@@ -30,6 +31,7 @@ static inline unsigned int tstate_to_psr(unsigned long tstate)PSR_S | ((tstate &TSTATE_ICC ) >>12 ) | ((tstate &TSTATE_XCC ) >>20 ) | + ((tstate &TSTATE_SYSCALL ) ?PSR_SYSCALL :0 ) | PSR_V8PLUS); }
include/asm-sparc64/pstate.h +1 -0
@@ -62,6 +62,7 @@#define TSTATE_PRIV _AC(0x0000000000000400,UL)/* Privilege. */ #define TSTATE_IE _AC(0x0000000000000200,UL)/* Interrupt Enable. */ #define TSTATE_AG _AC(0x0000000000000100,UL)/* Alternate Globals.*/ +#define TSTATE_SYSCALL _AC(0x0000000000000020,UL)/* in syscall trap */ #define TSTATE_CWP _AC(0x000000000000001f,UL)/* Curr Win-Pointer. */ /* Floating-Point Registers State Register.
include/asm-sparc64/ptrace.h +13 -0
@@ -10,6 +10,8 @@ #ifndef __ASSEMBLY__ +#include <linux/types.h> + struct pt_regs { unsigned long u_regs[16]; /* globals and ins */ unsigned long tstate;
@@ -27,6 +29,16 @@ struct pt_regs32 {unsigned int u_regs[16 ];/* globals and ins */ }; +static inline bool pt_regs_is_syscall (struct pt_regs *regs) +{ +return (regs->tstate &TSTATE_SYSCALL ); +} + +static inline bool pt_regs_clear_syscall (struct pt_regs *regs) +{ +return (regs->tstate &= ~TSTATE_SYSCALL ); +} +#define UREG_G0 0#define UREG_G1 1#define UREG_G2 2
@@ -263,6 +275,7 @@ extern void __show_regs(struct pt_regs *);#define SF_XXARG 0x5c/* Stuff for the ptrace system call */ +#define PTRACE_SPARC_DETACH 11#define PTRACE_GETREGS 12#define PTRACE_SETREGS 13#define PTRACE_GETFPREGS 14
include/asm-sparc64/signal.h +1 -7
@@ -186,13 +186,7 @@ struct k_sigaction { void __user *ka_restorer; }; -struct signal_deliver_cookie { -int restart_syscall; -unsigned long orig_i0; -}; - -struct pt_regs ; -extern void ptrace_signal_deliver (struct pt_regs *regs,void *cookie); +#define ptrace_signal_deliver (regs, cookie) do { } while (0)#endif /* !(__KERNEL__) */
include/asm-sparc64/ttable.h +4 -3
@@ -91,13 +91,14 @@ clr %l6;#define SYSCALL_TRAP (routine, systbl) \ + rdpr %pil, %g2; \ + mov TSTATE_SYSCALL, %g3; \ sethi %hi(109f), %g7; \ - ba,pt %xcc, etrap; \ + ba,pt %xcc, etrap_syscall; \ 109: or %g7, %lo(109b), %g7; \ sethi %hi(systbl), %l7; \ ba,pt %xcc, routine; \ - or %l7, %lo(systbl), %l7; \ - nop; nop; + or %l7, %lo(systbl), %l7;#define INDIRECT_SOLARIS_SYSCALL (num) \ sethi %hi(109f), %g7; \
include/asm-x86/topology.h +10 -8
@@ -25,6 +25,16 @@#ifndef _ASM_X86_TOPOLOGY_H#define _ASM_X86_TOPOLOGY_H +#ifdef CONFIG_X86_32 +# ifdef CONFIG_X86_HT +# define ENABLE_TOPO_DEFINES +# endif +#else +# ifdef CONFIG_SMP +# define ENABLE_TOPO_DEFINES +# endif +#endif +#ifdef CONFIG_NUMA #include <linux/cpumask.h> #include <asm/mpspec.h>
@@ -112,10 +122,6 @@ extern unsigned long node_end_pfn[];extern unsigned long node_remap_size[];#define node_has_online_mem (nid) (node_start_pfn[nid] != node_end_pfn[nid]) -# ifdef CONFIG_X86_HT -# define ENABLE_TOPO_DEFINES -# endif -# define SD_CACHE_NICE_TRIES 1# define SD_IDLE_IDX 1# define SD_NEWIDLE_IDX 2
@@ -123,10 +129,6 @@ extern unsigned long node_remap_size[];#else -# ifdef CONFIG_SMP -# define ENABLE_TOPO_DEFINES -# endif -# define SD_CACHE_NICE_TRIES 2# define SD_IDLE_IDX 2# define SD_NEWIDLE_IDX 0
include/net/ip_vs.h +2 -1
@@ -405,7 +405,8 @@ struct sk_buff;struct ip_vs_protocol {struct ip_vs_protocol *next;char *name; -__u16 protocol; +u16 protocol; +u16 num_states;int dont_defrag;atomic_t appcnt;/* counter of proto app incs */ int *timeout_table;/* protocol timeout table */
include/net/netfilter/nf_conntrack_tuple.h +0 -10
@@ -101,16 +101,6 @@ struct nf_conntrack_tuple_mask } src; }; -/* This is optimized opposed to a memset of the whole structure. Everything we -* really care about is the source/destination unions */ -#define NF_CT_TUPLE_U_BLANK (tuple) \ - do { \ - (tuple)->src.u.all = 0; \ - (tuple)->dst.u.all = 0; \ - memset(&(tuple)->src.u3, 0, sizeof((tuple)->src.u3)); \ - memset(&(tuple)->dst.u3, 0, sizeof((tuple)->dst.u3)); \ - } while (0) -#ifdef __KERNEL__#define NF_CT_DUMP_TUPLE (tp) \
net/can/af_can.c +12 -4
@@ -208,6 +208,7 @@ static int can_create(struct net *net, struct socket *sock, int protocol)*/ int can_send (struct sk_buff *skb,int loop) { +struct sk_buff *newskb =NULL ;int err;if (skb->dev->type !=ARPHRD_CAN ) {
@@ -244,8 +245,7 @@ int can_send(struct sk_buff *skb, int loop)* If the interface is not capable to do loopback * itself, we do it here. */ -struct sk_buff *newskb =skb_clone (skb,GFP_ATOMIC ); - + newskb =skb_clone (skb,GFP_ATOMIC );if (!newskb) {kfree_skb (skb);return -ENOMEM ;
@@ -254,7 +254,6 @@ int can_send(struct sk_buff *skb, int loop) newskb->sk = skb->sk; newskb->ip_summed =CHECKSUM_UNNECESSARY ; newskb->pkt_type =PACKET_BROADCAST ; -netif_rx (newskb); } }else {/* indication for the CAN driver: no loopback required */
@@ -266,11 +265,20 @@ int can_send(struct sk_buff *skb, int loop)if (err >0 ) err =net_xmit_errno (err); +if (err) { +if (newskb) +kfree_skb (newskb); +return err; + } + +if (newskb) +netif_rx (newskb); +/* update statistics */ can_stats.tx_frames++; can_stats.tx_frames_delta++; -return err; +return 0 ; }EXPORT_SYMBOL (can_send);
net/dccp/feat.c +1 -1
@@ -32,7 +32,7 @@ int dccp_feat_change(struct dccp_minisock *dmsk, u8 type, u8 feature,if (len >3 ) {DCCP_WARN ("invalid length %d\n" , len); -return 1 ; +return -EINVAL ; }/* XXX add further sanity checks */
net/ipv4/ipvs/ip_vs_proto.c +1 -1
@@ -148,7 +148,7 @@ const char * ip_vs_state_name(__u16 proto, int state)struct ip_vs_protocol *pp =ip_vs_proto_get (proto);if (pp ==NULL || pp->state_name ==NULL ) -return "ERR!" ; +return (IPPROTO_IP == proto) ?"NONE" :"ERR!" ;return pp->state_name (state); }
net/ipv4/ipvs/ip_vs_proto_ah.c +1 -0
@@ -160,6 +160,7 @@ static void ah_exit(struct ip_vs_protocol *pp)struct ip_vs_protocol ip_vs_protocol_ah = { .name ="AH" , .protocol =IPPROTO_AH , + .num_states =1 , .dont_defrag =1 , .init = ah_init, .exit = ah_exit,
net/ipv4/ipvs/ip_vs_proto_esp.c +1 -0
@@ -159,6 +159,7 @@ static void esp_exit(struct ip_vs_protocol *pp)struct ip_vs_protocol ip_vs_protocol_esp = { .name ="ESP" , .protocol =IPPROTO_ESP , + .num_states =1 , .dont_defrag =1 , .init = esp_init, .exit = esp_exit,
net/ipv4/ipvs/ip_vs_proto_tcp.c +1 -0
@@ -594,6 +594,7 @@ static void ip_vs_tcp_exit(struct ip_vs_protocol *pp)struct ip_vs_protocol ip_vs_protocol_tcp = { .name ="TCP" , .protocol =IPPROTO_TCP , + .num_states =IP_VS_TCP_S_LAST , .dont_defrag =0 , .appcnt =ATOMIC_INIT (0 ), .init = ip_vs_tcp_init,
net/ipv4/ipvs/ip_vs_proto_udp.c +1 -0
@@ -409,6 +409,7 @@ static void udp_exit(struct ip_vs_protocol *pp)struct ip_vs_protocol ip_vs_protocol_udp = { .name ="UDP" , .protocol =IPPROTO_UDP , + .num_states =IP_VS_UDP_S_LAST , .dont_defrag =0 , .init = udp_init, .exit = udp_exit,
net/ipv4/ipvs/ip_vs_sync.c +59 -21
116 lines not on this page · raw message
net/ipv4/netfilter/ip_queue.c +2 -3
@@ -296,9 +296,8 @@ ipq_mangle_ipv4(ipq_verdict_msg_t *v, struct nf_queue_entry *e)if (v->data_len >0xFFFF )return -EINVAL ;if (diff >skb_tailroom (e->skb)) { - nskb =skb_copy_expand (e->skb,0 , - diff -skb_tailroom (e->skb), -GFP_ATOMIC ); + nskb =skb_copy_expand (e->skb,skb_headroom (e->skb), + diff,GFP_ATOMIC );if (!nskb) {printk (KERN_WARNING "ip_queue: error " "in mangle, dropping packet\n" );
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +1 -1
@@ -305,7 +305,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len)const struct nf_conntrack_tuple_hash *h;struct nf_conntrack_tuple tuple; -NF_CT_TUPLE_U_BLANK (&tuple); +memset (&tuple,0 ,sizeof (tuple)); tuple.src.u3.ip = inet->rcv_saddr; tuple.src.u.tcp.port = inet->sport; tuple.dst.u3.ip = inet->daddr;
net/ipv6/netfilter/ip6_queue.c +2 -3
@@ -298,9 +298,8 @@ ipq_mangle_ipv6(ipq_verdict_msg_t *v, struct nf_queue_entry *e)if (v->data_len >0xFFFF )return -EINVAL ;if (diff >skb_tailroom (e->skb)) { - nskb =skb_copy_expand (e->skb,0 , - diff -skb_tailroom (e->skb), -GFP_ATOMIC ); + nskb =skb_copy_expand (e->skb,skb_headroom (e->skb), + diff,GFP_ATOMIC );if (!nskb) {printk (KERN_WARNING "ip6_queue: OOM " "in mangle, dropping packet\n" );
net/netfilter/nf_conntrack_core.c +2 -2
@@ -104,7 +104,7 @@ nf_ct_get_tuple(const struct sk_buff *skb,const struct nf_conntrack_l3proto *l3proto, const struct nf_conntrack_l4proto *l4proto) { -NF_CT_TUPLE_U_BLANK (tuple ); + memset(tuple, 0, sizeof(*tuple)); tuple->src.l3num = l3num;if (l3proto->pkt_to_tuple (skb, nhoff, tuple) ==0 )
@@ -153,7 +153,7 @@ nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,const struct nf_conntrack_l3proto *l3proto, const struct nf_conntrack_l4proto *l4proto) { -NF_CT_TUPLE_U_BLANK (inverse ); + memset(inverse, 0, sizeof(*inverse)); inverse->src.l3num = orig->src.l3num;if (l3proto->invert_tuple (inverse, orig) ==0 )
net/netfilter/nfnetlink_queue.c +2 -3
@@ -454,9 +454,8 @@ nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e)if (data_len >0xFFFF )return -EINVAL ;if (diff >skb_tailroom (e->skb)) { - nskb =skb_copy_expand (e->skb,0 , - diff -skb_tailroom (e->skb), -GFP_ATOMIC ); + nskb =skb_copy_expand (e->skb,skb_headroom (e->skb), + diff,GFP_ATOMIC );if (!nskb) {printk (KERN_WARNING "nf_queue: OOM " "in mangle, dropping packet\n" );
net/sched/sch_htb.c +6 -2
@@ -1197,12 +1197,16 @@ static inline int htb_parent_last_child(struct htb_class *cl)return 1 ; } -static void htb_parent_to_leaf (struct htb_class *cl,struct Qdisc *new_q) +static void htb_parent_to_leaf (struct htb_sched *q,struct htb_class *cl, +struct Qdisc *new_q) {struct htb_class *parent = cl->parent;BUG_TRAP (!cl->level && cl->un.leaf.q && !cl->prio_activity); +if (parent->cmode !=HTB_CAN_SEND ) +htb_safe_rb_erase (&parent->pq_node, q->wait_pq + parent->level); + parent->level =0 ;memset (&parent->un.inner,0 ,sizeof (parent->un.inner));INIT_LIST_HEAD (&parent->un.leaf.drop_list);
@@ -1300,7 +1304,7 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg)htb_deactivate (q, cl);if (last_child) -htb_parent_to_leaf (cl, new_q); +htb_parent_to_leaf (q, cl, new_q);if (--cl->refcnt ==0 )htb_destroy_class (sch, cl);
net/xfrm/xfrm_state.c +1 -1
@@ -2093,7 +2093,7 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family, iph6 =ipv6_hdr (skb); audit_log_format(audit_buf, " src=" NIP6_FMT " dst=" NIP6_FMT - " flowlbl=0x%x%x%x", + " flowlbl=0x%x%02x%02x", NIP6(iph6->saddr), NIP6(iph6->daddr), iph6->flow_lbl[0] & 0x0f,
Quoted 4 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.25.4 kernel.
It contains a bunch of bug fixes, and one security update, so all users of the 2.6.25 series are encouraged to upgrade.
Build errors on i386 and x86_64 allyesconfig:
drivers/usb/host/ohci-sm501.c:242: error: 'hcd' undeclared (first use in this function) drivers/usb/host/ohci-sm501.c:242: error: (Each undeclared identifier is reported only once drivers/usb/host/ohci-sm501.c:242: error: for each function it appears in.) make[3]: *** [drivers/usb/host/ohci-hcd.o] Error 1
Signature · 1 line
~Randy
Quoted 7 lines · Randy.Dunlap
Quoted 4 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.25.4 kernel.
It contains a bunch of bug fixes, and one security update, so all users of the 2.6.25 series are encouraged to upgrade.
Quoted 6 lines
Build errors on i386 and
x86_64allyesconfig:
drivers/usb/host/ohci-sm501.c:242: error: 'hcd' undeclared (first use in this function)drivers/usb/host/ohci-sm501.c:242: error: (Each undeclared identifier is reported only oncedrivers/usb/host/ohci-sm501.c:242: error: for each function it appears in.) make[3]: *** [drivers/usb/host/ohci-hcd.o] Error 1
Alan, this is due to your OHCI patch :(
Care to send me a fix for this?
thanks,
greg k-h
Quoted 10 lines · On Thu, 15 May 2008 10:25:18 -0700 Greg KH <[email protected]> wrote:
Quoted 9 lines · Randy.Dunlap
Quoted 4 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.25.4 kernel.
It contains a bunch of bug fixes, and one security update, so all users of the 2.6.25 series are encouraged to upgrade.
Build errors on i386 and
x86_64allyesconfig:
Quoted 9 lines
Quoted 4 lines
drivers/usb/host/ohci-sm501.c:242: error: 'hcd' undeclared (first use in this function)drivers/usb/host/ohci-sm501.c:242: error: (Each undeclared identifier is reported only oncedrivers/usb/host/ohci-sm501.c:242: error: for each function it appears in.) make[3]: *** [drivers/usb/host/ohci-hcd.o] Error 1Alan, this is due to your OHCI patch :(
Care to send me a fix for this?
umm, I was just berated for repeatedly sending the below "unneeded" patch to you:
From: Reynes Philippe <[email protected]>
The function ohci_sm501_resume in drivers/usb/host/ohci-hcd.c use the variable hcd, but this variable is undeclared in this function, so the compilation fails with this error :
CC drivers/usb/host/ohci-hcd.o
In file included from drivers/usb/host/ohci-hcd.c:1056:drivers/usb/host/ohci-sm501.c: In function `ohci_sm501_resume':drivers/usb/host/ohci-sm501.c:241: erreur: `hcd' undeclared (first use in this function) drivers/usb/host/ohci-sm501.c:241: erreur: (Each undeclared identifier is reported only once drivers/usb/host/ohci-sm501.c:241: erreur: for each function it appears in.)
---
drivers/usb/host/ohci-sm501.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ohci-sm501.c renamed from drivers/usb/host/ohci-sm501.c~fix-gregkh-usb-usb-ohci-host-controller-resumes-leave-root-hub-suspended +1 -1
@@ -238,7 +238,7 @@ static int ohci_sm501_resume(struct plat ohci->next_statechange = jiffies;sm501_unit_power (dev->parent,SM501_GATE_USB_HOST ,1 ); -ohci_finish_controller_resume (hcd); +ohci_finish_controller_resume (ohci_to_hcd (ohci)); return 0; }#else
_
Alan Stern
maintainerQuoted 10 lines · Greg KH
Quoted 9 lines · Randy.Dunlap
Quoted 4 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.25.4 kernel.
It contains a bunch of bug fixes, and one security update, so all users of the 2.6.25 series are encouraged to upgrade.
Build errors on i386 and
x86_64allyesconfig:
Quoted 8 lines
Quoted 4 lines
drivers/usb/host/ohci-sm501.c:242: error: 'hcd' undeclared (first use in this function)drivers/usb/host/ohci-sm501.c:242: error: (Each undeclared identifier is reported only oncedrivers/usb/host/ohci-sm501.c:242: error: for each function it appears in.) make[3]: *** [drivers/usb/host/ohci-hcd.o] Error 1Alan, this is due to your OHCI patch :(
Care to send me a fix for this?
Urk. When I built the .stable version of that patch, I forgot that the original version had this bug.
The fix for the original patch already exists here:
http://marc.info/?l=linux-usb&m=120818727516898&w=2
I think it will apply to the stable tree with no trouble. Sorry for the inconvenience.
Alan Stern
Quoted 4 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.25.4 kernel.
It contains a bunch of bug fixes, and one security update, so all users of the 2.6.25 series are encouraged to upgrade.
Could you tell me which commit contains the "security update" ? I could not find it by reading commitlog.
Is it
"{nfnetlink, ip, ip6}_queue: fix skb_over_panic when enlarging packets" or
"nf_conntrack: padding breaks conntrack hash on ARM"
or
"sparc: Fix SA_ONSTACK signal handling."
or yet other one?
---
Atsushi Nemoto
Quoted 9 lines · Atsushi Nemoto
Quoted 4 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.25.4 kernel.
It contains a bunch of bug fixes, and one security update, so all users of the 2.6.25 series are encouraged to upgrade.
Could you tell me which commit contains the "security update" ? I could not find it by reading commitlog.
Quoted 6 lines
Is it
"{nfnetlink, ip, ip6}_queue: fixskb_over_panicwhen enlarging packets" or
"nf_conntrack: padding breaks conntrack hash on ARM"
or
"sparc: FixSA_ONSTACKsignal handling."
This last one is the one that I was referring to.
thanks,
greg k-h
Quoted 4 lines · Greg KH
Quoted 2 lines
or
"sparc: FixSA_ONSTACKsignal handling."This last one is the one that I was referring to.
Thank you, I see.
---
Atsushi Nemoto