Linux 2.6.21.5
Subsystems (37)
We (the -stable team) are announcing the release of the 2.6.21.5 kernel. This has a variety of important fixes, see below for the summary.
I'll also be replying to this message with a copy of the patch between 2.6.21.4 and 2.6.21.5
The updated 2.6.21.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.21.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.21.y.git;a=summarythanks,
-chris
---------
Documentation/hrtimer/timer_stats.txt | 7 - Makefile | 2 arch/i386/kernel/hpet.c | 24 ++++- arch/i386/kernel/reboot.c | 8 + arch/i386/oprofile/nmi_int.c | 17 +++ arch/sparc64/kernel/head.S | 29 +++++- arch/sparc64/kernel/itlb_miss.S | 4 arch/sparc64/kernel/pci_sun4v.c | 36 ++----- arch/sparc64/mm/init.c | 7 + arch/um/os-Linux/start_up.c | 24 +++-- arch/x86_64/mm/init.c | 6 + drivers/acpi/numa.c | 8 - drivers/ata/ahci.c | 10 +- drivers/block/cciss.c | 45 ++++++--- drivers/char/cyclades.c | 1 drivers/char/n_tty.c | 1 drivers/char/tty_io.c | 3 drivers/ide/pci/hpt366.c | 7 + drivers/ieee1394/eth1394.c | 7 - drivers/input/serio/i8042.c | 35 ++++++- drivers/md/bitmap.c | 17 ++- drivers/md/raid0.c | 3 drivers/media/dvb/ttpci/budget-ci.c | 2 drivers/net/e1000/e1000_main.c | 11 +- drivers/net/tg3.c | 5 - drivers/net/wireless/zd1211rw/zd_chip.c | 5 - drivers/net/wireless/zd1211rw/zd_rf.c | 2 drivers/net/wireless/zd1211rw/zd_rf.h | 2 drivers/net/wireless/zd1211rw/zd_rf_al2230.c | 89 +++++++++++++++--- drivers/pci/quirks.c | 1 drivers/scsi/aacraid/aacraid.h | 1 drivers/scsi/aacraid/rx.c | 2 drivers/scsi/aacraid/sa.c | 3 drivers/serial/suncore.c | 6 - drivers/usb/core/message.c | 9 - drivers/video/neofb.c | 30 +++--- fs/compat_ioctl.c | 33 +++++-- fs/fuse/dir.c | 2 fs/ntfs/inode.c | 2 include/acpi/acpi_numa.h | 7 - include/asm-sparc64/tsb.h | 2 include/linux/bootmem.h | 1 include/linux/mii.h | 4 include/linux/pci_ids.h | 5 - include/linux/raid/bitmap.h | 1 include/linux/workqueue.h | 2 include/net/af_unix.h | 8 - kernel/sched.c | 4 kernel/time/tick-broadcast.c | 17 ++- kernel/time/tick-sched.c | 12 +- kernel/time/timer_stats.c | 44 +++++---- lib/Kconfig.debug | 5 - mm/sparse.c | 11 ++ net/bluetooth/hci_sock.c | 6 - net/core/dev.c | 10 +- net/core/net-sysfs.c | 8 + net/core/sock.c | 14 ++ net/core/utils.c | 6 - net/ipv4/Kconfig | 6 - net/ipv4/icmp.c | 12 +- net/ipv4/inet_connection_sock.c | 4 net/ipv4/tcp.c | 3 net/ipv4/xfrm4_input.c | 6 - net/ipv4/xfrm4_mode_tunnel.c | 2 net/ipv6/ip6_fib.c | 8 - net/ipv6/xfrm6_input.c | 6 - net/ipv6/xfrm6_mode_tunnel.c | 1 net/unix/af_unix.c | 127 +++++++++++++++++---------- sound/pci/hda/hda_intel.c | 25 ++++- sound/soc/codecs/wm8750.c | 2 sound/usb/usbquirks.h | 23 ++++ 71 files changed, 610 insertions(+), 288 deletions(-)
Summary of changes from v2.6.21.4 to v2.6.21.5
==============================================
Aaron Durbin (1):
acpi: fix potential call to a freed memory section.
Alan Stern (1):
USB: set the correct Interrupt interval in usb_bulk_msg
Andi Kleen (1):
i386: Fix K8/core2 oprofile on multiple CPUs
Andrew Morton (2):
ntfs_init_locked_inode(): fix array indexing
ALSA: wm8750 typo fix
Antonino A. Daplas (1):
neofb: Fix pseudo_palette array overrun in neofb_setcolreg
Auke Kok (1):
e1000: disable polling before registering netdevice
Björn Steinbrink (1):
timer statistics: fix race
Chris Wright (2):
x86: fix oprofile double free
Linux 2.6.21.5
Daniel Drake (2):
ALSA: usb-audio: explicitly match Logitech QuickCam
zd1211rw: Add AL2230S RF support
Dave Jones (1):
IPV4: Correct rp_filter help text.
David Miller (5):
Fix AF_UNIX OOPS
ICMP: Fix icmp_errors_use_inbound_ifaddr sysctl
NET: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h
SPARC64: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler.
SPARC64: Don't be picky about virtual-dma values on sun4v.
David S. Miller (1):
SPARC64: Fix two bugs wrt. kernel 4MB TSB.
Gerald Britton (1):
cciss: fix pci_driver.shutdown while device is still active
Hugh Dickins (1):
fix compat console unimap regression
Ingo Molnar (1):
timer stats: speedups
Jan Engelhardt (1):
SPARC: Linux always started with 9600 8N1
Jason Gaston (1):
pci_ids: update patch for Intel ICH9M
Jay Cliburn (1):
PCI: quirk disable MSI on via vt3351
Jeff Dike (1):
UML - Improve host PTRACE_SYSEMU check
Jerome Borsboom (1):
NET: parse ip:port strings correctly in in4_pton
Jiri Slaby (1):
Char: cyclades, fix deadlock
Kazunori MIYAZAWA (1):
IPSEC: Fix panic when using inter address familiy IPsec on loopback.
Mark Glines (1):
TCP: Use default 32768-61000 outgoing port range in all cases.
Michael Chan (1):
TG3: Fix link problem on Dell's onboard 5906.
Miklos Szeredi (1):
fuse: fix mknod of regular file
NeilBrown (2):
md: Avoid overflow in raid0 calculation with large components.
md: Don't write more than is required of the last page of a bitmap
Oleg Nesterov (2):
make freezeable workqueues singlethread
tty: fix leakage of -ERESTARTSYS to userland
Oliver Endriss (1):
V4L/DVB (5593): Budget-ci: Fix tuning for TDM 1316 (160..200 MHz)
Roland Scheidegger (1):
Input: i8042 - fix AUX port detection with some chips
Salyzyn, Mark (1):
SCSI: aacraid: Correct sa platform support. (Was: [Bug 8469] Bad EIP value on pentium3 SMP kernel-2.6.21.1)
Satyam Sharma (1):
BLUETOOTH: Fix locking in hci_sock_dev_event().
Sergei Shtylyov (1):
hpt366: don't check enablebits for HPT36x
Stefan Richter (1):
ieee1394: eth1394: bring back a parent device
Stephen Hemminger (1):
NET: Fix race condition about network device name allocation.
Takashi Iwai (2):
ALSA: hda-intel - Probe additional slots only if necessary
ALSA: hda-intel - Fix detection of audio codec on Toshiba A100
Tejun Heo (1):
ahci: disable 64bit dma on sb600
Thomas Gleixner (4):
i386: HPET, check if the counter works
Ignore bogus ACPI info for offline CPUs
NOHZ: Rate limit the local softirq pending warning output Prevent going idle with softirq pending
Tim Gardner (1):
Work around Dell E520 BIOS reboot bug
Vasily Averin (1):
NET: "wrong timeout value" in sk_wait_data() v2
YOSHIFUJI Hideaki (1):
IPV6 ROUTE: No longer handle ::/0 specially.
Zou Nan hai (1):
x86_64: allocate sparsemem memmap above 4G
Documentation/hrtimer/timer_stats.txt +4 -3
@@ -2,9 +2,10 @@ timer_stats - timer usage statistics ------------------------------------ timer_stats is a debugging facility to make the timer (ab)usage in a Linux -system visible to kernel and userspace developers. It is not intended for -production usage as it adds significant overhead to the (hr)timer code and the -(hr)timer data structures. +system visible to kernel and userspace developers. If enabled in the config +but not used it has almost zero runtime overhead, and a relatively small +data structure overhead. Even if collection is enabled runtime all the +locking is per-CPU and lookup is hashed. timer_stats should be used by kernel and userspace developers to verify that their code does not make unduly use of timers. This helps to avoid unnecessary
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 21 -EXTRAVERSION = .4 +EXTRAVERSION = .5 NAME = Nocturnal Monster Puppy # *DOCUMENTATION*
arch/i386/kernel/hpet.c +23 -1
@@ -226,7 +226,8 @@ int __init hpet_enable(void) {unsigned long id;uint64_t hpet_freq; -u64 tmp; +u64 tmp, start, now; +cycle_t t1;if (!is_hpet_capable ())return 0 ;
@@ -273,6 +274,27 @@ int __init hpet_enable(void)/* Start the counter */ hpet_start_counter (); +/* Verify whether hpet counter works */ + t1 =read_hpet (); +rdtscll (start); + +/* +* We don't know the TSC frequency yet, but waiting for +* 200000 TSC cycles is safe: +* 4 GHz == 50us +* 1 GHz == 200us +*/ +do { +rep_nop (); +rdtscll (now); + }while ((now - start) <200000UL ); + +if (t1 ==read_hpet ()) { +printk (KERN_WARNING +"HPET counter not counting. HPET disabled\n" ); + goto out_nohpet; + } +/* Initialize and register HPET clocksource * * hpet period is in femto seconds per cycle
arch/i386/kernel/reboot.c +8 -0
@@ -88,6 +88,14 @@ static int __init set_bios_reboot(struct dmi_system_id *d) }static struct dmi_system_id __initdata reboot_dmi_table[] = { + {/* Handle problems with rebooting on Dell E520's */ + .callback = set_bios_reboot, + .ident ="Dell E520" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Dell DM061" ), + }, + }, {/* Handle problems with rebooting on Dell 1300's */ .callback = set_bios_reboot, .ident ="Dell PowerEdge 1300" ,
arch/i386/oprofile/nmi_int.c +15 -2
@@ -131,7 +131,6 @@ static void nmi_save_registers(void * dummy) {int cpu =smp_processor_id ();struct op_msrs * msrs = &cpu_msrs[cpu]; - model->fill_in_addresses (msrs);nmi_cpu_save_registers (msrs); }
@@ -155,7 +154,7 @@ static int allocate_msrs(void)size_t counters_size =sizeof (struct op_msr ) * model->num_counters;int i; -for_each_online_cpu (i) { +for_each_possible_cpu (i) { cpu_msrs[i].counters =kmalloc (counters_size,GFP_KERNEL );if (!cpu_msrs[i].counters) { success =0 ;
@@ -195,6 +194,7 @@ static struct notifier_block profile_exceptions_nb = {static int nmi_setup (void ) {int err=0 ; +int cpu;if (!allocate_msrs ())return -ENOMEM ;
@@ -207,6 +207,19 @@ static int nmi_setup(void)/* We need to serialize save and setup for HT because the subset * of msrs are distinct for save and setup operations */ + +/* Assume saved/restored counters are the same on all CPUs */ + model->fill_in_addresses (&cpu_msrs[0 ]); +for_each_possible_cpu (cpu) { +if (cpu !=0 ) { +memcpy (cpu_msrs[cpu].counters, cpu_msrs[0 ].counters, +sizeof (struct op_msr ) * model->num_counters); + +memcpy (cpu_msrs[cpu].controls, cpu_msrs[0 ].controls, +sizeof (struct op_msr ) * model->num_controls); + } + + }on_each_cpu (nmi_save_registers,NULL ,0 ,1 );on_each_cpu (nmi_cpu_setup,NULL ,0 ,1 ); nmi_enabled =1 ;
arch/sparc64/kernel/head.S +25 -4
@@ -653,33 +653,54 @@ setup_tba: restore sparc64_boot_end: -#include "ktlb.S" -#include "tsb.S" #include "etrap.S" #include "rtrap.S" #include "winfixup.S" #include "entry.S" #include "sun4v_tlb_miss.S" #include "sun4v_ivec.S" +#include "ktlb.S" +#include "tsb.S" /* * The following skip makes sure the trap table in ttable.S is aligned * on a 32K boundary as required by the v9 specs for TBA register. * * We align to a 32K boundary, then we have the 32K kernel TSB, - * then the 32K aligned trap table. + * the 64K kernel 4MB TSB, and then the 32K aligned trap table. */ 1: .skip 0x4000 + _start - 1b +! 0x0000000000408000 + .globl swapper_tsb swapper_tsb: .skip (32 * 1024) -! 0x0000000000408000 + .globl swapper_4m_tsb +swapper_4m_tsb: + .skip (64 * 1024) + +! 0x0000000000420000 + /* Some care needs to be exercised if you try to move the + * location of the trap table relative to other things. For + * one thing there are br* instructions in some of the + * trap table entires which branch back to code in ktlb.S + * Those instructions can only handle a signed 16-bit + * displacement. + * + * There is a binutils bug (bugzilla #4558) which causes + * the relocation overflow checks for such instructions to + * not be done correctly. So bintuils will not notice the + * error and will instead write junk into the relocation and + * you'll have an unbootable kernel. + */ #include "ttable.S" +! 0x0000000000428000 + #include "systbls.S" .data
arch/sparc64/kernel/itlb_miss.S +2 -2
@@ -11,12 +11,12 @@ /* ITLB ** ICACHE line 2: TSB compare and TLB load */ bne,pn %xcc, tsb_miss_itlb ! Miss mov FAULT_CODE_ITLB, %g3 - andcc %g5, _PAGE_EXEC_4U, %g0 ! Executable? + sethi %hi(_PAGE_EXEC_4U), %g4 + andcc %g5, %g4, %g0 ! Executable? be,pn %xcc, tsb_do_fault nop ! Delay slot, fill me stxa %g5, [%g0] ASI_ITLB_DATA_IN ! Load TLB retry ! Trap done - nop /* ITLB ** ICACHE line 3: */ nop
arch/sparc64/kernel/pci_sun4v.c +10 -26
@@ -12,6 +12,7 @@#include <linux/percpu.h> #include <linux/irq.h> #include <linux/msi.h> +#include <linux/log2.h> #include <asm/pbm.h> #include <asm/iommu.h>
@@ -996,9 +997,8 @@ static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm) {struct pci_iommu *iommu = pbm->iommu;struct property *prop; -unsigned long num_tsb_entries, sz; +unsigned long num_tsb_entries, sz, tsbsize;u32 vdma[2 ], dma_mask, dma_offset; -int tsbsize; prop =of_find_property (pbm->prom_node,"virtual-dma" ,NULL );if (prop) {
@@ -1012,31 +1012,15 @@ static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm) vdma[1 ] =0x80000000 ; } - dma_mask = vdma[0 ]; -switch (vdma[1 ]) { -case 0x20000000 : - dma_mask |=0x1fffffff ; - tsbsize =64 ; -break ; - -case 0x40000000 : - dma_mask |=0x3fffffff ; - tsbsize =128 ; -break ; - -case 0x80000000 : - dma_mask |=0x7fffffff ; - tsbsize =256 ; -break ; - -default : -prom_printf ("PCI-SUN4V: strange virtual-dma size.\n" ); -prom_halt (); +if ((vdma[0 ] | vdma[1 ]) & ~IO_PAGE_MASK ) { +prom_printf ("PCI-SUN4V: strange virtual-dma[%08x:%08x].\n" , + vdma[0 ], vdma[1 ]); +prom_halt (); }; - tsbsize *= (8 *1024 ); - - num_tsb_entries = tsbsize /sizeof (iopte_t); + dma_mask = (roundup_pow_of_two (vdma[1 ]) -1UL ); + num_tsb_entries = vdma[1 ] /IO_PAGE_SIZE ; + tsbsize = num_tsb_entries *sizeof (iopte_t); dma_offset = vdma[0 ];
@@ -1047,7 +1031,7 @@ static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm) iommu->dma_addr_mask = dma_mask;/* Allocate and initialize the free area map. */ - sz = num_tsb_entries /8 ; + sz = (num_tsb_entries +7 ) /8 ; sz = (sz +7UL ) & ~7UL ; iommu->arena.map =kzalloc (sz,GFP_KERNEL );if (!iommu->arena.map) {
arch/sparc64/mm/init.c +5 -2
@@ -60,8 +60,11 @@ unsigned long kern_linear_pte_xor[2] __read_mostly;unsigned long kpte_linear_bitmap[KPTE_BITMAP_BYTES /sizeof (unsigned long )];#ifndef CONFIG_DEBUG_PAGEALLOC -/* A special kernel TSB for 4MB and 256MB linear mappings. */ -struct tsb swapper_4m_tsb[KERNEL_TSB4M_NENTRIES ]; +/* A special kernel TSB for 4MB and 256MB linear mappings. +* Space is allocated for this right after the trap table +* in arch/sparc64/kernel/head.S +*/ +extern struct tsb swapper_4m_tsb[KERNEL_TSB4M_NENTRIES ];#endif #define MAX_BANKS 32
arch/um/os-Linux/start_up.c +16 -8
@@ -144,9 +144,7 @@ static int stop_ptraced_child(int pid, void *stack, int exitcode,int exit_with =WEXITSTATUS (status);if (exit_with ==2 )non_fatal ("check_ptrace : child exited with status 2. " -"Serious trouble happening! Try updating " -"your host skas patch!\nDisabling SYSEMU " -"support." ); +"\nDisabling SYSEMU support.\n" );non_fatal ("check_ptrace : child exited with exitcode %d, while " "expecting %d; status 0x%x\n" , exit_with, exitcode, status);
@@ -209,6 +207,7 @@ __uml_setup("nosysemu", nosysemu_cmd_param,static void __init check_sysemu (void ) {void *stack; +unsigned long regs[MAX_REG_NR ];int pid, n, status, count=0 ;non_fatal ("Checking syscall emulation patch for ptrace..." );
@@ -225,11 +224,20 @@ static void __init check_sysemu(void)fatal ("check_sysemu : expected SIGTRAP, got status = %d" , status); - n =ptrace (PTRACE_POKEUSR , pid,PT_SYSCALL_RET_OFFSET , -os_getpid ()); -if (n <0 ) -fatal_perror ("check_sysemu : failed to modify system call " -"return" ); +if (ptrace (PTRACE_GETREGS , pid,0 , regs) <0 ) +fatal_perror ("check_sysemu : PTRACE_GETREGS failed" ); +if (PT_SYSCALL_NR (regs) != __NR_getpid){ +non_fatal ("check_sysemu got system call number %d, " +"expected %d..." ,PT_SYSCALL_NR (regs), __NR_getpid); + goto fail; + } + + n =ptrace (PTRACE_POKEUSR , pid,PT_SYSCALL_RET_OFFSET ,os_getpid ()); +if (n <0 ){ +non_fatal ("check_sysemu : failed to modify system call " +"return" ); + goto fail; + }if (stop_ptraced_child (pid, stack,0 ,0 ) <0 ) goto fail_stopped;
arch/x86_64/mm/init.c +6 -0
@@ -776,3 +776,9 @@ int in_gate_area_no_task(unsigned long addr) {return (addr >=VSYSCALL_START ) && (addr <VSYSCALL_END ); } + +void *alloc_bootmem_high_node (pg_data_t *pgdat,unsigned long size) +{ +return __alloc_bootmem_core (pgdat->bdata, size, +SMP_CACHE_BYTES , (4UL *1024 *1024 *1024 ),0 ); +}
drivers/acpi/numa.c +4 -4
@@ -40,19 +40,19 @@ static nodemask_t nodes_found_map = NODE_MASK_NONE;#define NID_INVAL -1/* maps to convert between proximity domain and logical node ID */ -int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS ] +static int pxm_to_node_map[MAX_PXM_DOMAINS ] = { [0 ...MAX_PXM_DOMAINS -1 ] =NID_INVAL }; -int __cpuinitdata node_to_pxm_map[MAX_NUMNODES ] +static int node_to_pxm_map[MAX_NUMNODES ] = { [0 ...MAX_NUMNODES -1 ] =PXM_INVAL }; -int __cpuinit pxm_to_node (int pxm) +int pxm_to_node (int pxm) {if (pxm <0 )return NID_INVAL ;return pxm_to_node_map[pxm]; } -int __cpuinit node_to_pxm (int node) +int node_to_pxm (int node) {if (node <0 )return PXM_INVAL ;
drivers/ata/ahci.c +9 -1
@@ -170,6 +170,7 @@ enum {AHCI_FLAG_IGN_IRQ_IF_ERR = (1 <<25 ),/* ignore IRQ_IF_ERR */ AHCI_FLAG_HONOR_PI = (1 <<26 ),/* honor PORTS_IMPL */ AHCI_FLAG_IGN_SERR_INTERNAL = (1 <<27 ),/* ignore SERR_INTERNAL */ + AHCI_FLAG_32BIT_ONLY = (1 << 28), /* force 32bit */ }; struct ahci_cmd_hdr {
@@ -370,7 +371,8 @@ static const struct ata_port_info ahci_port_info[] = { .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |ATA_FLAG_MMIO |ATA_FLAG_PIO_DMA |ATA_FLAG_SKIP_D2H_BSY | - AHCI_FLAG_IGN_SERR_INTERNAL, +AHCI_FLAG_IGN_SERR_INTERNAL | + AHCI_FLAG_32BIT_ONLY, .pio_mask = 0x1f, /* pio0-4 */ .udma_mask = 0x7f, /* udma0-6 ; FIXME */ .port_ops = &ahci_ops,
@@ -1579,6 +1581,12 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) probe_ent->n_ports = cap_n_ports; using_dac = hpriv->cap &HOST_CAP_64 ; +if (using_dac && (probe_ent->port_flags &AHCI_FLAG_32BIT_ONLY )) { +dev_printk (KERN_INFO , &pdev->dev, +"controller can't do 64bit DMA, forcing 32bit\n" ); + using_dac =0 ; + } +if (using_dac && !pci_set_dma_mask (pdev,DMA_64BIT_MASK )) { rc =pci_set_consistent_dma_mask (pdev,DMA_64BIT_MASK );
drivers/block/cciss.c +30 -15
68 lines not on this page · raw message
drivers/char/cyclades.c +1 -0
@@ -1103,6 +1103,7 @@ static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,if (data & info->ignore_status_mask) { info->icount.rx++; +spin_unlock (&cinfo->card_lock);return ; }if (tty_buffer_request_room (tty,1 )) {
drivers/char/n_tty.c +1 -0
@@ -1191,6 +1191,7 @@ static int job_control(struct tty_struct *tty, struct file *file) is_current_pgrp_orphaned())return -EIO ;kill_pgrp (task_pgrp (current),SIGTTIN ,1 ); +set_thread_flag (TIF_SIGPENDING );return -ERESTARTSYS ; } }
drivers/char/tty_io.c +2 -1
@@ -1121,7 +1121,8 @@ int tty_check_change(struct tty_struct * tty)return 0 ;if (is_current_pgrp_orphaned ())return -EIO ; - (void )kill_pgrp (task_pgrp (current),SIGTTOU ,1 ); +kill_pgrp (task_pgrp (current),SIGTTOU ,1 ); +set_thread_flag (TIF_SIGPENDING );return -ERESTARTSYS ; }
drivers/ide/pci/hpt366.c +6 -1
@@ -1,5 +1,5 @@/* -* linux/drivers/ide/pci/hpt366.c Version 1.02 Apr 18, 2007 +* linux/drivers/ide/pci/hpt366.c Version 1.03 May 4, 2007 * * Copyright (C) 1999-2003 Andre Hedrick <[email protected]> * Portions Copyright (C) 2001 Sun Microsystems, Inc.
@@ -1527,7 +1527,12 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)if (rev >2 ) goto init_single; +/* +* HPT36x chips are single channel and +* do not seem to have the channel enable bit... +*/ d->channels =1 ; + d->enablebits[0 ].reg =0 ;if ((dev2 =pci_get_slot (dev->bus, dev->devfn +1 )) !=NULL ) {u8 pin1 =0 , pin2 =0 ;
drivers/ieee1394/eth1394.c +3 -4
@@ -584,10 +584,9 @@ static void ether1394_add_host (struct hpsb_host *host) }SET_MODULE_OWNER (dev); -#if 0 -/* FIXME - Is this the correct parent device anyway? */ -SET_NETDEV_DEV (dev, &host->device); -#endif + +/* This used to be &host->device in Linux 2.6.20 and before. */ +SET_NETDEV_DEV (dev, host->device.parent); priv =netdev_priv (dev);
drivers/input/serio/i8042.c +29 -6
@@ -526,6 +526,33 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)return IRQ_HANDLED ; } +/* +* i8042_toggle_aux - enables or disables AUX port on i8042 via command and +* verifies success by readinng CTR. Used when testing for presence of AUX +* port. +*/ +static int __devinit i8042_toggle_aux (int on) +{ +unsigned char param; +int i; + +if (i8042_command (¶m, + on ?I8042_CMD_AUX_ENABLE :I8042_CMD_AUX_DISABLE )) +return -1 ; + +/* some chips need some time to set the I8042_CTR_AUXDIS bit */ +for (i =0 ; i <100 ; i++) { +udelay (50 ); + +if (i8042_command (¶m,I8042_CMD_CTL_RCTR )) +return -1 ; + +if (!(param &I8042_CTR_AUXDIS ) == on) +return 0 ; + } + +return -1 ; +}/* * i8042_check_aux() applies as much paranoia as it can at detecting
@@ -580,16 +607,12 @@ static int __devinit i8042_check_aux(void)* Bit assignment test - filters out PS/2 i8042's in AT mode */ -if (i8042_command (¶m,I8042_CMD_AUX_DISABLE )) -return -1 ; -if (i8042_command (¶m,I8042_CMD_CTL_RCTR ) || (~param &I8042_CTR_AUXDIS )) { +if (i8042_toggle_aux (0 )) {printk (KERN_WARNING "Failed to disable AUX port, but continuing anyway... Is this a SiS?\n" );printk (KERN_WARNING "If AUX port is really absent please use the 'i8042.noaux' option.\n" ); } -if (i8042_command (¶m,I8042_CMD_AUX_ENABLE )) -return -1 ; -if (i8042_command (¶m,I8042_CMD_CTL_RCTR ) || (param &I8042_CTR_AUXDIS )) +if (i8042_toggle_aux (1 ))return -1 ;/*
drivers/md/bitmap.c +12 -5
@@ -255,19 +255,25 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde } -static int write_sb_page (mddev_t *mddev,long offset,struct page *page,int wait) +static int write_sb_page (struct bitmap *bitmap,struct page *page,int wait) {mdk_rdev_t *rdev;struct list_head *tmp; +mddev_t *mddev = bitmap->mddev; ITERATE_RDEV(mddev, rdev, tmp)if (test_bit (In_sync, &rdev->flags) - && !test_bit (Faulty, &rdev->flags)) + && !test_bit (Faulty, &rdev->flags)) { +int size =PAGE_SIZE ; +if (page->index == bitmap->file_pages-1 ) + size =roundup (bitmap->last_page_size, +bdev_hardsect_size (rdev->bdev));md_super_write (mddev, rdev, - (rdev->sb_offset<<1 ) + offset + (rdev->sb_offset<<1 ) + bitmap->offset + page->index * (PAGE_SIZE /512 ), -PAGE_SIZE , + size, page); + }if (wait)md_super_wait (mddev);
@@ -282,7 +288,7 @@ static int write_page(struct bitmap *bitmap, struct page *page, int wait)struct buffer_head *bh;if (bitmap->file ==NULL ) -return write_sb_page (bitmap->mddev, bitmap->offset, page, wait); +return write_sb_page (bitmap, page, wait); bh =page_buffers (page);
@@ -923,6 +929,7 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) } bitmap->filemap[bitmap->file_pages++] = page; + bitmap->last_page_size = count; } paddr =kmap_atomic (page,KM_USER0 );if (bitmap->flags &BITMAP_HOSTENDIAN )
drivers/md/raid0.c +1 -2
@@ -415,7 +415,7 @@ static int raid0_make_request (request_queue_t *q, struct bio *bio)raid0_conf_t *conf =mddev_to_conf (mddev);struct strip_zone *zone;mdk_rdev_t *tmp_dev; -unsigned long chunk; +sector_t chunk;sector_t block, rsect;const int rw =bio_data_dir (bio);
@@ -470,7 +470,6 @@ static int raid0_make_request (request_queue_t *q, struct bio *bio)sector_div (x, zone->nb_dev); chunk = x; -BUG_ON (x != (sector_t )chunk); x = block >> chunksize_bits; tmp_dev = zone->dev[sector_div (x, zone->nb_dev)];
drivers/media/dvb/ttpci/budget-ci.c +1 -1
@@ -926,7 +926,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc band =1 ; }else if (tuner_frequency <200000000 ) { cp =6 ; - band =2 ; + band =1 ; }else if (tuner_frequency <290000000 ) { cp =3 ; band =2 ;
drivers/net/e1000/e1000_main.c +7 -4
@@ -1153,13 +1153,16 @@ e1000_probe(struct pci_dev *pdev, !e1000_check_mng_mode(&adapter->hw))e1000_get_hw_control (adapter); -strcpy (netdev->name,"eth%d" ); -if ((err =register_netdev (netdev))) - goto err_register; -/* tell the stack to leave us alone until e1000_open() is called */ netif_carrier_off (netdev);netif_stop_queue (netdev); +#ifdef CONFIG_E1000_NAPI +netif_poll_disable (netdev); +#endif + +strcpy (netdev->name,"eth%d" ); +if ((err =register_netdev (netdev))) + goto err_register;DPRINTK (PROBE ,INFO ,"Intel(R) PRO/1000 Network Connection\n" );
drivers/net/tg3.c +3 -2
@@ -64,8 +64,8 @@#define DRV_MODULE_NAME "tg3"#define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.75.1" -#define DRV_MODULE_RELDATE "May 7, 2007" +#define DRV_MODULE_VERSION "3.75.2" +#define DRV_MODULE_RELDATE "June 5, 2007"#define TG3_DEF_MAC_MODE 0#define TG3_DEF_RX_MODE 0
@@ -10942,6 +10942,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)* upon subsystem IDs. */ if (tp->pdev->subsystem_vendor ==PCI_VENDOR_ID_DELL && +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5701 && !(tp->tg3_flags2 &TG3_FLG2_PHY_SERDES )) { tp->tg3_flags |= (TG3_FLAG_USE_MI_INTERRUPT |TG3_FLAG_USE_LINKCHG_REG );
drivers/net/wireless/zd1211rw/zd_chip.c +3 -2
@@ -67,11 +67,12 @@ static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size) i +=scnprint_mac_oui (chip->e2p_mac, buffer+i, size-i); i +=scnprintf (buffer+i, size-i," " ); i +=zd_rf_scnprint_id (&chip->rf, buffer+i, size-i); - i +=scnprintf (buffer+i, size-i," pa%1x %c%c%c%c" , chip->pa_type, + i +=scnprintf (buffer+i, size-i," pa%1x %c%c%c%c%c" , chip->pa_type, chip->patch_cck_gain ?'g' :'-' , chip->patch_cr157 ?'7' :'-' , chip->patch_6m_band_edge ?'6' :'-' , - chip->new_phy_layout ?'N' :'-' ); + chip->new_phy_layout ?'N' :'-' , + chip->al2230s_bit ?'S' :'-' );return i; }
drivers/net/wireless/zd1211rw/zd_rf.c +1 -1
@@ -34,7 +34,7 @@ static const char *rfs[] = { [AL2210_RF] = "AL2210_RF", [MAXIM_NEW_RF] = "MAXIM_NEW_RF", [UW2453_RF] = "UW2453_RF", - [AL2230S_RF] = "AL2230S_RF", + [UNKNOWN_A_RF] = "UNKNOWN_A_RF", [RALINK_RF] = "RALINK_RF", [INTERSIL_RF] = "INTERSIL_RF", [RF2959_RF] = "RF2959_RF",
drivers/net/wireless/zd1211rw/zd_rf.h +1 -1
@@ -26,7 +26,7 @@#define AL2210_RF 0x7#define MAXIM_NEW_RF 0x8#define UW2453_RF 0x9 -#define AL2230S_RF 0xa +#define UNKNOWN_A_RF 0xa#define RALINK_RF 0xb#define INTERSIL_RF 0xc#define RF2959_RF 0xd
drivers/net/wireless/zd1211rw/zd_rf_al2230.c +73 -16
172 lines not on this page · raw message
drivers/pci/quirks.c +1 -0
@@ -1751,6 +1751,7 @@ static void __init quirk_disable_all_msi(struct pci_dev *dev)DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_SERVERWORKS ,PCI_DEVICE_ID_SERVERWORKS_GCNB_LE , quirk_disable_all_msi);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_RS400_200 , quirk_disable_all_msi);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_RS480 , quirk_disable_all_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_VT3351 , quirk_disable_all_msi);/* Disable MSI on chipsets that are known to not support it */ static void __devinit quirk_disable_msi (struct pci_dev *dev)
drivers/scsi/aacraid/aacraid.h +1 -0
@@ -1840,6 +1840,7 @@ struct aac_driver_ident* aac_get_driver_ident(int devtype);int aac_get_adapter_info (struct aac_dev * dev);int aac_send_shutdown (struct aac_dev *dev);int aac_probe_container (struct aac_dev *dev,int cid); +int aac_rx_deliver_producer (struct fib * fib);extern int numacb;extern int acbsize;extern char aac_driver_version[];
drivers/scsi/aacraid/rx.c +1 -1
@@ -378,7 +378,7 @@ static int aac_rx_check_health(struct aac_dev *dev)* * Will send a fib, returning 0 if successful. */ -static int aac_rx_deliver_producer (struct fib * fib) +int aac_rx_deliver_producer (struct fib * fib) {struct aac_dev *dev = fib->dev;struct aac_queue *q = &dev->queues->queue[AdapNormCmdQueue];
drivers/scsi/aacraid/sa.c +2 -1
@@ -5,7 +5,7 @@* based on the old aacraid driver that is.. * Adaptec aacraid device driver for Linux. * -* Copyright (c) 2000 Adaptec, Inc. ([email protected]) +* Copyright (c) 2000-2007 Adaptec, Inc. ([email protected]) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -368,6 +368,7 @@ int aac_sa_init(struct aac_dev *dev) dev->a_ops.adapter_sync_cmd = sa_sync_cmd; dev->a_ops.adapter_check_health = aac_sa_check_health; dev->a_ops.adapter_intr = aac_sa_intr; + dev->a_ops.adapter_deliver = aac_rx_deliver_producer; dev->a_ops.adapter_ioremap = aac_sa_ioremap;/*
drivers/serial/suncore.c +3 -3
@@ -30,9 +30,9 @@ void sunserial_console_termios(struct console *con) {char mode[16 ], buf[16 ], *s; -char *mode_prop ="ttyX-mode" ; -char *cd_prop ="ttyX-ignore-cd" ; -char *dtr_prop ="ttyX-rts-dtr-off" ; +char mode_prop[] ="ttyX-mode" ; +char cd_prop[] ="ttyX-ignore-cd" ; +char dtr_prop[] ="ttyX-rts-dtr-off" ;char *ssp_console_modes_prop ="ssp-console-modes" ;int baud, bits, stop, cflag;char parity;
drivers/usb/core/message.c +2 -7
@@ -221,15 +221,10 @@ int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,if ((ep->desc.bmAttributes &USB_ENDPOINT_XFERTYPE_MASK ) ==USB_ENDPOINT_XFER_INT ) { -int interval; - -if (usb_dev->speed ==USB_SPEED_HIGH ) - interval =1 <<min (15 , ep->desc.bInterval -1 ); -else - interval = ep->desc.bInterval; pipe = (pipe & ~(3 <<30 )) | (PIPE_INTERRUPT <<30 );usb_fill_int_urb (urb, usb_dev, pipe, data, len, - usb_api_blocking_completion,NULL , interval); + usb_api_blocking_completion,NULL , + ep->desc.bInterval); }else usb_fill_bulk_urb (urb, usb_dev, pipe, data, len, usb_api_blocking_completion,NULL );
drivers/video/neofb.c +16 -14
@@ -1285,34 +1285,36 @@ static int neofb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,if (regno >= fb->cmap.len || regno >255 )return -EINVAL ; -switch (fb->var.bits_per_pixel) { -case 8 : +if (fb->var.bits_per_pixel <=8 ) {outb (regno,0x3c8 );outb (red >>10 ,0x3c9 );outb (green >>10 ,0x3c9 );outb (blue >>10 ,0x3c9 ); -break ; -case 16 : - ((u32 *) fb->pseudo_palette)[regno] = + }else if (regno <16 ) { +switch (fb->var.bits_per_pixel) { +case 16 : + ((u32 *) fb->pseudo_palette)[regno] = ((red &0xf800 )) | ((green &0xfc00 ) >>5 ) | ((blue &0xf800 ) >>11 ); -break ; -case 24 : - ((u32 *) fb->pseudo_palette)[regno] = +break ; +case 24 : + ((u32 *) fb->pseudo_palette)[regno] = ((red &0xff00 ) <<8 ) | ((green &0xff00 )) | ((blue &0xff00 ) >>8 ); -break ; +break ;#ifdef NO_32BIT_SUPPORT_YET -case 32 : - ((u32 *) fb->pseudo_palette)[regno] = +case 32 : + ((u32 *) fb->pseudo_palette)[regno] = ((transp &0xff00 ) <<16 ) | ((red &0xff00 ) <<8 ) | ((green &0xff00 )) | ((blue &0xff00 ) >>8 ); -break ; +break ;#endif -default : -return 1 ; +default : +return 1 ; + } } +return 0 ; }
fs/compat_ioctl.c +25 -8
@@ -1178,6 +1178,7 @@ static int vt_check(struct file *file) {struct tty_struct *tty;struct inode *inode = file->f_path.dentry->d_inode; +struct vc_data *vc;if (file->f_op->ioctl != tty_ioctl)return -EINVAL ;
@@ -1188,12 +1189,16 @@ static int vt_check(struct file *file)if (tty->driver->ioctl != vt_ioctl)return -EINVAL ; - + + vc = (struct vc_data *)tty->driver_data; +if (!vc_cons_allocated (vc->vc_num))/* impossible? */ +return -ENOIOCTLCMD ; +/* * To have permissions to do most of the vt ioctls, we either have -* to be the owner of the tty, or super-user. +* to be the owner of the tty, or have CAP_SYS_TTY_CONFIG. */ -if (current->signal->tty == tty ||capable (CAP_SYS_ADMIN )) +if (current->signal->tty == tty ||capable (CAP_SYS_TTY_CONFIG ))return 1 ;return 0 ; }
@@ -1294,16 +1299,28 @@ static int do_unimap_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg,struct unimapdesc32 tmp;struct unimapdesc32 __user *user_ud =compat_ptr (arg);int perm =vt_check (file); - -if (perm <0 )return perm; +struct vc_data *vc; + +if (perm <0 ) +return perm;if (copy_from_user (&tmp, user_ud,sizeof tmp))return -EFAULT ; +if (tmp.entries) +if (!access_ok (VERIFY_WRITE ,compat_ptr (tmp.entries), + tmp.entry_ct*sizeof (struct unipair ))) +return -EFAULT ; + vc = ((struct tty_struct *)file->private_data)->driver_data;switch (cmd) {case PIO_UNIMAP : -if (!perm)return -EPERM ; -return con_set_unimap (vc_cons[fg_console].d, tmp.entry_ct,compat_ptr (tmp.entries)); +if (!perm) +return -EPERM ; +return con_set_unimap (vc, tmp.entry_ct, +compat_ptr (tmp.entries));case GIO_UNIMAP : -return con_get_unimap (vc_cons[fg_console].d, tmp.entry_ct, &(user_ud->entry_ct),compat_ptr (tmp.entries)); +if (!perm && fg_console != vc->vc_num) +return -EPERM ; +return con_get_unimap (vc, tmp.entry_ct, &(user_ud->entry_ct), +compat_ptr (tmp.entries)); }return 0 ; }
fs/fuse/dir.c +1 -1
@@ -485,7 +485,7 @@ static int fuse_mknod(struct inode *dir, struct dentry *entry, int mode,static int fuse_create (struct inode *dir,struct dentry *entry,int mode,struct nameidata *nd) { -if (nd && (nd->flags &LOOKUP_CREATE )) { +if (nd && (nd->flags &LOOKUP_OPEN )) {int err =fuse_create_open (dir, entry, mode, nd);if (err != -ENOSYS )return err;
fs/ntfs/inode.c +1 -1
@@ -141,7 +141,7 @@ static int ntfs_init_locked_inode(struct inode *vi, ntfs_attr *na)if (!ni->name)return -ENOMEM ;memcpy (ni->name, na->name, i); - ni->name[i] =0 ; + ni->name[na->name_len] =0 ; }return 0 ; }
include/acpi/acpi_numa.h +2 -5
@@ -11,11 +11,8 @@#define MAX_PXM_DOMAINS (256)/* Old pxm spec is defined 8 bit */ #endif -extern int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS ]; -extern int __cpuinitdata node_to_pxm_map[MAX_NUMNODES ]; - -extern int __cpuinit pxm_to_node (int ); -extern int __cpuinit node_to_pxm (int ); +extern int pxm_to_node (int ); +extern int node_to_pxm (int );extern int __cpuinit acpi_map_pxm_to_node (int );extern void __cpuinit acpi_unmap_pxm_to_node (int );
include/asm-sparc64/tsb.h +1 -1
@@ -271,7 +271,7 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;#define KERN_TSB4M_LOOKUP_TL1 (TAG ,REG1 ,REG2 ,REG3 ,REG4 ,OK_LABEL ) \ sethi %hi(swapper_4m_tsb), REG1; \ or REG1, %lo(swapper_4m_tsb), REG1; \ - and TAG, (KERNEL_TSB_NENTRIES - 1), REG2; \ + and TAG, (KERNEL_TSB4M_NENTRIES - 1), REG2; \ sllx REG2, 4, REG2; \ add REG1, REG2, REG2; \ KTSB_LOAD_QUAD(REG2, REG3); \
include/linux/bootmem.h +1 -0
@@ -59,6 +59,7 @@ extern void *__alloc_bootmem_core(struct bootmem_data *bdata,unsigned long align, unsigned long goal, unsigned long limit); +extern void *alloc_bootmem_high_node (pg_data_t *pgdat,unsigned long size);#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE extern void reserve_bootmem (unsigned long addr,unsigned long size);
include/linux/mii.h +2 -2
@@ -56,8 +56,8 @@#define BMSR_ANEGCOMPLETE 0x0020/* Auto-negotiation complete */ #define BMSR_RESV 0x00c0/* Unused... */ #define BMSR_ESTATEN 0x0100/* Extended Status in R15 */ -#define BMSR_100FULL2 0x0200/* Can do 100BASE-T2 HDX */ -#define BMSR_100HALF2 0x0400/* Can do 100BASE-T2 FDX */ +#define BMSR_100HALF2 0x0200/* Can do 100BASE-T2 HDX */ +#define BMSR_100FULL2 0x0400/* Can do 100BASE-T2 FDX */ #define BMSR_10HALF 0x0800/* Can do 10mbps, half-duplex */ #define BMSR_10FULL 0x1000/* Can do 10mbps, full-duplex */ #define BMSR_100HALF 0x2000/* Can do 100mbps, half-duplex */
include/linux/pci_ids.h +3 -2
@@ -1287,6 +1287,7 @@#define PCI_DEVICE_ID_VIA_P4M800CE 0x0314#define PCI_DEVICE_ID_VIA_P4M890 0x0327#define PCI_DEVICE_ID_VIA_VT3336 0x0336 +#define PCI_DEVICE_ID_VIA_VT3351 0x0351#define PCI_DEVICE_ID_VIA_8371_0 0x0391#define PCI_DEVICE_ID_VIA_8501_0 0x0501#define PCI_DEVICE_ID_VIA_82C561 0x0561
@@ -2259,11 +2260,11 @@#define PCI_DEVICE_ID_INTEL_ICH8_5 0x283e#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850#define PCI_DEVICE_ID_INTEL_ICH9_0 0x2910 -#define PCI_DEVICE_ID_INTEL_ICH9_1 0x2911 +#define PCI_DEVICE_ID_INTEL_ICH9_1 0x2917#define PCI_DEVICE_ID_INTEL_ICH9_2 0x2912#define PCI_DEVICE_ID_INTEL_ICH9_3 0x2913#define PCI_DEVICE_ID_INTEL_ICH9_4 0x2914 -#define PCI_DEVICE_ID_INTEL_ICH9_5 0x2915 +#define PCI_DEVICE_ID_INTEL_ICH9_5 0x2919#define PCI_DEVICE_ID_INTEL_ICH9_6 0x2930#define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340#define PCI_DEVICE_ID_INTEL_82830_HB 0x3575
include/linux/raid/bitmap.h +1 -0
@@ -232,6 +232,7 @@ struct bitmap {struct page **filemap;/* list of cache pages for the file */ unsigned long *filemap_attr;/* attributes associated w/ filemap pages */ unsigned long file_pages;/* number of pages in the file */ +int last_page_size;/* bytes in the last page */ unsigned long flags;
include/linux/workqueue.h +1 -1
@@ -162,7 +162,7 @@ extern struct workqueue_struct *__create_workqueue(const char *name,int singlethread, int freezeable);#define create_workqueue (name) __create_workqueue((name), 0, 0) -#define create_freezeable_workqueue (name) __create_workqueue((name), 0, 1) +#define create_freezeable_workqueue (name) __create_workqueue((name), 1, 1)#define create_singlethread_workqueue (name) __create_workqueue((name), 1, 0)extern void destroy_workqueue (struct workqueue_struct *wq);
include/net/af_unix.h +3 -5
@@ -62,13 +62,11 @@ struct unix_skb_parms {#define UNIXCREDS (skb) (&UNIXCB((skb)).creds)#define UNIXSID (skb) (&UNIXCB((skb)).secid) -#define unix_state_rlock (s) spin_lock(&unix_sk(s)->lock) -#define unix_state_runlock (s) spin_unlock(&unix_sk(s)->lock) -#define unix_state_wlock (s) spin_lock(&unix_sk(s)->lock) -#define unix_state_wlock_nested (s) \ +#define unix_state_lock (s) spin_lock(&unix_sk(s)->lock) +#define unix_state_unlock (s) spin_unlock(&unix_sk(s)->lock) +#define unix_state_lock_nested (s) \ spin_lock_nested(&unix_sk(s)->lock, \ SINGLE_DEPTH_NESTING) -#define unix_state_wunlock (s) spin_unlock(&unix_sk(s)->lock)#ifdef __KERNEL__/* The AF_UNIX socket */
kernel/sched.c +1 -3
@@ -4545,9 +4545,7 @@ int __sched cond_resched_softirq(void)BUG_ON (!in_softirq ());if (need_resched () && system_state ==SYSTEM_RUNNING ) { -raw_local_irq_disable (); -_local_bh_enable (); -raw_local_irq_enable (); +local_bh_enable ();__cond_resched ();local_bh_disable ();return 1 ;
kernel/time/tick-broadcast.c +12 -5
@@ -243,11 +243,18 @@ void tick_broadcast_on_off(unsigned long reason, int *oncpu) {int cpu =get_cpu (); -if (cpu == *oncpu) -tick_do_broadcast_on_off (&reason); -else -smp_call_function_single (*oncpu, tick_do_broadcast_on_off, - &reason,1 ,1 ); +if (!cpu_isset (*oncpu, cpu_online_map)) { +printk (KERN_ERR "tick-braodcast: ignoring broadcast for " +"offline CPU #%d\n" , *oncpu); + }else { + +if (cpu == *oncpu) +tick_do_broadcast_on_off (&reason); +else +smp_call_function_single (*oncpu, + tick_do_broadcast_on_off, + &reason,1 ,1 ); + }put_cpu (); }
kernel/time/tick-sched.c +9 -3
@@ -167,9 +167,15 @@ void tick_nohz_stop_sched_tick(void) goto end; cpu =smp_processor_id (); -if (unlikely (local_softirq_pending ())) -printk (KERN_ERR "NOHZ: local_softirq_pending %02x\n" , -local_softirq_pending ()); +if (unlikely (local_softirq_pending ())) { +static int ratelimit; + +if (ratelimit <10 ) { +printk (KERN_ERR "NOHZ: local_softirq_pending %02x\n" , +local_softirq_pending ()); + ratelimit++; + } + } now =ktime_get ();/*
kernel/time/timer_stats.c +27 -17
82 lines not on this page · raw message
lib/Kconfig.debug +4 -1
@@ -143,7 +143,10 @@ config TIMER_STATS reprogrammed. The statistics can be read from /proc/timer_stats. The statistics collection is started by writing 1 to /proc/timer_stats, writing 0 stops it. This feature is useful to collect information - about timer usage patterns in kernel and userspace. + about timer usage patterns in kernel and userspace. This feature + is lightweight if enabled in the kernel config but not activated + (it defaults to deactivated on bootup and will only be activated + if some application like powertop activates it explicitly). config DEBUG_SLAB bool "Debug slab memory allocations"
mm/sparse.c +11 -0
@@ -209,6 +209,12 @@ static int sparse_init_one_section(struct mem_section *ms,return 1 ; } +__attribute__((weak)) +void *alloc_bootmem_high_node (pg_data_t *pgdat,unsigned long size) +{ +return NULL ; +} +static struct page *sparse_early_mem_map_alloc (unsigned long pnum) {struct page *map;
@@ -219,6 +225,11 @@ static struct page *sparse_early_mem_map_alloc(unsigned long pnum)if (map)return map; + map =alloc_bootmem_high_node (NODE_DATA (nid), +sizeof (struct page ) *PAGES_PER_SECTION ); +if (map) +return map; + map =alloc_bootmem_node (NODE_DATA (nid),sizeof (struct page ) *PAGES_PER_SECTION );if (map)
net/bluetooth/hci_sock.c +4 -2
@@ -656,7 +656,8 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event,/* Detach sockets from device */ read_lock (&hci_sk_list.lock);sk_for_each (sk, node, &hci_sk_list.head) { -lock_sock (sk); +local_bh_disable (); +bh_lock_sock_nested (sk);if (hci_pi (sk)->hdev == hdev) {hci_pi (sk)->hdev =NULL ; sk->sk_err =EPIPE ;
@@ -665,7 +666,8 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event,hci_dev_put (hdev); } -release_sock (sk); +bh_unlock_sock (sk); +local_bh_enable (); }read_unlock (&hci_sk_list.lock); }
net/core/dev.c +6 -4
@@ -3135,7 +3135,6 @@ void netdev_run_todo(void)continue ; } -netdev_unregister_sysfs (dev); dev->reg_state =NETREG_UNREGISTERED ;netdev_wait_allrefs (dev);
@@ -3146,11 +3145,11 @@ void netdev_run_todo(void)BUG_TRAP (!dev->ip6_ptr);BUG_TRAP (!dev->dn_ptr); -/* It must be the very last action, -* after this 'dev' may point to freed up memory. -*/ if (dev->destructor) dev->destructor (dev); + +/* Free network device */ +kobject_put (&dev->dev.kobj); } out:
@@ -3305,6 +3304,9 @@ void unregister_netdevice(struct net_device *dev)/* Notifier chain MUST detach us from master device. */ BUG_TRAP (!dev->master); +/* Remove entries from sysfs */ +netdev_unregister_sysfs (dev); +/* Finish processing unregister after unlock */ net_set_todo (dev);
net/core/net-sysfs.c +7 -1
@@ -451,9 +451,15 @@ static struct class net_class = {#endif }; +/* Delete sysfs entries but hold kobject reference until after all +* netdev references are gone. +*/ void netdev_unregister_sysfs (struct net_device * net) { -device_del (&(net->dev)); +struct device *dev = &(net->dev); + +kobject_get (&dev->kobj); +device_del (dev); }/* Create sysfs entries for network device. */
net/core/sock.c +13 -1
@@ -204,7 +204,19 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)return -EINVAL ;if (copy_from_user (&tv, optval,sizeof (tv)))return -EFAULT ; - +if (tv.tv_usec <0 || tv.tv_usec >=USEC_PER_SEC ) +return -EDOM ; + +if (tv.tv_sec <0 ) { +static int warned =0 ; + *timeo_p =0 ; +if (warned <10 &&net_ratelimit ()) + warned++; +printk (KERN_INFO "sock_set_timeout: `%s' (pid %d) " +"tries to set negative timeout\n" , + current->comm, current->pid); +return 0 ; + } *timeo_p =MAX_SCHEDULE_TIMEOUT ;if (tv.tv_sec ==0 && tv.tv_usec ==0 )return 0 ;
net/core/utils.c +3 -3
@@ -137,16 +137,16 @@ int in4_pton(const char *src, int srclen,while (1 ) {int c; c =xdigit2bin (srclen >0 ? *s :'\0' , delim); -if (!(c & (IN6PTON_DIGIT |IN6PTON_DOT |IN6PTON_DELIM ))) { +if (!(c & (IN6PTON_DIGIT |IN6PTON_DOT |IN6PTON_DELIM |IN6PTON_COLON_MASK ))) { goto out; } -if (c & (IN6PTON_DOT |IN6PTON_DELIM )) { +if (c & (IN6PTON_DOT |IN6PTON_DELIM |IN6PTON_COLON_MASK )) {if (w ==0 ) goto out; *d++ = w &0xff ; w =0 ; i++; -if (c &IN6PTON_DELIM ) { +if (c & (IN6PTON_DELIM |IN6PTON_COLON_MASK )) {if (i !=4 ) goto out;break ;
net/ipv4/Kconfig +3 -3
@@ -43,11 +43,11 @@ config IP_ADVANCED_ROUTER asymmetric routing (packets from you to a host take a different path than packets from that host to you) or if you operate a non-routing host which has several IP addresses on different interfaces. To turn - rp_filter off use: + rp_filter on use: - echo 0 > /proc/sys/net/ipv4/conf/<device>/rp_filter + echo 1 > /proc/sys/net/ipv4/conf/<device>/rp_filter or - echo 0 > /proc/sys/net/ipv4/conf/all/rp_filter + echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter If unsure, say N here.
net/ipv4/icmp.c +9 -3
@@ -513,9 +513,15 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) saddr = iph->daddr;if (!(rt->rt_flags &RTCF_LOCAL )) { -if (sysctl_icmp_errors_use_inbound_ifaddr) - saddr =inet_select_addr (skb_in->dev,0 ,RT_SCOPE_LINK ); -else +struct net_device *dev =NULL ; + +if (rt->fl.iif && sysctl_icmp_errors_use_inbound_ifaddr) + dev =dev_get_by_index (rt->fl.iif); + +if (dev) { + saddr =inet_select_addr (dev,0 ,RT_SCOPE_LINK ); +dev_put (dev); + }else saddr =0 ; }
net/ipv4/inet_connection_sock.c +1 -3
@@ -31,10 +31,8 @@ EXPORT_SYMBOL(inet_csk_timer_bug_msg);/* * This array holds the first and last local port number. -* For high-usage systems, use sysctl to change this to -* 32768-61000 */ -int sysctl_local_port_range[2 ] = {1024 ,4999 }; +int sysctl_local_port_range[2 ] = {32768 ,61000 };int inet_csk_bind_conflict (const struct sock *sk,const struct inet_bind_bucket *tb)
net/ipv4/tcp.c +0 -3
@@ -2445,13 +2445,10 @@ void __init tcp_init(void) order++) ;if (order >=4 ) { - sysctl_local_port_range[0 ] =32768 ; - sysctl_local_port_range[1 ] =61000 ; tcp_death_row.sysctl_max_tw_buckets =180000 ; sysctl_tcp_max_orphans =4096 << (order -4 ); sysctl_max_syn_backlog =1024 ; }else if (order <3 ) { - sysctl_local_port_range[0 ] =1024 * (3 - order); tcp_death_row.sysctl_max_tw_buckets >>= (3 - order); sysctl_tcp_max_orphans >>= (3 - order); sysctl_max_syn_backlog =128 ;
net/ipv4/xfrm4_input.c +2 -4
@@ -138,10 +138,8 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)nf_reset (skb);if (decaps) { -if (!(skb->dev->flags&IFF_LOOPBACK )) { -dst_release (skb->dst); - skb->dst =NULL ; - } +dst_release (skb->dst); + skb->dst =NULL ;netif_rx (skb);return 0 ; }else {
net/ipv4/xfrm4_mode_tunnel.c +2 -0
@@ -84,6 +84,8 @@ static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) top_iph->saddr = x->props.saddr.a4; top_iph->daddr = x->id.daddr.a4; + skb->protocol =htons (ETH_P_IP ); +memset (&(IPCB (skb)->opt),0 ,sizeof (struct ip_options ));return 0 ; }
net/ipv6/ip6_fib.c +0 -8
@@ -619,14 +619,6 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, ins = &fn->leaf; -if (fn->fn_flags&RTN_TL_ROOT && - fn->leaf == &ip6_null_entry && - !(rt->rt6i_flags & (RTF_DEFAULT |RTF_ADDRCONF )) ){ - fn->leaf = rt; - rt->u.dst.rt6_next =NULL ; - goto out; - } -for (iter = fn->leaf; iter; iter=iter->u.dst.rt6_next) {/* * Search for duplicates
net/ipv6/xfrm6_input.c +2 -4
@@ -104,10 +104,8 @@ int xfrm6_rcv_spi(struct sk_buff *skb, __be32 spi)nf_reset (skb);if (decaps) { -if (!(skb->dev->flags&IFF_LOOPBACK )) { -dst_release (skb->dst); - skb->dst =NULL ; - } +dst_release (skb->dst); + skb->dst =NULL ;netif_rx (skb);return -1 ; }else {
net/ipv6/xfrm6_mode_tunnel.c +1 -0
@@ -80,6 +80,7 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) top_iph->hop_limit =dst_metric (dst->child,RTAX_HOPLIMIT );ipv6_addr_copy (&top_iph->saddr, (struct in6_addr *)&x->props.saddr);ipv6_addr_copy (&top_iph->daddr, (struct in6_addr *)&x->id.daddr); + skb->protocol =htons (ETH_P_IPV6 );return 0 ; }
net/unix/af_unix.c +80 -47
373 lines not on this page · raw message
sound/pci/hda/hda_intel.c +20 -5
@@ -198,6 +198,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };#define RIRB_INT_MASK 0x05/* STATESTS int mask: SD2,SD1,SD0 */ +#define AZX_MAX_CODECS 3#define STATESTS_INT_MASK 0x07/* SD_CTL bits */
@@ -978,7 +979,7 @@ static unsigned int azx_max_codecs[] __devinitdata = {static int __devinit azx_codec_create (struct azx *chip,const char *model) {struct hda_bus_template bus_temp; -int c, codecs, err; +int c, codecs, audio_codecs, err;memset (&bus_temp,0 ,sizeof (bus_temp)); bus_temp.private_data = chip;
@@ -990,16 +991,30 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)if ((err =snd_hda_bus_new (chip->card, &bus_temp, &chip->bus)) <0 )return err; - codecs =0 ; -for (c =0 ; c < azx_max_codecs[chip->driver_type]; c++) { + codecs = audio_codecs =0 ; +for (c =0 ; c <AZX_MAX_CODECS ; c++) {if ((chip->codec_mask & (1 << c)) & probe_mask) { - err =snd_hda_codec_new (chip->bus, c,NULL ); +struct hda_codec *codec; + err =snd_hda_codec_new (chip->bus, c, &codec);if (err <0 )continue ; codecs++; +if (codec->afg) + audio_codecs++; } } -if (! codecs) { +if (!audio_codecs) { +/* probe additional slots if no codec is found */ +for (; c < azx_max_codecs[chip->driver_type]; c++) { +if ((chip->codec_mask & (1 << c)) & probe_mask) { + err =snd_hda_codec_new (chip->bus, c,NULL ); +if (err <0 ) +continue ; + codecs++; + } + } + } +if (!codecs) { snd_printk(KERN_ERR SFX "no codecs initialized\n");return -ENXIO ; }
sound/soc/codecs/wm8750.c +1 -1
@@ -808,7 +808,7 @@ static int wm8750_init(struct snd_soc_device *socdev) codec->dai = &wm8750_dai; codec->num_dai =1 ; codec->reg_cache_size =sizeof (wm8750_reg); - codec->reg_cache =kmemdup (wm8750_reg,sizeof (wm8750_reg),GFP_KRENEL ); + codec->reg_cache =kmemdup (wm8750_reg,sizeof (wm8750_reg),GFP_KERNEL );if (codec->reg_cache ==NULL )return -ENOMEM ;
sound/usb/usbquirks.h +23 -0
@@ -40,6 +40,29 @@ .bInterfaceClass = USB_CLASS_VENDOR_SPEC/* +* Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface +* class matches do not take effect without an explicit ID match. +*/ +{ + .match_flags =USB_DEVICE_ID_MATCH_DEVICE | +USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x08f0, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass =USB_SUBCLASS_AUDIO_CONTROL +}, +{ + .match_flags =USB_DEVICE_ID_MATCH_DEVICE | +USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x08f6, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass =USB_SUBCLASS_AUDIO_CONTROL +}, + +/* * Yamaha devices */
Quoted 10 lines · Chris Wright
We (the -stable team) are announcing the release of the 2.6.21.5 kernel. This has a variety of important fixes, see below for the summary.
I'll also be replying to this message with a copy of the patch between 2.6.21.4 and 2.6.21.5
The updated 2.6.21.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.21.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.21.y.git;a=summary
While linux-2.6.21.y is moving forward, it would appear that linux-2.6-stable is back several releases?
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=summary
shows 2.6.21.1 as the last 2.6.21.Y release. Is that intentional?
Thanks,
Nish
Quoted 2 lines · * Nish Aravamudan ([email protected]) wrote:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=summary
shows 2.6.21.1 as the last 2.6.21.Y release. Is that intentional?
Updated, thanks.
-chris