Linux 2.6.31.4
Subsystems (30)
I'm announcing the release of the 2.6.31.4 kernel. All users of the 2.6.31 kernel series are very strongly encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.31.3 and 2.6.31.4
The updated 2.6.31.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.31.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.31.y.git;a=summarythanks,
greg k-h
------------
Documentation/networking/timestamping/timestamping.c | 2 Makefile | 2 arch/x86/ia32/ia32entry.S | 36 ++++++--- arch/x86/include/asm/checksum_32.h | 3 arch/x86/kernel/acpi/cstate.c | 2 arch/x86/kernel/i8253.c | 27 +++++-- arch/x86/kvm/lapic.c | 2 arch/x86/kvm/svm.c | 25 +++++- arch/x86/kvm/vmx.c | 2 arch/x86/kvm/x86.c | 2 drivers/acpi/osl.c | 8 +- drivers/ata/libata-eh.c | 50 ++++++++----- drivers/char/tty_ldisc.c | 7 - drivers/ide/sis5513.c | 10 +- drivers/net/appletalk/ipddp.c | 3 drivers/net/iseries_veth.c | 2 drivers/net/sky2.c | 4 - drivers/net/tun.c | 4 - drivers/net/usb/smsc95xx.c | 2 drivers/net/usb/usbnet.c | 2 fs/ecryptfs/main.c | 7 + fs/namei.c | 6 + include/linux/ftrace.h | 2 include/linux/usb/usbnet.h | 1 kernel/exit.c | 2 kernel/fork.c | 10 ++ kernel/futex.c | 3 kernel/time/tick-sched.c | 9 +- kernel/trace/ftrace.c | 23 +----- mm/swap_state.c | 70 ++++++++++++------- net/appletalk/aarp.c | 16 ++-- net/appletalk/ddp.c | 58 ++++++++------- net/ax25/af_ax25.c | 6 - net/core/dev.c | 6 - net/core/sock.c | 19 +++-- net/ipv4/tcp_minisocks.c | 2 net/ipv6/sit.c | 2 net/unix/af_unix.c | 5 + sound/pci/hda/patch_realtek.c | 1 sound/pci/via82xx.c | 27 ++++--- sound/soc/codecs/wm8350.c | 4 - 41 files changed, 294 insertions(+), 180 deletions(-)
Arnaldo Carvalho de Melo (1):
appletalk: Fix skb leak when ipddp interface is not loaded
Aurelien Jarno (1):
KVM: fix LAPIC timer period overflow
Avi Kivity (1):
KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID
Bartlomiej Zolnierkiewicz (1):
sis5513: fix PIO setup for ATAPI devices
Clemens Ladisch (1):
sound: via82xx: move DXS volume controls to PCM interface
Daisuke Nishimura (1):
mm: add_to_swap_cache() must not sleep
Darren Hart (1):
futex: fix requeue_pi key imbalance
Eero Nurkkala (1):
NOHZ: update idle state also when NOHZ is inactive
Eric Dumazet (3):
net: restore tx timestamping for accelerated vlans
net: Fix sock_wfree() race
ax25: Fix SIOCAX25GETINFO ioctl
Greg Kroah-Hartman (1):
Linux 2.6.31.4
Jan Beulich (1):
x86: Don't leak 64-bit kernel register values to 32-bit processes
Jarek Poplawski (1):
ax25: Fix possible oops in ax25_make_new
Jean Delvare (2):
net: Fix wrong sizeof
ACPI: Clarify resource conflict message
Joerg Roedel (2):
KVM: SVM: Fix tsc offset adjustment when running nested
KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly
John Stultz (1):
PIT fixes to unbreak suspend/resume (bug #14222)
Kusanagi Kouichi (1):
tun: Return -EINVAL if neither IFF_TUN nor IFF_TAP is set.
Linus Torvalds (1):
tty: Avoid dropping ldisc_mutex over hangup tty re-initialization
Manoj Iyer (1):
ALSA: hda - Added quirk to enable sound on Toshiba NB200
Marcelo Tosatti (1):
KVM: VMX: flush TLB with INVEPT on cpu migration
Mark Brown (1):
ASoC: WM8350 capture PGA mutes are inverted
Mike McCormack (1):
sky2: Set SKY2_HW_RAM_BUFFER in sky2_init
Miklos Szeredi (1):
net: unix: fix sending fds in multiple buffers
Mimi Zohar (2):
ima: ecryptfs fix imbalance message
IMA: open new file for read
Peter Zijlstra (1):
futex: Nullify robust lists after cleanup
Robert Varga (1):
tcp: fix CONFIG_TCP_MD5SIG + CONFIG_PREEMPT timer BUG()
Samuel Thibault (1):
x86: fix csum_ipv6_magic asm memory clobber
Sascha Hlusiak (1):
sit: fix off-by-one in ipip6_tunnel_get_prl
Steve Glendinning (1):
smsc95xx: fix transmission where ZLP is expected
Steven Rostedt (1):
ftrace: check for failure for all conversions
Tejun Heo (1):
libata: fix incorrect link online check during probe
Thomas Gleixner (2):
futex: Move exit_pi_state() call to release_mm()
futex: Fix locking imbalance
Zhao Yakui (1):
ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
[email protected] (1):
tracing: correct module boundaries for ftrace_release
Documentation/networking/timestamping/timestamping.c +1 -1
@@ -381,7 +381,7 @@ int main(int argc, char **argv)memset (&hwtstamp,0 ,sizeof (hwtstamp));strncpy (hwtstamp.ifr_name, interface,sizeof (hwtstamp.ifr_name)); hwtstamp.ifr_data = (void *)&hwconfig; -memset (&hwconfig,0 ,sizeof (&hwconfig)); +memset (&hwconfig,0 ,sizeof (hwconfig)); hwconfig.tx_type = (so_timestamping_flags &SOF_TIMESTAMPING_TX_HARDWARE ) ?HWTSTAMP_TX_ON :HWTSTAMP_TX_OFF ;
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 31 -EXTRAVERSION = .3 +EXTRAVERSION = .4 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/x86/ia32/ia32entry.S +23 -13
@@ -21,8 +21,8 @@ #define __AUDIT_ARCH_LE 0x40000000 #ifndef CONFIG_AUDITSYSCALL -#define sysexit_audit int_ret_from_sys_call -#define sysretl_audit int_ret_from_sys_call +#define sysexit_audit ia32_ret_from_sys_call +#define sysretl_audit ia32_ret_from_sys_call #endif #define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
@@ -39,12 +39,12 @@ .endm /* clobbers %eax */ - .macro CLEAR_RREGS _r9=rax + .macro CLEAR_RREGS offset=0, _r9=rax xorl %eax,%eax - movq %rax,R11(%rsp) - movq %rax,R10(%rsp) - movq %\_r9,R9(%rsp) - movq %rax,R8(%rsp) + movq %rax,\offset+R11(%rsp) + movq %rax,\offset+R10(%rsp) + movq %\_r9,\offset+R9(%rsp) + movq %rax,\offset+R8(%rsp) .endm /*
@@ -172,6 +172,10 @@ sysexit_from_sys_call: movl RIP-R11(%rsp),%edx /* User %eip */ CFI_REGISTER rip,rdx RESTORE_ARGS 1,24,1,1,1,1 + xorq %r8,%r8 + xorq %r9,%r9 + xorq %r10,%r10 + xorq %r11,%r11 popfq CFI_ADJUST_CFA_OFFSET -8 /*CFI_RESTORE rflags*/
@@ -202,7 +206,7 @@ sysexit_from_sys_call: .macro auditsys_exit exit,ebpsave=RBP testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10) - jnz int_ret_from_sys_call + jnz ia32_ret_from_sys_call TRACE_IRQS_ON sti movl %eax,%esi /* second arg, syscall return value */
@@ -218,8 +222,9 @@ sysexit_from_sys_call: cli TRACE_IRQS_OFF testl %edi,TI_flags(%r10) - jnz int_with_check - jmp \exit + jz \exit + CLEAR_RREGS -ARGOFFSET + jmp int_with_check .endm sysenter_auditsys:
@@ -329,6 +334,9 @@ sysretl_from_sys_call: CFI_REGISTER rip,rcx movl EFLAGS-ARGOFFSET(%rsp),%r11d /*CFI_REGISTER rflags,r11*/ + xorq %r10,%r10 + xorq %r9,%r9 + xorq %r8,%r8 TRACE_IRQS_ON movl RSP-ARGOFFSET(%rsp),%esp CFI_RESTORE rsp
@@ -353,7 +361,7 @@ cstar_tracesys: #endif xchgl %r9d,%ebp SAVE_REST - CLEAR_RREGS r9 + CLEAR_RREGS 0, r9 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter
@@ -425,6 +433,8 @@ ia32_do_call: call *ia32_sys_call_table(,%rax,8) # xxx: rip relative ia32_sysret: movq %rax,RAX-ARGOFFSET(%rsp) +ia32_ret_from_sys_call: + CLEAR_RREGS -ARGOFFSET jmp int_ret_from_sys_call ia32_tracesys:
@@ -442,8 +452,8 @@ END(ia32_syscall) ia32_badsys: movq $0,ORIG_RAX-ARGOFFSET(%rsp) - movq $-ENOSYS,RAX-ARGOFFSET(%rsp) - jmp int_ret_from_sys_call + movq $-ENOSYS,%rax + jmp ia32_sysret quiet_ni_syscall: movq $-ENOSYS,%rax
arch/x86/include/asm/checksum_32.h +2 -1
@@ -161,7 +161,8 @@ static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, "adcl $0, %0 ;\n" : "=&r" (sum) : "r" (saddr), "r" (daddr), - "r" (htonl(len)), "r" (htonl(proto)), "0" (sum)); + "r" (htonl(len)), "r" (htonl(proto)), "0" (sum) + : "memory");return csum_fold (sum); }
arch/x86/kernel/acpi/cstate.c +1 -1
@@ -48,7 +48,7 @@ void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,* P4, Core and beyond CPUs */ if (c->x86_vendor ==X86_VENDOR_INTEL && - (c->x86 >0x6 || (c->x86 ==6 && c->x86_model >=14 ))) + (c->x86 >0xf || (c->x86 ==6 && c->x86_model >=14 ))) flags->bm_control =0 ; }EXPORT_SYMBOL (acpi_processor_power_init_bm_check);
arch/x86/kernel/i8253.c +20 -7
@@ -21,8 +21,10 @@ EXPORT_SYMBOL(i8253_lock);#ifdef CONFIG_X86_32 static void pit_disable_clocksource (void ); +static void pit_enable_clocksource (void );#else static inline void pit_disable_clocksource (void ) { } +static inline void pit_enable_clocksource (void ) { }#endif /*
@@ -67,7 +69,7 @@ static void init_pit_timer(enum clock_event_mode mode,break ;case CLOCK_EVT_MODE_RESUME : -/* Nothing to do here */ +pit_enable_clocksource ();break ; }spin_unlock (&i8253_lock);
@@ -200,19 +202,27 @@ static struct clocksource pit_cs = { .shift = 20, }; +int pit_cs_registered;static void pit_disable_clocksource (void ) { -/* -* Use mult to check whether it is registered or not -*/ -if (pit_cs.mult) { +if (pit_cs_registered) {clocksource_unregister (&pit_cs); - pit_cs.mult =0 ; + pit_cs_registered =0 ; + } +} + +static void pit_enable_clocksource (void ) +{ +if (!pit_cs_registered && !clocksource_register (&pit_cs)) { + pit_cs_registered =1 ; } } + +static int __init init_pit_clocksource (void ) { +int ret;/* * Several reasons not to register PIT as a clocksource: *
@@ -226,7 +236,10 @@ static int __init init_pit_clocksource(void) pit_cs.mult =clocksource_hz2mult (CLOCK_TICK_RATE , pit_cs.shift); -return clocksource_register (&pit_cs); + ret =clocksource_register (&pit_cs); +if (!ret) + pit_cs_registered =1 ; +return ret; }arch_initcall (init_pit_clocksource);
arch/x86/kvm/lapic.c +1 -1
@@ -567,7 +567,7 @@ static void start_apic_timer(struct kvm_lapic *apic) {ktime_t now = apic->lapic_timer.timer.base->get_time (); - apic->lapic_timer.period =apic_get_reg (apic,APIC_TMICT ) * + apic->lapic_timer.period = (u64 )apic_get_reg (apic,APIC_TMICT ) *APIC_BUS_CYCLE_NS * apic->divide_count;atomic_set (&apic->lapic_timer.pending,0 );
arch/x86/kvm/svm.c +19 -6
@@ -709,6 +709,8 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)rdtscll (tsc_this); delta = vcpu->arch.host_tsc - tsc_this; svm->vmcb->control.tsc_offset += delta; +if (is_nested (svm)) + svm->hsave->control.tsc_offset += delta; vcpu->cpu = cpu;kvm_migrate_timers (vcpu); svm->asid_generation =0 ;
@@ -1954,10 +1956,14 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)switch (ecx) {case MSR_IA32_TIME_STAMP_COUNTER : { -u64 tsc; +u64 tsc_offset; -rdtscll (tsc); - *data = svm->vmcb->control.tsc_offset + tsc; +if (is_nested (svm)) + tsc_offset = svm->hsave->control.tsc_offset; +else + tsc_offset = svm->vmcb->control.tsc_offset; + + *data = tsc_offset +native_read_tsc ();break ; }case MSR_K6_STAR :
@@ -2044,10 +2050,17 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)switch (ecx) {case MSR_IA32_TIME_STAMP_COUNTER : { -u64 tsc; +u64 tsc_offset = data -native_read_tsc (); +u64 g_tsc_offset =0 ; + +if (is_nested (svm)) { + g_tsc_offset = svm->vmcb->control.tsc_offset - + svm->hsave->control.tsc_offset; + svm->hsave->control.tsc_offset = tsc_offset; + } + + svm->vmcb->control.tsc_offset = tsc_offset + g_tsc_offset; -rdtscll (tsc); - svm->vmcb->control.tsc_offset = data - tsc;break ; }case MSR_K6_STAR :
arch/x86/kvm/vmx.c +1 -1
@@ -661,7 +661,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)if (vcpu->cpu != cpu) {vcpu_clear (vmx);kvm_migrate_timers (vcpu); -vpid_sync_vcpu_all (vmx); +set_bit (KVM_REQ_TLB_FLUSH , &vcpu->requests);local_irq_disable ();list_add (&vmx->local_vcpus_link, &per_cpu (vcpus_on_cpu, cpu));
arch/x86/kvm/x86.c +2 -0
@@ -1429,6 +1429,8 @@ static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,if (cpuid->nent <1 ) goto out; +if (cpuid->nent >KVM_MAX_CPUID_ENTRIES ) + cpuid->nent =KVM_MAX_CPUID_ENTRIES ; r = -ENOMEM ; cpuid_entries =vmalloc (sizeof (struct kvm_cpuid_entry2 ) * cpuid->nent);if (!cpuid_entries)
drivers/acpi/osl.c +7 -1
@@ -1182,7 +1182,13 @@ int acpi_check_resource_conflict(struct resource *res) res_list_elem->name, (long long ) res_list_elem->start, (long long) res_list_elem->end); -printk (KERN_INFO "ACPI: Device needs an ACPI driver\n" ); +if (acpi_enforce_resources ==ENFORCE_RESOURCES_LAX ) +printk (KERN_NOTICE "ACPI: This conflict may" +" cause random problems and system" +" instability\n" ); +printk (KERN_INFO "ACPI: If an ACPI driver is available" +" for this device, you should use it instead of" +" the native driver\n" ); }if (acpi_enforce_resources ==ENFORCE_RESOURCES_STRICT )return -EBUSY ;
drivers/ata/libata-eh.c +32 -18
80 lines not on this page · raw message
drivers/char/tty_ldisc.c +2 -5
@@ -516,7 +516,7 @@ static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)static int tty_ldisc_halt (struct tty_struct *tty) {clear_bit (TTY_LDISC , &tty->flags); -return cancel_delayed_work (&tty->buf.work); +return cancel_delayed_work_sync (&tty->buf.work); }/**
@@ -754,12 +754,9 @@ void tty_ldisc_hangup(struct tty_struct *tty)* N_TTY. */ if (tty->driver->flags &TTY_DRIVER_RESET_TERMIOS ) { -/* Make sure the old ldisc is quiescent */ -tty_ldisc_halt (tty); -flush_scheduled_work (); -/* Avoid racing set_ldisc or tty_ldisc_release */ mutex_lock (&tty->ldisc_mutex); +tty_ldisc_halt (tty);if (tty->ldisc) {/* Not yet closed */ /* Switch back to N_TTY */ tty_ldisc_reinit (tty);
drivers/ide/sis5513.c +6 -4
@@ -2,7 +2,7 @@* Copyright (C) 1999-2000 Andre Hedrick <[email protected]> * Copyright (C) 2002 Lionel Bouton <[email protected]>, Maintainer * Copyright (C) 2003 Vojtech Pavlik <[email protected]> -* Copyright (C) 2007 Bartlomiej Zolnierkiewicz +* Copyright (C) 2007-2009 Bartlomiej Zolnierkiewicz * * May be copied or modified under the terms of the GNU General Public License *
@@ -281,11 +281,13 @@ static void config_drive_art_rwp(ide_drive_t *drive)pci_read_config_byte (dev,0x4b , ®4bh); + rw_prefetch = reg4bh & ~(0x11 << drive->dn); +if (drive->media == ide_disk) - rw_prefetch =0x11 << drive->dn; + rw_prefetch |=0x11 << drive->dn; -if ((reg4bh & (0x11 << drive->dn)) != rw_prefetch) -pci_write_config_byte (dev,0x4b , reg4bh|rw_prefetch); +if (reg4bh != rw_prefetch) +pci_write_config_byte (dev,0x4b , rw_prefetch); }static void sis_set_pio_mode (ide_drive_t *drive,const u8 pio)
drivers/net/appletalk/ipddp.c +1 -2
@@ -176,8 +176,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; -if (aarp_send_ddp (rt->dev, skb, &rt->at,NULL ) <0 ) -dev_kfree_skb (skb); +aarp_send_ddp (rt->dev, skb, &rt->at,NULL );spin_unlock (&ipddp_route_lock);
drivers/net/iseries_veth.c +1 -1
@@ -495,7 +495,7 @@ static void veth_take_cap_ack(struct veth_lpar_connection *cnx, cnx->remote_lp); }else {memcpy (&cnx->cap_ack_event, event, -sizeof (&cnx->cap_ack_event)); +sizeof (cnx->cap_ack_event)); cnx->state |=VETH_STATE_GOTCAPACK ;veth_kick_statemachine (cnx); }
drivers/net/sky2.c +3 -1
@@ -1455,7 +1455,6 @@ static int sky2_up(struct net_device *dev)if (ramsize >0 ) {u32 rxspace; - hw->flags |=SKY2_HW_RAM_BUFFER ;pr_debug (PFX "%s: ram buffer %dK\n" , dev->name, ramsize);if (ramsize <16 ) rxspace = ramsize /2 ;
@@ -2942,6 +2941,9 @@ static int __devinit sky2_init(struct sky2_hw *hw) ++hw->ports; } +if (sky2_read8 (hw,B2_E_0 )) + hw->flags |=SKY2_HW_RAM_BUFFER ; +return 0 ; }
drivers/net/tun.c +1 -3
@@ -943,8 +943,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)char *name;unsigned long flags =0 ; - err = -EINVAL ; -if (!capable (CAP_NET_ADMIN ))return -EPERM ;
@@ -958,7 +956,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) flags |=TUN_TAP_DEV ; name ="tap%d" ; }else - goto failed; +return -EINVAL ;if (*ifr->ifr_name) name = ifr->ifr_name;
drivers/net/usb/smsc95xx.c +1 -1
@@ -1232,7 +1232,7 @@ static const struct driver_info smsc95xx_info = { .rx_fixup = smsc95xx_rx_fixup, .tx_fixup = smsc95xx_tx_fixup, .status = smsc95xx_status, - .flags = FLAG_ETHER, + .flags = FLAG_ETHER | FLAG_SEND_ZLP, };static const struct usb_device_id products[] = {
drivers/net/usb/usbnet.c +1 -1
@@ -988,7 +988,7 @@ int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)* NOTE: strictly conforming cdc-ether devices should expect * the ZLP here, but ignore the one-byte packet. */ -if ((length % dev->maxpacket) ==0 ) { +if (!(info->flags &FLAG_SEND_ZLP ) && (length % dev->maxpacket) ==0 ) { urb->transfer_buffer_length++;if (skb_tailroom (skb)) { skb->data[skb->len] =0 ;
fs/ecryptfs/main.c +6 -1
@@ -35,6 +35,7 @@#include <linux/key.h> #include <linux/parser.h> #include <linux/fs_stack.h> +#include <linux/ima.h> #include "ecryptfs_kernel.h" /**
@@ -118,6 +119,7 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry)const struct cred *cred =current_cred ();struct ecryptfs_inode_info *inode_info =ecryptfs_inode_to_private (ecryptfs_dentry->d_inode); +int opened_lower_file =0 ;int rc =0 ;mutex_lock (&inode_info->lower_file_mutex);
@@ -134,9 +136,12 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry)"for lower_dentry [0x%p] and lower_mnt [0x%p]; " "rc = [%d]\n", lower_dentry, lower_mnt, rc); inode_info->lower_file =NULL ; - } + }else + opened_lower_file =1 ; }mutex_unlock (&inode_info->lower_file_mutex); +if (opened_lower_file) +ima_counts_get (inode_info->lower_file);return rc; }
fs/namei.c +4 -2
@@ -1533,9 +1533,11 @@ int may_open(struct path *path, int acc_mode, int flag)if (error)return error; - error =ima_path_check (path, - acc_mode & (MAY_READ |MAY_WRITE |MAY_EXEC ), + error =ima_path_check (path, acc_mode ? + acc_mode & (MAY_READ |MAY_WRITE |MAY_EXEC ) : +ACC_MODE (flag) & (MAY_READ |MAY_WRITE ),IMA_COUNT_UPDATE ); +if (error)return error;/*
include/linux/ftrace.h +1 -1
@@ -241,7 +241,7 @@ extern void ftrace_enable_daemon(void);# define ftrace_set_filter (buf, len, reset) do { } while (0)# define ftrace_disable_daemon () do { } while (0)# define ftrace_enable_daemon () do { } while (0) -static inline void ftrace_release (void *start,unsigned long size) { } +static inline void ftrace_release_mod (struct module *mod) {}static inline int register_ftrace_command (struct ftrace_func_command *cmd) {return -EINVAL ;
include/linux/usb/usbnet.h +1 -0
@@ -86,6 +86,7 @@ struct driver_info {#define FLAG_FRAMING_AX 0x0040/* AX88772/178 packets */ #define FLAG_WLAN 0x0080/* use "wlan%d" names */ +#define FLAG_SEND_ZLP 0x0200/* hw requires ZLPs are sent */ /* init device ... can sleep, or cause probe() failure */
kernel/exit.c +0 -2
@@ -987,8 +987,6 @@ NORET_TYPE void do_exit(long code) tsk->mempolicy =NULL ;#endif #ifdef CONFIG_FUTEX -if (unlikely (!list_empty (&tsk->pi_state_list))) -exit_pi_state_list (tsk);if (unlikely (current->pi_state_cache))kfree (current->pi_state_cache);#endif
kernel/fork.c +8 -2
@@ -544,12 +544,18 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)/* Get rid of any futexes when releasing the mm */ #ifdef CONFIG_FUTEX -if (unlikely (tsk->robust_list)) +if (unlikely (tsk->robust_list)) {exit_robust_list (tsk); + tsk->robust_list =NULL ; + }#ifdef CONFIG_COMPAT -if (unlikely (tsk->compat_robust_list)) +if (unlikely (tsk->compat_robust_list)) {compat_exit_robust_list (tsk); + tsk->compat_robust_list =NULL ; + }#endif +if (unlikely (!list_empty (&tsk->pi_state_list))) +exit_pi_state_list (tsk);#endif /* Get rid of any cached register state */
kernel/futex.c +1 -2
@@ -912,8 +912,8 @@ retry: hb1 =hash_futex (&key1); hb2 =hash_futex (&key2); -double_lock_hb (hb1, hb2); retry_private: +double_lock_hb (hb1, hb2); op_ret =futex_atomic_op_inuser (op, uaddr2);if (unlikely (op_ret <0 )) {
@@ -2087,7 +2087,6 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,* Unqueue the futex_q and determine which it was. */ plist_del (&q->list, &q->list.plist); -drop_futex_key_refs (&q->key);if (timeout && !timeout->task) ret = -ETIMEDOUT ;
kernel/time/tick-sched.c +7 -2
@@ -231,6 +231,13 @@ void tick_nohz_stop_sched_tick(int inidle)if (!inidle && !ts->inidle) goto end; +/* +* Set ts->inidle unconditionally. Even if the system did not +* switch to NOHZ mode the cpu frequency governers rely on the +* update of the idle time accounting in tick_nohz_start_idle(). +*/ + ts->inidle =1 ; + now =tick_nohz_start_idle (ts);/*
@@ -248,8 +255,6 @@ void tick_nohz_stop_sched_tick(int inidle)if (unlikely (ts->nohz_mode ==NOHZ_MODE_INACTIVE )) goto end; - ts->inidle =1 ; -if (need_resched ()) goto end;
kernel/trace/ftrace.c +7 -16
@@ -1110,14 +1110,9 @@ static void ftrace_replace_code(int enable) failed =__ftrace_replace_code (rec, enable);if (failed) { rec->flags |=FTRACE_FL_FAILED ; -if ((system_state ==SYSTEM_BOOTING ) || - !core_kernel_text (rec->ip)) { -ftrace_free_rec (rec); - }else { -ftrace_bug (failed, rec->ip); -/* Stop processing */ -return ; - } +ftrace_bug (failed, rec->ip); +/* Stop processing */ +return ; } }while_for_each_ftrace_rec (); }
@@ -2801,19 +2796,17 @@ static int ftrace_convert_nops(struct module *mod, }#ifdef CONFIG_MODULES -void ftrace_release (void *start,void *end) +void ftrace_release_mod (struct module *mod) {struct dyn_ftrace *rec;struct ftrace_page *pg; -unsigned long s = (unsigned long )start; -unsigned long e = (unsigned long )end; -if (ftrace_disabled || !start || start == end) +if (ftrace_disabled)return ;mutex_lock (&ftrace_lock);do_for_each_ftrace_rec (pg, rec) { -if ((rec->ip >= s) && (rec->ip < e)) { +if (within_module_core (rec->ip, mod)) {/* * rec->ip is changed in ftrace_free_rec() * It should not between s and e if record was freed.
@@ -2845,9 +2838,7 @@ static int ftrace_module_notify(struct notifier_block *self, mod->num_ftrace_callsites);break ;case MODULE_STATE_GOING : -ftrace_release (mod->ftrace_callsites, - mod->ftrace_callsites + - mod->num_ftrace_callsites); +ftrace_release_mod (mod);break ; }
mm/swap_state.c +46 -24
111 lines not on this page · raw message
net/appletalk/aarp.c +11 -5
@@ -599,7 +599,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,/* Non ELAP we cannot do. */ if (dev->type !=ARPHRD_ETHER ) -return -1 ; + goto free_it; skb->dev = dev; skb->protocol =htons (ETH_P_ATALK );
@@ -634,7 +634,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,if (!a) {/* Whoops slipped... good job it's an unreliable protocol 8) */ write_unlock_bh (&aarp_lock); -return -1 ; + goto free_it; }/* Set up the queue */
@@ -663,15 +663,21 @@ out_unlock:write_unlock_bh (&aarp_lock);/* Tell the ddp layer we have taken over for this frame. */ -return 0 ; + goto sent; sendit:if (skb->sk) skb->priority = skb->sk->sk_priority; -dev_queue_xmit (skb); +if (dev_queue_xmit (skb)) + goto drop; sent: -return 1 ; +return NET_XMIT_SUCCESS ; +free_it: +kfree_skb (skb); +drop: +return NET_XMIT_DROP ; } +EXPORT_SYMBOL (aarp_send_ddp);/* * An entry in the aarp unresolved queue has become resolved. Send
net/appletalk/ddp.c +31 -27
128 lines not on this page · raw message
net/ax25/af_ax25.c +3 -3
@@ -893,7 +893,6 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev)sock_init_data (NULL , sk); - sk->sk_destruct = ax25_free_sock; sk->sk_type = osk->sk_type; sk->sk_priority = osk->sk_priority; sk->sk_protocol = osk->sk_protocol;
@@ -931,6 +930,7 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev) } sk->sk_protinfo = ax25; + sk->sk_destruct = ax25_free_sock; ax25->sk = sk;return sk;
@@ -1781,8 +1781,8 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) ax25_info.idletimer =ax25_display_timer (&ax25->idletimer) / (60 *HZ ); ax25_info.n2count = ax25->n2count; ax25_info.state = ax25->state; - ax25_info.rcv_q =sk_wmem_alloc_get (sk); - ax25_info.snd_q =sk_rmem_alloc_get (sk); + ax25_info.rcv_q =sk_rmem_alloc_get (sk); + ax25_info.snd_q =sk_wmem_alloc_get (sk); ax25_info.vs = ax25->vs; ax25_info.vr = ax25->vr; ax25_info.va = ax25->va;
net/core/dev.c +3 -3
@@ -2248,6 +2248,9 @@ int netif_receive_skb(struct sk_buff *skb)int ret =NET_RX_DROP ;__be16 type; +if (!skb->tstamp.tv64) +net_timestamp (skb); +if (skb->vlan_tci &&vlan_hwaccel_do_receive (skb))return NET_RX_SUCCESS ;
@@ -2255,9 +2258,6 @@ int netif_receive_skb(struct sk_buff *skb)if (netpoll_receive_skb (skb))return NET_RX_DROP ; -if (!skb->tstamp.tv64) -net_timestamp (skb); -if (!skb->iif) skb->iif = skb->dev->ifindex;
net/core/sock.c +12 -7
@@ -1218,17 +1218,22 @@ void __init sk_init(void)void sock_wfree (struct sk_buff *skb) {struct sock *sk = skb->sk; -int res; +unsigned int len = skb->truesize; -/* In case it might be waiting for more memory. */ - res =atomic_sub_return (skb->truesize, &sk->sk_wmem_alloc); -if (!sock_flag (sk,SOCK_USE_WRITE_QUEUE )) +if (!sock_flag (sk,SOCK_USE_WRITE_QUEUE )) { +/* +* Keep a reference on sk_wmem_alloc, this will be released +* after sk_write_space() call +*/ +atomic_sub (len -1 , &sk->sk_wmem_alloc); sk->sk_write_space (sk); + len =1 ; + }/* -* if sk_wmem_alloc reached 0, we are last user and should -* free this sock, as sk_free() call could not do it. +* if sk_wmem_alloc reaches 0, we must finish what sk_free() +* could not do because of in-flight packets */ -if (res ==0 ) +if (atomic_sub_and_test (len, &sk->sk_wmem_alloc))__sk_free (sk); }EXPORT_SYMBOL (sock_wfree);
net/ipv4/tcp_minisocks.c +1 -1
@@ -363,7 +363,7 @@ void tcp_twsk_destructor(struct sock *sk)#ifdef CONFIG_TCP_MD5SIG struct tcp_timewait_sock *twsk =tcp_twsk (sk);if (twsk->tw_md5_keylen) -tcp_put_md5sig_pool (); +tcp_free_md5sig_pool ();#endif }
net/ipv6/sit.c +1 -1
@@ -313,7 +313,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t, c =0 ;for (prl = t->prl; prl; prl = prl->next) { -if (c > cmax) +if (c >= cmax)break ;if (kprl.addr !=htonl (INADDR_ANY ) && prl->addr != kprl.addr)continue ;
net/unix/af_unix.c +4 -1
@@ -1501,6 +1501,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,struct sk_buff *skb;int sent =0 ;struct scm_cookie tmp_scm; +bool fds_sent = false;if (NULL == siocb->scm) siocb->scm = &tmp_scm;
@@ -1562,12 +1563,14 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, size =min_t (int, size,skb_tailroom (skb));memcpy (UNIXCREDS (skb), &siocb->scm->creds,sizeof (struct ucred )); -if (siocb->scm->fp) { +/* Only send the fds in the first buffer */ +if (siocb->scm->fp && !fds_sent) { err =unix_attach_fds (siocb->scm, skb);if (err) {kfree_skb (skb); goto out_err; } + fds_sent = true; } err =memcpy_fromiovec (skb_put (skb, size), msg->msg_iov, size);
sound/pci/hda/patch_realtek.c +1 -0
@@ -16876,6 +16876,7 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {SND_PCI_QUIRK (0x105b ,0x0cd6 ,"Foxconn" ,ALC662_ECS ),SND_PCI_QUIRK (0x105b ,0x0d47 ,"Foxconn 45CMX/45GMX/45CMX-K" , ALC662_3ST_6ch_DIG), +SND_PCI_QUIRK (0x1179 ,0xff6e ,"Toshiba NB200" ,ALC663_ASUS_MODE4 ),SND_PCI_QUIRK (0x144d ,0xca00 ,"Samsung NC10" ,ALC272_SAMSUNG_NC10 ),SND_PCI_QUIRK (0x1458 ,0xa002 ,"Gigabyte 945GCM-S2L" , ALC662_3ST_6ch_DIG),
sound/pci/via82xx.c +18 -9
@@ -1626,7 +1626,7 @@ static int snd_via8233_dxs_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct via82xx *chip =snd_kcontrol_chip (kcontrol); -unsigned int idx =snd_ctl_get_ioff (kcontrol, &ucontrol->id); +unsigned int idx = kcontrol->id.subdevice; ucontrol->value.integer.value[0 ] =VIA_DXS_MAX_VOLUME - chip->playback_volume[idx][0 ]; ucontrol->value.integer.value[1 ] =VIA_DXS_MAX_VOLUME - chip->playback_volume[idx][1 ];
@@ -1646,7 +1646,7 @@ static int snd_via8233_dxs_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct via82xx *chip =snd_kcontrol_chip (kcontrol); -unsigned int idx =snd_ctl_get_ioff (kcontrol, &ucontrol->id); +unsigned int idx = kcontrol->id.subdevice;unsigned long port = chip->port +0x10 * idx;unsigned char val;int i, change =0 ;
@@ -1705,11 +1705,12 @@ static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = };static struct snd_kcontrol_new snd_via8233_dxs_volume_control__devinitdata = { - .name ="VIA DXS Playback Volume" , - .iface =SNDRV_CTL_ELEM_IFACE_MIXER , + .iface =SNDRV_CTL_ELEM_IFACE_PCM , + .device =0 , +/* .subdevice set later */ + .name ="PCM Playback Volume" , .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |SNDRV_CTL_ELEM_ACCESS_TLV_READ ), - .count =4 , .info = snd_via8233_dxs_volume_info, .get = snd_via8233_dxs_volume_get, .put = snd_via8233_dxs_volume_put,
@@ -1936,10 +1937,18 @@ static int __devinit snd_via8233_init_misc(struct via82xx *chip) }else /* Using DXS when PCM emulation is enabled is really weird */ { -/* Standalone DXS controls */ - err =snd_ctl_add (chip->card,snd_ctl_new1 (&snd_via8233_dxs_volume_control, chip)); -if (err <0 ) -return err; +for (i =0 ; i <4 ; ++i) { +struct snd_kcontrol *kctl; + + kctl =snd_ctl_new1 ( + &snd_via8233_dxs_volume_control, chip); +if (!kctl) +return -ENOMEM ; + kctl->id.subdevice = i; + err =snd_ctl_add (chip->card, kctl); +if (err <0 ) +return err; + } } }/* select spdif data slot 10/11 */
sound/soc/codecs/wm8350.c +2 -2
@@ -580,7 +580,7 @@ static const struct snd_kcontrol_new wm8350_left_capt_mixer_controls[] = {SOC_DAPM_SINGLE_TLV ("L3 Capture Volume" ,WM8350_INPUT_MIXER_VOLUME_L ,9 ,7 ,0 , out_mix_tlv),SOC_DAPM_SINGLE ("PGA Capture Switch" , - WM8350_LEFT_INPUT_VOLUME, 14, 1, 0), + WM8350_LEFT_INPUT_VOLUME, 14, 1, 1), };/* Right Input Mixer */
@@ -590,7 +590,7 @@ static const struct snd_kcontrol_new wm8350_right_capt_mixer_controls[] = {SOC_DAPM_SINGLE_TLV ("L3 Capture Volume" ,WM8350_INPUT_MIXER_VOLUME_R ,13 ,7 ,0 , out_mix_tlv),SOC_DAPM_SINGLE ("PGA Capture Switch" , - WM8350_RIGHT_INPUT_VOLUME, 14, 1, 0), + WM8350_RIGHT_INPUT_VOLUME, 14, 1, 1), };/* Left Mic Mixer */
A message that is not in the archive (sent off-list or not yet received): 20091014041020.GA4340@roll
I'm experiencing various problems which I'm seeing reproducably in
both 2.6.31.2 and 2.6.31.4 after upgrading from 2.6.30.8. Most notably, and scary to me, is that I'm routinely seeing this I/O error message with different sector numbers whenever I try to use my usb hard drive.
in syslog:
Oct 13 21:55:49 roll kernel: sd 0:0:0:0: [sda] Assuming drive cache: write through Oct 13 21:55:49 roll kernel: sd 0:0:0:0: [sda] Assuming drive cache: write through Oct 13 21:55:49 roll kernel: sda1 Oct 13 21:55:49 roll kernel: sd 0:0:0:0: [sda] Assuming drive cache: write through Oct 13 21:56:20 roll kernel: end_request: I/O error, dev sda, sector
50334647
in messages:
Oct 13 21:56:20 roll kernel: sd 0:0:0:0: [sda] Unhandled error code Oct 13 21:56:20 roll kernel: sd 0:0:0:0: [sda] Result: hostbyte=0x07
driverbyte=0x00
Now, this doesn't appear to affect anything so far as the filesystem
doesn't even get set readonly. (It's ext4) ... And I just found out that for some reason the filesystem is set to continue on errors. I'm surprised, I thought the default for mke2fs was to set remount readonly. *sigh* I'm changing the settings for the filesystem now.
In any case, these I/O error messages do *not* appear when I'm doing
similar things on 2.6.30.8. Given that this usb drive is my backup hard drive, I've reason to be concerned - is this an *actual* error with the physical disk, is something funky with the kernel, or... what?
Before I attempt to debug this further, I'd like to know what the
error messages are being generated by, so I can find out just how concerned I should be.
I'm going to assume, for the moment, that something is wrong with
2.6.31.2/4's ability to use my usb hard drive and that the backup I have on it is likely corrupt since I did not have the filesystem set to remount readonly on errors. I'm going to wipe it and remake the backup with 2.6.30.8.
Please, let me know what's going on here. I need to know what the error messages mean - is this a physical failure of the hard drive, or what?
Thank you,
Tim McGrath