Linux 2.6.20.11
Subsystems (23)
We (the -stable team) are announcing the release of the 2.6.20.11 kernel. It contains a number of bugfixes from the 2.6.20.10 release, and anyone who is having any issues with 2.6.20.10 is encouraged to update.
I'll also be replying to this message with a copy of the patch between 2.6.20.10 and 2.6.20.11.
The updated 2.6.20.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
greg k-h
--------
Makefile | 2 arch/i386/boot/video.S | 14 arch/sparc64/kernel/pci_iommu.c | 2 arch/sparc64/kernel/sbus.c | 560 +++++++++++++-------------------- arch/sparc64/kernel/sys32.S | 1 arch/sparc64/kernel/systbls.S | 2 arch/x86_64/boot/video.S | 14 arch/x86_64/kernel/k8.c | 4 block/cfq-iosched.c | 12 drivers/char/agp/intel-agp.c | 3 drivers/char/mem.c | 2 drivers/char/vt_ioctl.c | 16 drivers/hid/hid-core.c | 4 drivers/hwmon/w83627ehf.c | 6 drivers/infiniband/hw/mthca/mthca_mr.c | 1 drivers/kvm/mmu.c | 53 ++- drivers/pci/probe.c | 45 -- drivers/scsi/3w-xxxx.c | 11 drivers/scsi/qlogicpti.c | 2 drivers/serial/8250.c | 3 fs/exec.c | 18 - fs/nfs/dir.c | 3 fs/nfs/inode.c | 6 fs/reiserfs/xattr.c | 92 +---- include/linux/taskstats.h | 13 mm/madvise.c | 19 - mm/migrate.c | 15 mm/oom_kill.c | 2 mm/shmem.c | 132 +++++-- net/core/netpoll.c | 7 net/ipv4/tcp.c | 13 net/irda/af_irda.c | 3 net/sunrpc/svcauth_unix.c | 21 - sound/pci/intel8x0.c | 5 34 files changed, 571 insertions(+), 535 deletions(-)
Summary of changes from v2.6.20.10 to v2.6.20.11
===============================================
Alan Cox (1):
exec.c: fix coredump to pipe problem and obscure "security hole"
Aubrey.Li (1):
Fix netpoll UDP input path
Avi Kivity (2):
KVM: MMU: Fix guest writes to nonpae pde
KVM: MMU: Fix host memory corruption on i386 with >= 4GB ram
Badari Pulavarty (1):
cache_k8_northbridges() overflows beyond allocation
Balbir Singh (1):
Taskstats fix the structure members alignment issue
Bartlomiej Zolnierkiewicz (1):
Revert "adjust legacy IDE resource setting (v2)"
Benjamin Herrenschmidt (1):
fix bogon in /dev/mem mmap'ing on nommu
Christoph Lameter (1):
page migration: fix NR_FILE_PAGES accounting
David Miller (3):
Fix sparc64 SBUS IOMMU allocator
Fix qlogicpti DMA unmapping
Fix compat sys_ipc() on sparc64
Greg Kroah-Hartman (1):
Linux 2.6.20.11
Hugh Dickins (5):
holepunch: fix shmem_truncate_range punching too far
holepunch: fix shmem_truncate_range punch locking
holepunch: fix disconnected pages after second truncate
holepunch: fix mmap_sem i_mutex deadlock
fix OOM killing processes wrongly thought MPOL_BIND
James Bottomley (1):
3w-xxxx: fix oops caused by incorrect REQUEST_SENSE handling
Jean Delvare (1):
hwmon/w83627ehf: Fix the fan5 clock divider write
Jeff Mahoney (1):
reiserfs: fix xattr root locking/refcount bug
Jens Axboe (1):
cfq-iosched: fix alias + front merge bug
Jiri Kosina (1):
HID: zeroing of bytes in output fields is bogus
John Heffner (1):
Fix errors in tcp_mem[] calculations.
Michael S. Tsirkin (1):
IB/mthca: Fix data corruption after FMR unmap on Sinai
Michal Januszewski (1):
vt: fix potential race in VT_WAITACTIVE handler
NeilBrown (1):
knfsd: Use a spinlock to protect sk_info_authunix
Olaf Kirch (1):
Fix IRDA oops'er
Taku Izumi (1):
Fix possible NULL pointer access in 8250 serial driver
Tom "spot" Callaway (1):
Fix bogus inline directive in sparc64 PCI code
Tommi Kyntola (1):
ALSA: intel8x0 - Fix speaker output after S2RAM
Trond Myklebust (1):
NFS: Fix an Oops in nfs_setattr()
Wang Zhenyu (1):
AGPGART: intel_agp: fix G965 GTT size detect
Zwane Mwaikambo (1):
x86: Don't probe for DDC on VBE1.2
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 20 -EXTRAVERSION = .10 +EXTRAVERSION = .11 NAME = Homicidal Dwarf Hamster # *DOCUMENTATION*
arch/i386/boot/video.S +14 -0
@@ -571,6 +571,16 @@ setr1: lodsw jmp _m_s check_vesa: +#ifdef CONFIG_FIRMWARE_EDID + leaw modelist+1024, %di + movw $0x4f00, %ax + int $0x10 + cmpw $0x004f, %ax + jnz setbad + + movw 4(%di), %ax + movw %ax, vbe_version +#endif leaw modelist+1024, %di subb $VIDEO_FIRST_VESA>>8, %bh movw %bx, %cx # Get mode information structure
@@ -1945,6 +1955,9 @@ store_edid: rep stosl + cmpw $0x0200, vbe_version # only do EDID on >= VBE2.0 + jl no_edid + pushw %es # save ES xorw %di, %di # Report Capability pushw %di
@@ -1987,6 +2000,7 @@ do_restore: .byte 0 # Screen contents altered during mode change svga_prefix: .byte VIDEO_FIRST_BIOS>>8 # Default prefix for BIOS modes graphic_mode: .byte 0 # Graphic mode with a linear frame buffer dac_size: .byte 6 # DAC bit depth +vbe_version: .word 0 # VBE bios version # Status messages keymsg: .ascii "Press <RETURN> to see video modes available, "
arch/sparc64/kernel/pci_iommu.c +1 -1
@@ -64,7 +64,7 @@ static void __iommu_flushall(struct pci_iommu *iommu)#define IOPTE_IS_DUMMY (iommu, iopte) \ ((iopte_val(*iopte) & IOPTE_PAGE) == (iommu)->dummy_page_pa) -static void inline iopte_make_dummy (struct pci_iommu *iommu,iopte_t *iopte) +static inline void iopte_make_dummy (struct pci_iommu *iommu,iopte_t *iopte) {unsigned long val =iopte_val (*iopte);
arch/sparc64/kernel/sbus.c +232 -328
778 lines not on this page · raw message
arch/sparc64/kernel/sys32.S +0 -1
@@ -91,7 +91,6 @@ SIGN1(sys32_select, compat_sys_select, %o0) SIGN1(sys32_mkdir, sys_mkdir, %o1) SIGN3(sys32_futex, compat_sys_futex, %o1, %o2, %o5) SIGN1(sys32_sysfs, compat_sys_sysfs, %o0) -SIGN3(sys32_ipc, compat_sys_ipc, %o1, %o2, %o3) SIGN2(sys32_sendfile, compat_sys_sendfile, %o0, %o1) SIGN2(sys32_sendfile64, compat_sys_sendfile64, %o0, %o1) SIGN1(sys32_prctl, sys_prctl, %o0)
arch/sparc64/kernel/systbls.S +1 -1
@@ -62,7 +62,7 @@ sys_call_table32: /*200*/ .word sys32_ssetmask, sys_sigsuspend, compat_sys_newlstat, sys_uselib, compat_sys_old_readdir .word sys32_readahead, sys32_socketcall, sys32_syslog, sys32_lookup_dcookie, sys32_fadvise64 /*210*/ .word sys32_fadvise64_64, sys32_tgkill, sys32_waitpid, sys_swapoff, sys32_sysinfo - .word sys32_ipc, sys32_sigreturn, sys_clone, sys32_ioprio_get, compat_sys_adjtimex + .word compat_sys_ipc, sys32_sigreturn, sys_clone, sys32_ioprio_get, compat_sys_adjtimex /*220*/ .word sys32_sigprocmask, sys_ni_syscall, sys32_delete_module, sys_ni_syscall, sys32_getpgid .word sys32_bdflush, sys32_sysfs, sys_nis_syscall, sys32_setfsuid16, sys32_setfsgid16 /*230*/ .word sys32_select, compat_sys_time, sys32_splice, compat_sys_stime, compat_sys_statfs64
arch/x86_64/boot/video.S +14 -0
@@ -571,6 +571,16 @@ setr1: lodsw jmp _m_s check_vesa: +#ifdef CONFIG_FIRMWARE_EDID + leaw modelist+1024, %di + movw $0x4f00, %ax + int $0x10 + cmpw $0x004f, %ax + jnz setbad + + movw 4(%di), %ax + movw %ax, vbe_version +#endif leaw modelist+1024, %di subb $VIDEO_FIRST_VESA>>8, %bh movw %bx, %cx # Get mode information structure
@@ -1945,6 +1955,9 @@ store_edid: rep stosl + cmpw $0x0200, vbe_version # only do EDID on >= VBE2.0 + jl no_edid + pushw %es # save ES xorw %di, %di # Report Capability pushw %di
@@ -1987,6 +2000,7 @@ do_restore: .byte 0 # Screen contents altered during mode change svga_prefix: .byte VIDEO_FIRST_BIOS>>8 # Default prefix for BIOS modes graphic_mode: .byte 0 # Graphic mode with a linear frame buffer dac_size: .byte 6 # DAC bit depth +vbe_version: .word 0 # VBE bios version # Status messages keymsg: .ascii "Press <RETURN> to see video modes available, "
arch/x86_64/kernel/k8.c +2 -2
@@ -61,8 +61,8 @@ int cache_k8_northbridges(void) dev =NULL ; i =0 ;while ((dev =next_k8_northbridge (dev)) !=NULL ) { - k8_northbridges[i++] = dev; -pci_read_config_dword (dev,0x9c , &flush_words[i]); + k8_northbridges[i] = dev; +pci_read_config_dword (dev,0x9c , &flush_words[i++]); } k8_northbridges[i] =NULL ;return 0 ;
block/cfq-iosched.c +6 -6
@@ -462,6 +462,12 @@ static void cfq_add_rq_rb(struct request *rq)if (!cfq_cfqq_on_rr (cfqq))cfq_add_cfqq_rr (cfqd, cfqq); + +/* +* check if this request is a better next-serve candidate +*/ + cfqq->next_rq =cfq_choose_req (cfqd, cfqq->next_rq, rq); +BUG_ON (!cfqq->next_rq); } static inline void
@@ -1623,12 +1629,6 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq, cfqq->meta_pending++;/* -* check if this request is a better next-serve candidate)) { -*/ - cfqq->next_rq =cfq_choose_req (cfqd, cfqq->next_rq, rq); -BUG_ON (!cfqq->next_rq); - -/* * we never wait for an async request and we don't allow preemption * of an async request. so just return early */
drivers/char/agp/intel-agp.c +1 -2
@@ -405,9 +405,8 @@ static void intel_i830_init_gtt_entries(void)if (IS_I965 ) {u32 pgetbl_ctl; + pgetbl_ctl =readl (intel_i830_private.registers+I810_PGETBL_CTL ); -pci_read_config_dword (agp_bridge->dev,I810_PGETBL_CTL , - &pgetbl_ctl);/* The 965 has a field telling us the size of the GTT, * which may be larger than what is necessary to map the * aperture.
drivers/char/mem.c +1 -1
@@ -248,7 +248,7 @@ static unsigned long get_unmapped_area_mem(struct file *file, {if (!valid_mmap_phys_addr_range (pgoff, len))return (unsigned long ) -EINVAL ; -return pgoff; +return pgoff <<PAGE_SHIFT ; }/* can't do an in-place private mapping if there's no MMU */
drivers/char/vt_ioctl.c +14 -2
@@ -1038,10 +1038,22 @@ int vt_waitactive(int vt)add_wait_queue (&vt_activate_queue, &wait);for (;;) { -set_current_state (TASK_INTERRUPTIBLE ); retval =0 ; -if (vt == fg_console) + +/* +* Synchronize with redraw_screen(). By acquiring the console +* semaphore we make sure that the console switch is completed +* before we return. If we didn't wait for the semaphore, we +* could return at a point where fg_console has already been +* updated, but the console switch hasn't been completed. +*/ +acquire_console_sem (); +set_current_state (TASK_INTERRUPTIBLE ); +if (vt == fg_console) { +release_console_sem ();break ; + } +release_console_sem (); retval = -EINTR ;if (signal_pending (current))break ;
drivers/hid/hid-core.c +0 -4
@@ -876,10 +876,6 @@ static void hid_output_field(struct hid_field *field, __u8 *data)unsigned size = field->report_size;unsigned n; -/* make sure the unused bits in the last byte are zeros */ -if (count >0 && size >0 ) - data[(count*size-1 )/8 ] =0 ; -for (n =0 ; n < count; n++) {if (field->logical_minimum <0 )/* signed values */ implement (data, offset + n * size, size,s32ton (field->value[n], size));
drivers/hwmon/w83627ehf.c +3 -3
@@ -389,7 +389,7 @@ static void w83627ehf_write_fan_div(struct i2c_client *client, int nr)break ;case 4 : reg = (w83627ehf_read_value (client,W83627EHF_REG_DIODE ) &0x73 ) - | ((data->fan_div[4 ] &0x03 ) <<3 ) + | ((data->fan_div[4 ] &0x03 ) <<2 ) | ((data->fan_div[4 ] &0x04 ) <<5 );w83627ehf_write_value (client,W83627EHF_REG_DIODE , reg);break ;
@@ -453,9 +453,9 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)time */ if (data->fan[i] ==0xff && data->fan_div[i] <0x07 ) { -dev_dbg (&client->dev,"Increasing fan %d " +dev_dbg (&client->dev,"Increasing fan%d " "clock divider from %u to %u\n" , - i,div_from_reg (data->fan_div[i]), + i +1 ,div_from_reg (data->fan_div[i]),div_from_reg (data->fan_div[i] +1 )); data->fan_div[i]++;w83627ehf_write_fan_div (client, i);
drivers/infiniband/hw/mthca/mthca_mr.c +1 -0
@@ -751,6 +751,7 @@ void mthca_arbel_fmr_unmap(struct mthca_dev *dev, struct mthca_fmr *fmr) key =arbel_key_to_hw_index (fmr->ibmr.lkey); key &= dev->limits.num_mpts -1 ; + key =adjust_key (dev, key); fmr->ibmr.lkey = fmr->ibmr.rkey =arbel_hw_index_to_key (key); fmr->maps =0 ;
drivers/kvm/mmu.c +38 -15
97 lines not on this page · raw message
drivers/pci/probe.c +13 -32
59 lines not on this page · raw message
drivers/scsi/3w-xxxx.c +9 -2
@@ -1864,10 +1864,17 @@ static int tw_scsiop_read_write(TW_Device_Extension *tw_dev, int request_id)/* This function will handle the request sense scsi command */ static int tw_scsiop_request_sense (TW_Device_Extension *tw_dev,int request_id) { +char request_buffer[18 ]; +dprintk (KERN_NOTICE "3w-xxxx: tw_scsiop_request_sense()\n" ); -/* For now we just zero the request buffer */ -memset (tw_dev->srb[request_id]->request_buffer,0 , tw_dev->srb[request_id]->request_bufflen); +memset (request_buffer,0 ,sizeof (request_buffer)); + request_buffer[0 ] =0x70 ;/* Immediate fixed format */ + request_buffer[7 ] =10 ;/* minimum size per SPC: 18 bytes */ +/* leave all other fields zero, giving effectively NO_SENSE return */ +tw_transfer_internal (tw_dev, request_id, request_buffer, +sizeof (request_buffer)); + tw_dev->state[request_id] =TW_S_COMPLETED ;tw_state_request_finish (tw_dev, request_id);
drivers/scsi/qlogicpti.c +1 -1
@@ -1281,7 +1281,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti) (struct scatterlist *)Cmnd->request_buffer, Cmnd->use_sg, Cmnd->sc_data_direction); - }else { + }else if (Cmnd->request_bufflen) { sbus_unmap_single(qpti->sdev, (__u32)((unsigned long)Cmnd->SCp.ptr), Cmnd->request_bufflen,
drivers/serial/8250.c +2 -1
@@ -1289,7 +1289,8 @@ static unsigned int check_modem_status(struct uart_8250_port *up) {unsigned int status =serial_in (up,UART_MSR ); -if (status &UART_MSR_ANY_DELTA && up->ier &UART_IER_MSI ) { +if (status &UART_MSR_ANY_DELTA && up->ier &UART_IER_MSI && + up->port.info !=NULL ) {if (status &UART_MSR_TERI ) up->port.icount.rng++;if (status &UART_MSR_DDSR )
fs/exec.c +11 -7
@@ -1246,13 +1246,17 @@ EXPORT_SYMBOL(set_binfmt);* name into corename, which must have space for at least * CORENAME_MAX_SIZE bytes plus one byte for the zero terminator. */ -static void format_corename (char *corename,const char *pattern,long signr) +static int format_corename (char *corename,const char *pattern,long signr) {const char *pat_ptr = pattern;char *out_ptr = corename;char *const out_end = corename +CORENAME_MAX_SIZE ;int rc;int pid_in_pattern =0 ; +int ispipe =0 ; + +if (*pattern =='|' ) + ispipe =1 ;/* Repeat as long as we have more pattern to process and more output space */
@@ -1343,8 +1347,8 @@ static void format_corename(char *corename, const char *pattern, long signr)* * If core_pattern does not include a %p (as is the default) * and core_uses_pid is set, then .%pid will be appended to -* the filename */ -if (!pid_in_pattern +* the filename. Do not do this for piped commands. */ +if (!ispipe && !pid_in_pattern && (core_uses_pid ||atomic_read (¤t->mm->mm_users) !=1 )) { rc =snprintf (out_ptr, out_end - out_ptr,".%d" , current->tgid);
@@ -1352,8 +1356,9 @@ static void format_corename(char *corename, const char *pattern, long signr) goto out; out_ptr += rc; } - out: +out: *out_ptr =0 ; +return ispipe; }static void zap_process (struct task_struct *start)
@@ -1504,16 +1509,15 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs)* uses lock_kernel() */ lock_kernel (); -format_corename (corename, core_pattern, signr); + ispipe =format_corename (corename, core_pattern, signr);unlock_kernel (); -if (corename[0 ] =='|' ) { +if (ispipe) {/* SIGPIPE can happen, but it's just never processed */ if (call_usermodehelper_pipe (corename+1 ,NULL ,NULL , &file)) {printk (KERN_INFO "Core dump to %s pipe failed\n" , corename); goto fail_unlock; } - ispipe =1 ; }else file = filp_open(corename, O_CREAT | 2 | O_NOFOLLOW | O_LARGEFILE | flag,
fs/nfs/dir.c +2 -1
@@ -1659,7 +1659,8 @@ go_ahead:* ... prune child dentries and writebacks if needed. */ if (atomic_read (&old_dentry->d_count) >1 ) { -nfs_wb_all (old_inode); +if (S_ISREG (old_inode->i_mode)) +nfs_wb_all (old_inode);shrink_dcache_parent (old_dentry); }nfs_inode_return_delegation (old_inode);
fs/nfs/inode.c +4 -2
@@ -334,8 +334,10 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)lock_kernel ();nfs_begin_data_update (inode);/* Write all dirty data */ -filemap_write_and_wait (inode->i_mapping); -nfs_wb_all (inode); +if (S_ISREG (inode->i_mode)) { +filemap_write_and_wait (inode->i_mapping); +nfs_wb_all (inode); + }/* * Return any delegations if we're going to change ACLs */
fs/reiserfs/xattr.c +24 -68
134 lines not on this page · raw message
include/linux/taskstats.h +8 -5
@@ -31,7 +31,7 @@*/ -#define TASKSTATS_VERSION 3 +#define TASKSTATS_VERSION 4#define TS_COMM_LEN 32/* should be >= TASK_COMM_LEN * in linux/sched.h */
@@ -66,7 +66,7 @@ struct taskstats {/* Delay waiting for cpu, while runnable * count, delay_total NOT updated atomically */ -__u64 cpu_count; + __u64 cpu_count __attribute__((aligned(8)));__u64 cpu_delay_total;/* Following four fields atomically updated using task->delays->lock */
@@ -101,14 +101,17 @@ struct taskstats {/* Basic Accounting Fields start */ char ac_comm[TS_COMM_LEN ];/* Command name */ -__u8 ac_sched;/* Scheduling discipline */ + __u8 ac_sched __attribute__((aligned(8))); +/* Scheduling discipline */ __u8 ac_pad[3 ]; -__u32 ac_uid;/* User ID */ + __u32 ac_uid __attribute__((aligned(8))); +/* User ID */ __u32 ac_gid;/* Group ID */ __u32 ac_pid;/* Process ID */ __u32 ac_ppid;/* Parent process ID */ __u32 ac_btime;/* Begin time [sec since 1970] */ -__u64 ac_etime;/* Elapsed time [usec] */ + __u64 ac_etime __attribute__((aligned(8))); +/* Elapsed time [usec] */ __u64 ac_utime;/* User CPU time [usec] */ __u64 ac_stime;/* SYstem CPU time [usec] */ __u64 ac_minflt;/* Minor Page Fault Count */
mm/madvise.c +14 -5
@@ -159,9 +159,10 @@ static long madvise_remove(struct vm_area_struct *vma, unsigned long start, unsigned long end) {struct address_space *mapping; -loff_t offset, endoff; +loff_t offset, endoff; +int error; - *prev = vma; + *prev =NULL ;/* tell sys_madvise we drop mmap_sem */ if (vma->vm_flags & (VM_LOCKED |VM_NONLINEAR |VM_HUGETLB ))return -EINVAL ;
@@ -180,7 +181,12 @@ static long madvise_remove(struct vm_area_struct *vma, + ((loff_t )vma->vm_pgoff <<PAGE_SHIFT ); endoff = (loff_t)(end - vma->vm_start -1 ) + ((loff_t )vma->vm_pgoff <<PAGE_SHIFT ); -return vmtruncate_range (mapping->host, offset, endoff); + +/* vmtruncate_range needs to take i_mutex and i_alloc_sem */ +up_write (¤t->mm->mmap_sem); + error =vmtruncate_range (mapping->host, offset, endoff); +down_write (¤t->mm->mmap_sem); +return error; } static long
@@ -315,12 +321,15 @@ asmlinkage long sys_madvise(unsigned long start, size_t len_in, int behavior)if (error) goto out; start = tmp; -if (start < prev->vm_end) +if (prev && start < prev->vm_end) start = prev->vm_end; error = unmapped_error;if (start >= end) goto out; - vma = prev->vm_next; +if (prev) + vma = prev->vm_next; +else /* madvise_remove dropped mmap_sem */ + vma =find_vma (current->mm, start); } out:up_write (¤t->mm->mmap_sem);
mm/migrate.c +14 -1
@@ -297,7 +297,7 @@ static int migrate_page_move_mapping(struct address_space *mapping,void **pslot;if (!mapping) { -/* Anonymous page */ +/* Anonymous page without mapping */ if (page_count (page) !=1 )return -EAGAIN ;return 0 ;
@@ -333,6 +333,19 @@ static int migrate_page_move_mapping(struct address_space *mapping,*/ __put_page (page); +/* +* If moved to a different zone then also account +* the page for that zone. Other VM counters will be +* taken care of when we establish references to the +* new page and drop references to the old page. +* +* Note that anonymous pages are accounted for +* via NR_FILE_PAGES and NR_ANON_PAGES if they +* are mapped to swap space. +*/ +__dec_zone_page_state (page,NR_FILE_PAGES ); +__inc_zone_page_state (newpage,NR_FILE_PAGES ); +write_unlock_irq (&mapping->tree_lock);return 0 ;
mm/oom_kill.c +2 -0
@@ -176,6 +176,8 @@ static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask)struct zone **z;nodemask_t nodes;int node; + +nodes_clear (nodes);/* node has memory ? */ for_each_online_node (node)if (NODE_DATA (node)->node_present_pages)
mm/shmem.c +100 -32
223 lines not on this page · raw message
net/core/netpoll.c +7 -0
@@ -471,6 +471,13 @@ int __netpoll_rx(struct sk_buff *skb)if (skb->len < len || len < iph->ihl*4 ) goto out; +/* +* Our transport medium may have padded the buffer out. +* Now We trim to the true length of the frame. +*/ +if (pskb_trim_rcsum (skb, len)) + goto out; +if (iph->protocol !=IPPROTO_UDP ) goto out;
net/ipv4/tcp.c +10 -3
@@ -2457,11 +2457,18 @@ void __init tcp_init(void) sysctl_max_syn_backlog =128 ; } -/* Allow no more than 3/4 kernel memory (usually less) allocated to TCP */ - sysctl_tcp_mem[0 ] = (1536 /sizeof (struct inet_bind_hashbucket )) << order; - sysctl_tcp_mem[1 ] = sysctl_tcp_mem[0 ] *4 /3 ; +/* Set the pressure threshold to be a fraction of global memory that +* is up to 1/2 at 256 MB, decreasing toward zero with the amount of +* memory, with a floor of 128 pages. +*/ + limit =min (nr_all_pages,1UL <<(28 -PAGE_SHIFT )) >> (20 -PAGE_SHIFT ); + limit = (limit * (nr_all_pages >> (20 -PAGE_SHIFT ))) >> (PAGE_SHIFT -11 ); + limit =max (limit,128UL ); + sysctl_tcp_mem[0 ] = limit /4 *3 ; + sysctl_tcp_mem[1 ] = limit; sysctl_tcp_mem[2 ] = sysctl_tcp_mem[0 ] *2 ; +/* Set per-socket limits to no more than 1/128 the pressure threshold */ limit = ((unsigned long )sysctl_tcp_mem[1 ]) << (PAGE_SHIFT -7 ); max_share =min (4UL *1024 *1024 , limit);
net/irda/af_irda.c +1 -2
@@ -138,7 +138,6 @@ static void irda_disconnect_indication(void *instance, void *sap, sk->sk_shutdown |=SEND_SHUTDOWN ; sk->sk_state_change (sk); -sock_orphan (sk);release_sock (sk);/* Close our TSAP.
@@ -1446,7 +1445,7 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,*/ ret =sock_error (sk);if (ret) -break ; + ;else if (sk->sk_shutdown &RCV_SHUTDOWN ) ;else if (noblock)
net/sunrpc/svcauth_unix.c +16 -5
@@ -383,7 +383,10 @@ void svcauth_unix_purge(void)static inline struct ip_map *ip_map_cached_get (struct svc_rqst *rqstp) { -struct ip_map *ipm = rqstp->rq_sock->sk_info_authunix; +struct ip_map *ipm; +struct svc_sock *svsk = rqstp->rq_sock; +spin_lock_bh (&svsk->sk_defer_lock); + ipm = svsk->sk_info_authunix;if (ipm !=NULL ) {if (!cache_valid (&ipm->h)) {/*
@@ -391,12 +394,14 @@ ip_map_cached_get(struct svc_rqst *rqstp)* remembered, e.g. by a second mount from the * same IP address. */ - rqstp->rq_sock->sk_info_authunix =NULL ; + svsk->sk_info_authunix =NULL ; +spin_unlock_bh (&svsk->sk_defer_lock);cache_put (&ipm->h, &ip_map_cache);return NULL ; }cache_get (&ipm->h); } +spin_unlock_bh (&svsk->sk_defer_lock);return ipm; }
@@ -405,9 +410,15 @@ ip_map_cached_put(struct svc_rqst *rqstp, struct ip_map *ipm) {struct svc_sock *svsk = rqstp->rq_sock; -if (svsk->sk_sock->type ==SOCK_STREAM && svsk->sk_info_authunix ==NULL ) - svsk->sk_info_authunix = ipm;/* newly cached, keep the reference */ -else +spin_lock_bh (&svsk->sk_defer_lock); +if (svsk->sk_sock->type ==SOCK_STREAM && + svsk->sk_info_authunix ==NULL ) { +/* newly cached, keep the reference */ + svsk->sk_info_authunix = ipm; + ipm =NULL ; + } +spin_unlock_bh (&svsk->sk_defer_lock); +if (ipm)cache_put (&ipm->h, &ip_map_cache); }
sound/pci/intel8x0.c +4 -1
@@ -2489,7 +2489,10 @@ static int intel8x0_suspend(struct pci_dev *pci, pm_message_t state) }pci_disable_device (pci);pci_save_state (pci); -pci_set_power_state (pci,pci_choose_state (pci, state)); +/* The call below may disable built-in speaker on some laptops +* after S2RAM. So, don't touch it. +*/ +/* pci_set_power_state(pci, pci_choose_state(pci, state)); */ return 0 ; }