Linux 2.6.24.5
Subsystems (40)
We (the -stable team) are announcing the release of the 2.6.24.5 kernel.
It fixes a large number of different bugs and all users of the 2.6.24 series are encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.24.4 and 2.6.24.5
The updated 2.6.24.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.24.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.24.y.git;a=summarythanks,
-chris
--------
Makefile | 4 - arch/parisc/kernel/firmware.c | 27 +++++++---- arch/parisc/kernel/pdc_cons.c | 19 +++++++- arch/parisc/kernel/signal.c | 3 - arch/sparc64/kernel/ptrace.c | 4 + arch/sparc64/kernel/signal.c | 2 arch/sparc64/mm/tlb.c | 3 - arch/x86/kernel/machine_kexec_64.c | 1 arch/x86/xen/enlighten.c | 42 ++++++++++-------- arch/x86/xen/xen-asm.S | 9 +++ crypto/xcbc.c | 17 +++---- drivers/acpi/bus.c | 7 +-- drivers/acpi/processor_core.c | 2 drivers/ata/libata-core.c | 38 ++++++++++------ drivers/firmware/dmi_scan.c | 2 drivers/hwmon/w83781d.c | 21 ++++++--- drivers/macintosh/via-pmu.c | 2 drivers/md/md.c | 12 ----- drivers/md/raid5.c | 51 ++++++++++++---------- drivers/media/dvb/dvb-usb/ttusb2.c | 1 drivers/media/dvb/frontends/tda10086.c | 28 +++++++++--- drivers/media/dvb/frontends/tda10086.h | 3 + drivers/media/dvb/ttpci/budget.c | 1 drivers/media/video/ivtv/ivtv-driver.c | 3 + drivers/media/video/saa7134/saa7134-dvb.c | 1 drivers/mtd/chips/cfi_cmdset_0001.c | 10 ++-- drivers/mtd/devices/block2mtd.c | 1 drivers/net/macb.c | 2 drivers/net/plip.c | 7 +-- drivers/net/pppol2tp.c | 69 ++++++++++++++++-------------- drivers/net/sis190.c | 15 ++++-- drivers/net/sungem.c | 2 drivers/pci/quirks.c | 11 ++-- drivers/pnp/pnpacpi/rsparser.c | 8 +-- drivers/uio/uio.c | 2 drivers/usb/core/message.c | 5 +- drivers/usb/core/quirks.c | 3 + drivers/usb/serial/keyspan.h | 4 + drivers/usb/serial/ti_usb_3410_5052.c | 4 - drivers/usb/serial/visor.c | 2 drivers/usb/storage/transport.c | 3 - drivers/usb/storage/unusual_devs.h | 11 ++++ drivers/video/fbmem.c | 1 fs/buffer.c | 13 ++--- fs/dcache.c | 3 - fs/hfsplus/dir.c | 23 ++++++---- fs/inotify.c | 30 ++++++------- fs/locks.c | 48 ++++++++++++-------- fs/signalfd.c | 7 ++- include/asm-parisc/futex.h | 10 +++- include/asm-parisc/pdc.h | 3 - include/asm-sparc64/backoff.h | 3 - include/linux/ethtool.h | 1 include/linux/percpu.h | 2 include/linux/sched.h | 6 ++ include/linux/security.h | 3 - include/linux/time.h | 4 + include/linux/usb/quirks.h | 3 + include/linux/usb_usual.h | 4 + kernel/sched.c | 43 ++++++++++++++++++ kernel/timer.c | 10 +++- mm/allocpercpu.c | 15 ++++++ mm/slab.c | 4 - net/8021q/vlan.c | 2 net/ax25/ax25_out.c | 13 ++++- net/bluetooth/hci_core.c | 4 - net/core/dev.c | 4 - net/core/netpoll.c | 6 +- net/ipv4/tcp.c | 4 - net/ipv4/tcp_output.c | 2 net/ipv6/netfilter/nf_conntrack_reasm.c | 2 net/llc/af_llc.c | 3 + net/sched/sch_generic.c | 18 ++++++- net/sched/sch_htb.c | 13 +++-- net/sctp/bind_addr.c | 4 + net/sctp/ipv6.c | 4 + net/sctp/protocol.c | 4 + scripts/Makefile.modpost | 6 ++ scripts/mod/file2alias.c | 4 + scripts/mod/modpost.c | 5 +- scripts/mod/modpost.h | 1 security/capability.c | 1 security/commoncap.c | 39 ---------------- 83 files changed, 533 insertions(+), 304 deletions(-)
Summary of changes from v2.6.24.4 to v2.6.24.5
==============================================
Alan Stern (1):
USB: new quirk flag to avoid Set-Interface
Alexey Dobriyan (1):
fbdev: fix /proc/fb oops after module removal
Alexey Korolev (1):
mtd: fix broken state in CFI driver caused by FL_SHUTDOWN
Alok Kataria (1):
acpi: fix "buggy BIOS check" when CPUs are hot removed
Atsushi Nemoto (1):
macb: Call phy_disconnect on removing
Brad Sawatzky (1):
USB: serial: fix regression in Visor/Palm OS module for kernels >= 2.6.24
Carol Hebert (1):
ipmi: change device node ordering to reflect probe order
Chidambar 'ilLogict' Zinnoury (1):
SCTP: Fix local_addr deletions during list traversals.
Chris Wright (1):
Linux 2.6.24.5
Chuck Ebbert (1):
acpi: bus: check once more for an empty list after locking it
Clark Rawlins (1):
USB: Allow initialization of broken keyspan serial adapters.
Constantin Baranov (1):
USB: add support for Motorola ROKR Z6 cellphone in mass storage mode
Dan Williams (1):
md: close a livelock window in handle_parity_checks5
Daniel Yeisley (1):
slab: fix cache_cache bootstrap in kmem_cache_init()
Dave Young (1):
bluetooth: hci_core: defer hci_unregister_sysfs()
David S. Miller (6):
SUNGEM: Fix NAPI assertion failure.
INET: inet_frag_evictor() must run with BH disabled
SPARC64: Fix atomic backoff limit.
SPARC64: Fix __get_cpu_var in preemption-enabled area.
SPARC64: flush_ptrace_access() needs preemption disable.
SPARC64: Fix FPU saving in 64-bit signal handling.
Davide Libenzi (1):
signalfd: fix for incorrect SI_QUEUE user data reporting
Dmitri Monakhov (1):
vfs: fix data leak in nobh_write_end()
Eric Dumazet (2):
PERCPU : __percpu_alloc_mask() can dynamically size percpu_data storage alloc_percpu() fails to allocate percpu data
Francois Romieu (1):
sis190: read the mac address from the eeprom first
Guido Guenther (1):
POWERPC: Fix build of modular drivers/macintosh/apm_emu.c
Hartmut Hackmann (1):
DVB: tda10086: make the 22kHz tone for DISEQC a config option
Herbert Xu (2):
NET: Add preemption point in qdisc_run
TCP: Let skbs grow over a page on fast peers
Ian Armstrong (1):
V4L: ivtv: Add missing sg_init_table()
Ingo van Lil (1):
mtd: memory corruption in block2mtd.c
J. Bruce Fields (1):
locks: fix possible infinite loop in fcntl(F_SETLKW) over nfs
James Chapman (2):
PPPOL2TP: Make locking calls softirq-safe
PPPOL2TP: Fix SMP issues in skb reorder queue handling
Jarek Poplawski (2):
AX25 ax25_out: check skb for NULL in ax25_kick()
netpoll: zap_completion_queue: adjust skb->users counter
Jean Delvare (2):
pci: revert SMBus unhide on HP Compaq nx6110
hwmon: (w83781d) Fix I/O resource conflict with PNP
Jean-Samuel Chenard (1):
UIO: add pgprot_noncached() to UIO mmap code
Jeremy Fitzhardinge (3):
xen: fix RMW when unmasking events
xen: mask out SEP from CPUID
xen: fix UP setup of shared_info
Joy Latten (1):
CRYPTO xcbc: Fix crash when ipsec uses xcbc-mac with big data chunk
Ken'ichi Ohmichi (1):
vmcoreinfo: add the symbol "phys_base"
Kirill A. Shutemov (1):
NET: include <linux/types.h> into linux/ethtool.h for __u* typedef
Kyle McMartin (3):
PARISC futex: special case cmpxchg NULL in kernel space PARISC pdc_console: fix bizarre panic on boot PARISC fix signal trampoline cache flushing
Len Brown (1):
pnpacpi: reduce printk severity for "pnpacpi: exceeded the max number of ..."
Martin Devera (1):
sch_htb: fix "too many events" situation
Mikulas Patocka (1):
plip: replace spin_lock_irq with spin_lock_irqsave in irq context
NeilBrown (1):
md: remove the 'super' sysfs attribute from devices in an 'md' array
Nick Piggin (2):
inotify: fix race
inotify: remove debug code
Patrick McHardy (4):
LLC: Restrict LLC sockets to root
NET: Fix multicast device ioctl checks
TCP: Fix shrinking windows with window scaling
VLAN: Don't copy ALLMULTI/PROMISC flags from underlying device
Robert Spanton (1):
USB: serial: ti_usb_3410_5052: Correct TUSB3410 endpoint requirements.
Roman Zippel (1):
HFS+: fix unlink of links
Sam Ravnborg (1):
kbuild: soften modpost checks when doing cross builds
Segher Boessenkool (1):
time: prevent the loop in timespec_add_ns() from being optimised away
Serge Hallyn (1):
file capabilities: remove cap_task_kill()
Tejun Heo (1):
libata: assume no device is attached if both IDENTIFYs are aborted
Thomas Gleixner (1):
NOHZ: reevaluate idle sleep length after add_timer_on()
Makefile +2 -2
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 24 -EXTRAVERSION = .4 +EXTRAVERSION = .5 NAME = Err Metey! A Heury Beelge-a Ret! # *DOCUMENTATION*
@@ -189,7 +189,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ # Alternatively CROSS_COMPILE can be set in the environment. # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile - +export KBUILD_BUILDHOST := $(SUBARCH) ARCH ?= $(SUBARCH) CROSS_COMPILE ?=
arch/parisc/kernel/firmware.c +17 -10
@@ -1080,6 +1080,9 @@ void pdc_io_reset_devices(void)spin_unlock_irqrestore (&pdc_lock, flags); } +/* locked by pdc_console_lock */ +static int __attribute__((aligned (8 ))) iodc_retbuf[32 ]; +static char __attribute__((aligned (64 ))) iodc_dbuf[4096 ];/** * pdc_iodc_print - Console print using IODC.
@@ -1091,24 +1094,20 @@ void pdc_io_reset_devices(void)* Since the HP console requires CR+LF to perform a 'newline', we translate * "\n" to "\r\n". */ -int pdc_iodc_print (unsigned char *str,unsigned count) +int pdc_iodc_print (const unsigned char *str,unsigned count) { -/* XXX Should we spinlock posx usage */ static int posx;/* for simple TAB-Simulation... */ -int __attribute__((aligned (8 ))) iodc_retbuf[32 ]; -char __attribute__((aligned (64 ))) iodc_dbuf[4096 ];unsigned int i;unsigned long flags; -memset (iodc_dbuf,0 ,4096 ); -for (i =0 ; i < count && i <2048 ;) { +for (i =0 ; i < count && i <79 ;) {switch (str[i]) {case '\n' : iodc_dbuf[i+0 ] ='\r' ; iodc_dbuf[i+1 ] ='\n' ; i +=2 ; posx =0 ; -break ; + goto print;case '\t' :while (posx &7 ) { iodc_dbuf[i] =' ' ;
@@ -1124,6 +1123,16 @@ int pdc_iodc_print(unsigned char *str, unsigned count) } } +/* if we're at the end of line, and not already inserting a newline, +* insert one anyway. iodc console doesn't claim to support >79 char +* lines. don't account for this in the return value. +*/ +if (i ==79 && iodc_dbuf[i-1 ] !='\n' ) { + iodc_dbuf[i+0 ] ='\r' ; + iodc_dbuf[i+1 ] ='\n' ; + } + +print:spin_lock_irqsave (&pdc_lock, flags); real32_call(PAGE0->mem_cons.iodc_io, (unsigned long)PAGE0->mem_cons.hpa, ENTRY_IO_COUT,
@@ -1142,11 +1151,9 @@ int pdc_iodc_print(unsigned char *str, unsigned count)*/ int pdc_iodc_getc (void ) { -unsigned long flags; -static int __attribute__((aligned (8 ))) iodc_retbuf[32 ]; -static char __attribute__((aligned (64 ))) iodc_dbuf[4096 ];int ch;int status; +unsigned long flags;/* Bail if no console input device. */ if (!PAGE0 ->mem_kbd.iodc_io)
arch/parisc/kernel/pdc_cons.c +17 -2
@@ -52,10 +52,18 @@#include <linux/tty.h> #include <asm/pdc.h> /* for iodc_call() proto and friends */ +static spinlock_t pdc_console_lock =SPIN_LOCK_UNLOCKED ;static void pdc_console_write (struct console *co,const char *s,unsigned count) { -pdc_iodc_print (s, count); +int i =0 ; +unsigned long flags; + +spin_lock_irqsave (&pdc_console_lock, flags); +do { + i +=pdc_iodc_print (s + i, count - i); + }while (i < count); +spin_unlock_irqrestore (&pdc_console_lock, flags); }void pdc_printf (const char *fmt, ...)
@@ -73,7 +81,14 @@ void pdc_printf(const char *fmt, ...)int pdc_console_poll_key (struct console *co) { -return pdc_iodc_getc (); +int c; +unsigned long flags; + +spin_lock_irqsave (&pdc_console_lock, flags); + c =pdc_iodc_getc (); +spin_unlock_irqrestore (&pdc_console_lock, flags); + +return c; }static int pdc_console_setup (struct console *co,char *options)
arch/parisc/kernel/signal.c +2 -1
@@ -534,7 +534,8 @@ insert_restart_trampoline(struct pt_regs *regs)* Flushing one cacheline is cheap. * "sync" on bigger (> 4 way) boxes is not. */ -flush_icache_range (regs->gr[30 ], regs->gr[30 ] +4 ); +flush_user_dcache_range (regs->gr[30 ], regs->gr[30 ] +4 ); +flush_user_icache_range (regs->gr[30 ], regs->gr[30 ] +4 ); regs->gr[31 ] = regs->gr[30 ] +8 ;/* Preserve original r28. */
arch/sparc64/kernel/ptrace.c +4 -0
@@ -127,6 +127,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,if (tlb_type == hypervisor)return ; +preempt_disable (); +#ifdef DCACHE_ALIASING_POSSIBLE /* If bit 13 of the kernel address we used to access the * user page is the same as the virtual address that page
@@ -165,6 +167,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,for (; start < end; start += icache_line_size)flushi (start); } + +preempt_enable (); } asmlinkage void do_ptrace(struct pt_regs *regs)
arch/sparc64/kernel/signal.c +1 -1
@@ -354,7 +354,7 @@ static int invalid_frame_pointer(void __user *fp, int fplen)static inline int save_fpu_state (struct pt_regs *regs,__siginfo_fpu_t __user *fpu) { -unsigned long *fpregs = (unsigned long *)(regs+1 ); +unsigned long *fpregs =current_thread_info ()->fpregs;unsigned long fprs;int err =0 ;
arch/sparc64/mm/tlb.c +2 -1
@@ -23,10 +23,11 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers) = { 0, };void flush_tlb_pending (void ) { -struct mmu_gather *mp = &__get_cpu_var (mmu_gathers); +struct mmu_gather *mp;preempt_disable (); + mp = &__get_cpu_var (mmu_gathers);if (mp->tlb_nr) {flush_tsb_user (mp);
arch/x86/kernel/machine_kexec_64.c +1 -0
@@ -233,6 +233,7 @@ NORET_TYPE void machine_kexec(struct kimage *image)void arch_crash_save_vmcoreinfo (void ) { +VMCOREINFO_SYMBOL (phys_base);VMCOREINFO_SYMBOL (init_level4_pgt);#ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE
arch/x86/xen/enlighten.c +24 -18
88 lines not on this page · raw message
arch/x86/xen/xen-asm.S +7 -2
@@ -33,12 +33,17 @@ events, then enter the hypervisor to get them handled. */ ENTRY(xen_irq_enable_direct) - /* Clear mask and test pending */ - andw $0x00ff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending + /* Unmask events */ + movb $0, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask + /* Preempt here doesn't matter because that will deal with any pending interrupts. The pending check may end up being run on the wrong CPU, but that doesn't hurt. */ + + /* Test for pending */ + testb $0xff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending jz 1f + 2: call check_events 1: ENDPATCH(xen_irq_enable_direct)
crypto/xcbc.c +9 -8
@@ -116,13 +116,11 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc,struct crypto_xcbc_ctx *ctx =crypto_hash_ctx_aligned (parent);struct crypto_cipher *tfm = ctx->child;int bs =crypto_hash_blocksize (parent); -unsigned int i =0 ; - do { - - struct page *pg = sg_page(&sg[i]); - unsigned int offset = sg[i].offset; - unsigned int slen = sg[i].length; +for (;;) { +struct page *pg =sg_page (sg); +unsigned int offset = sg->offset; +unsigned int slen = sg->length;if (unlikely (slen > nbytes)) slen = nbytes;
@@ -182,8 +180,11 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc, offset =0 ; pg++; } - i++; - }while (nbytes>0 ); + +if (!nbytes) +break ; + sg =sg_next (sg); + }return 0 ; }
drivers/acpi/bus.c +4 -3
@@ -350,10 +350,11 @@ int acpi_bus_receive_event(struct acpi_bus_event *event) }spin_lock_irqsave (&acpi_bus_event_lock, flags); - entry = - list_entry(acpi_bus_event_list.next, struct acpi_bus_event, node); -if (entry) +if (!list_empty (&acpi_bus_event_list)) { + entry =list_entry (acpi_bus_event_list.next, + struct acpi_bus_event, node);list_del (&entry->node); + }spin_unlock_irqrestore (&acpi_bus_event_lock, flags);if (!entry)
drivers/acpi/processor_core.c +1 -1
@@ -792,7 +792,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)acpi_processor_remove_fs (device); processors[pr->id] =NULL ; - + processor_device_array[pr->id] =NULL ;kfree (pr);return 0 ;
drivers/ata/libata-core.c +24 -14
@@ -1936,24 +1936,34 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class, id, sizeof(id[0]) * ATA_ID_WORDS, 0);if (err_mask) {if (err_mask &AC_ERR_NODEV_HINT ) { -DPRINTK ("ata%u.%d: NODEV after polling detection\n" , - ap->print_id, dev->devno); +ata_dev_printk (dev,KERN_DEBUG , +"NODEV after polling detection\n" );return -ENOENT ; } -/* Device or controller might have reported the wrong -* device class. Give a shot at the other IDENTIFY if -* the current one is aborted by the device. -*/ -if (may_fallback && - (err_mask ==AC_ERR_DEV ) && (tf.feature &ATA_ABORTED )) { - may_fallback =0 ; +if ((err_mask ==AC_ERR_DEV ) && (tf.feature &ATA_ABORTED )) { +/* Device or controller might have reported +* the wrong device class. Give a shot at the +* other IDENTIFY if the current one is +* aborted by the device. +*/ +if (may_fallback) { + may_fallback =0 ; -if (class ==ATA_DEV_ATA ) - class =ATA_DEV_ATAPI ; -else - class =ATA_DEV_ATA ; - goto retry; +if (class ==ATA_DEV_ATA ) + class =ATA_DEV_ATAPI ; +else + class =ATA_DEV_ATA ; + goto retry; + } + +/* Control reaches here iff the device aborted +* both flavors of IDENTIFYs which happens +* sometimes with phantom devices. +*/ +ata_dev_printk (dev,KERN_DEBUG , +"both IDENTIFYs aborted, assuming NODEV\n" ); +return -ENOENT ; } rc = -EIO ;
drivers/firmware/dmi_scan.c +1 -1
@@ -219,7 +219,7 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm) dev->name ="IPMI controller" ; dev->device_data = data; -list_add (&dev->list, &dmi_devices); +list_add_tail (&dev->list, &dmi_devices); }/*
drivers/hwmon/w83781d.c +16 -5
@@ -1380,7 +1380,8 @@ w83781d_isa_probe(struct platform_device *pdev)/* Reserve the ISA region */ res =platform_get_resource (pdev,IORESOURCE_IO ,0 ); -if (!request_region (res->start,W83781D_EXTENT ,"w83781d" )) { +if (!request_region (res->start +W83781D_ADDR_REG_OFFSET ,2 , +"w83781d" )) { err = -EBUSY ; goto exit; }
@@ -1432,7 +1433,7 @@ w83781d_isa_probe(struct platform_device *pdev)device_remove_file (&pdev->dev, &dev_attr_name);kfree (data); exit_release_region: -release_region (res->start,W83781D_EXTENT ); +release_region (res->start +W83781D_ADDR_REG_OFFSET ,2 ); exit:return err; }
@@ -1446,7 +1447,7 @@ w83781d_isa_remove(struct platform_device *pdev)sysfs_remove_group (&pdev->dev.kobj, &w83781d_group);sysfs_remove_group (&pdev->dev.kobj, &w83781d_group_opt);device_remove_file (&pdev->dev, &dev_attr_name); -release_region (data->client.addr,W83781D_EXTENT ); +release_region (data->client.addr +W83781D_ADDR_REG_OFFSET ,2 );kfree (data);return 0 ;
@@ -1820,8 +1821,17 @@ w83781d_isa_found(unsigned short address) {int val, save, found =0 ; -if (!request_region (address,W83781D_EXTENT ,"w83781d" )) +/* We have to request the region in two parts because some +boards declare base+4 to base+7 as a PNP device */ +if (!request_region (address,4 ,"w83781d" )) { +pr_debug ("w83781d: Failed to request low part of region\n" );return 0 ; + } +if (!request_region (address +4 ,4 ,"w83781d" )) { +pr_debug ("w83781d: Failed to request high part of region\n" ); +release_region (address,4 ); +return 0 ; + }#define REALLY_SLOW_IO /* We need the timeouts for at least some W83781D-like
@@ -1896,7 +1906,8 @@ w83781d_isa_found(unsigned short address) val == 0x30 ? "W83782D" : "W83781D", (int)address); release: -release_region (address,W83781D_EXTENT ); +release_region (address +4 ,4 ); +release_region (address,4 );return found; }
drivers/macintosh/via-pmu.c +1 -1
@@ -2842,7 +2842,7 @@ EXPORT_SYMBOL(pmu_wait_complete);EXPORT_SYMBOL (pmu_suspend);EXPORT_SYMBOL (pmu_resume);EXPORT_SYMBOL (pmu_unlock); -#if defined(CONFIG_PM_SLEEP ) && defined(CONFIG_PPC32 ) +#if defined(CONFIG_PPC32 )EXPORT_SYMBOL (pmu_enable_irled);EXPORT_SYMBOL (pmu_battery_count);EXPORT_SYMBOL (pmu_batteries);
drivers/md/md.c +0 -12
@@ -1847,17 +1847,6 @@ static struct rdev_sysfs_entry rdev_state =__ATTR (state,S_IRUGO |S_IWUSR , state_show, state_store);static ssize_t -super_show (mdk_rdev_t *rdev,char *page) -{ -if (rdev->sb_loaded && rdev->sb_size) { -memcpy (page,page_address (rdev->sb_page), rdev->sb_size); -return rdev->sb_size; - }else -return 0 ; -} -static struct rdev_sysfs_entry rdev_super =__ATTR_RO (super); - -static ssize_t errors_show (mdk_rdev_t *rdev,char *page) {return sprintf (page,"%d\n" ,atomic_read (&rdev->corrected_errors));
@@ -1959,7 +1948,6 @@ __ATTR(size, S_IRUGO|S_IWUSR, rdev_size_show, rdev_size_store);static struct attribute *rdev_default_attrs[] = { &rdev_state.attr, - &rdev_super.attr, &rdev_errors.attr, &rdev_slot.attr, &rdev_offset.attr,
drivers/md/raid5.c +29 -22
73 lines not on this page · raw message
drivers/media/dvb/dvb-usb/ttusb2.c +1 -0
@@ -144,6 +144,7 @@ static int ttusb2_power_ctrl(struct dvb_usb_device *d, int onoff)static struct tda10086_config tda10086_config = { .demod_address =0x0e , .invert =0 , + .diseqc_tone =1 , };static int ttusb2_frontend_attach (struct dvb_usb_adapter *adap)
drivers/media/dvb/frontends/tda10086.c +22 -6
@@ -106,9 +106,12 @@ static int tda10086_write_mask(struct tda10086_state *state, int reg, int mask,static int tda10086_init (struct dvb_frontend * fe) {struct tda10086_state * state = fe->demodulator_priv; +u8 t22k_off =0x80 ;dprintk ("%s\n" , __FUNCTION__); +if (state->config->diseqc_tone) + t22k_off =0 ;// reset tda10086_write_byte (state,0x00 ,0x00 );msleep (10 );
@@ -158,7 +161,7 @@ static int tda10086_init(struct dvb_frontend* fe)tda10086_write_byte (state,0x3d ,0x80 );// setup SEC -tda10086_write_byte (state,0x36 ,0x80 );// all SEC off, no 22k tone +tda10086_write_byte (state,0x36 , t22k_off);// all SEC off, 22k tone tda10086_write_byte (state,0x34 , (((1 <<19 ) * (22000 /1000 )) / (SACLK /1000 )));// } tone frequency tda10086_write_byte (state,0x35 , (((1 <<19 ) * (22000 /1000 )) / (SACLK /1000 )) >>8 );// }
@@ -180,16 +183,20 @@ static void tda10086_diseqc_wait(struct tda10086_state *state)static int tda10086_set_tone (struct dvb_frontend * fe,fe_sec_tone_mode_t tone) {struct tda10086_state * state = fe->demodulator_priv; +u8 t22k_off =0x80 ;dprintk ("%s\n" , __FUNCTION__); +if (state->config->diseqc_tone) + t22k_off =0 ; +switch (tone) {case SEC_TONE_OFF : -tda10086_write_byte (state,0x36 ,0x80 ); +tda10086_write_byte (state,0x36 , t22k_off);break ;case SEC_TONE_ON : -tda10086_write_byte (state,0x36 ,0x81 ); +tda10086_write_byte (state,0x36 ,0x01 + t22k_off);break ; }
@@ -202,9 +209,13 @@ static int tda10086_send_master_cmd (struct dvb_frontend* fe,struct tda10086_state * state = fe->demodulator_priv;int i;u8 oldval; +u8 t22k_off =0x80 ;dprintk ("%s\n" , __FUNCTION__); +if (state->config->diseqc_tone) + t22k_off =0 ; +if (cmd->msg_len >6 )return -EINVAL ; oldval =tda10086_read_byte (state,0x36 );
@@ -212,7 +223,8 @@ static int tda10086_send_master_cmd (struct dvb_frontend* fe,for (i=0 ; i< cmd->msg_len; i++) {tda10086_write_byte (state,0x48 +i, cmd->msg[i]); } -tda10086_write_byte (state,0x36 ,0x88 | ((cmd->msg_len -1 ) <<4 )); +tda10086_write_byte (state,0x36 , (0x08 + t22k_off) + | ((cmd->msg_len -1 ) <<4 ));tda10086_diseqc_wait (state);
@@ -225,16 +237,20 @@ static int tda10086_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minic {struct tda10086_state * state = fe->demodulator_priv;u8 oldval =tda10086_read_byte (state,0x36 ); +u8 t22k_off =0x80 ;dprintk ("%s\n" , __FUNCTION__); +if (state->config->diseqc_tone) + t22k_off =0 ; +switch (minicmd) {case SEC_MINI_A : -tda10086_write_byte (state,0x36 ,0x84 ); +tda10086_write_byte (state,0x36 ,0x04 + t22k_off);break ;case SEC_MINI_B : -tda10086_write_byte (state,0x36 ,0x86 ); +tda10086_write_byte (state,0x36 ,0x06 + t22k_off);break ; }
drivers/media/dvb/frontends/tda10086.h +3 -0
@@ -33,6 +33,9 @@ struct tda10086_config/* does the "inversion" need inverted? */ u8 invert; + +/* do we need the diseqc signal with carrier? */ +u8 diseqc_tone; };#if defined(CONFIG_DVB_TDA10086 ) || (defined(CONFIG_DVB_TDA10086_MODULE ) && defined(MODULE ))
drivers/media/dvb/ttpci/budget.c +1 -0
@@ -351,6 +351,7 @@ static struct s5h1420_config s5h1420_config = {static struct tda10086_config tda10086_config = { .demod_address =0x0e , .invert =0 , + .diseqc_tone =1 , };static u8 read_pwm (struct budget * budget)
drivers/media/video/ivtv/ivtv-driver.c +3 -0
@@ -687,6 +687,9 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv) itv->vbi.in.type =V4L2_BUF_TYPE_SLICED_VBI_CAPTURE ; itv->vbi.sliced_in = &itv->vbi.in.fmt.sliced; +/* Init the sg table for osd/yuv output */ +sg_init_table (itv->udma.SGlist,IVTV_DMA_SG_OSD_ENT ); +/* OSD */ itv->osd_global_alpha_state =1 ; itv->osd_global_alpha =255 ;
drivers/media/video/saa7134/saa7134-dvb.c +1 -0
@@ -826,6 +826,7 @@ static struct tda1004x_config ads_tech_duo_config = {static struct tda10086_config flydvbs = { .demod_address =0x0e , .invert =0 , + .diseqc_tone =0 , };/* ==================================================================
drivers/mtd/chips/cfi_cmdset_0001.c +5 -5
@@ -669,7 +669,7 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long/* Someone else might have been playing with it. */ return -EAGAIN ; } - +/* Fall through */ case FL_READY :case FL_CFI_QUERY :case FL_JEDEC_QUERY :
@@ -729,14 +729,14 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long chip->state =FL_READY ;return 0 ; +case FL_SHUTDOWN : +/* The machine is rebooting now,so no one can get chip anymore */ +return -EIO ;case FL_POINT :/* Only if there's no operation suspended... */ if (mode ==FL_READY && chip->oldstate ==FL_READY )return 0 ; - -case FL_SHUTDOWN : -/* The machine is rebooting now,so no one can get chip anymore */ -return -EIO ; +/* Fall through */ default : sleep:set_current_state (TASK_UNINTERRUPTIBLE );
drivers/mtd/devices/block2mtd.c +0 -1
@@ -408,7 +408,6 @@ static int block2mtd_setup2(const char *val)if (token[1 ]) { ret =parse_num (&erase_size, token[1 ]);if (ret) { -kfree (name);parse_err ("illegal erase size" ); } }
drivers/net/macb.c +2 -0
@@ -1257,6 +1257,8 @@ static int __devexit macb_remove(struct platform_device *pdev)if (dev) { bp =netdev_priv (dev); +if (bp->phy_dev) +phy_disconnect (bp->phy_dev);mdiobus_unregister (&bp->mii_bus);kfree (bp->mii_bus.irq);unregister_netdev (dev);
drivers/net/plip.c +4 -3
@@ -903,17 +903,18 @@ plip_interrupt(void *dev_id)struct net_local *nl;struct plip_local *rcv;unsigned char c0; +unsigned long flags; nl =netdev_priv (dev); rcv = &nl->rcv_data; -spin_lock_irq (&nl->lock); +spin_lock_irqsave (&nl->lock, flags); c0 =read_status (dev);if ((c0 &0xf8 ) !=0xc0 ) {if ((dev->irq !=-1 ) && (net_debug >1 ))printk (KERN_DEBUG "%s: spurious interrupt\n" , dev->name); -spin_unlock_irq (&nl->lock); +spin_unlock_irqrestore (&nl->lock, flags);return ; }
@@ -942,7 +943,7 @@ plip_interrupt(void *dev_id)break ; } -spin_unlock_irq (&nl->lock); +spin_unlock_irqrestore (&nl->lock, flags); } static int
drivers/net/pppol2tp.c +37 -32
209 lines not on this page · raw message
drivers/net/sis190.c +10 -5
@@ -1632,13 +1632,18 @@ static inline void sis190_init_rxfilter(struct net_device *dev)static int sis190_get_mac_addr (struct pci_dev *pdev,struct net_device *dev) { -u8 from; +int rc; + + rc =sis190_get_mac_addr_from_eeprom (pdev, dev); +if (rc <0 ) { +u8 reg; -pci_read_config_byte (pdev,0x73 , &from); +pci_read_config_byte (pdev,0x73 , ®); -return (from &0x00000001 ) ? -sis190_get_mac_addr_from_apc (pdev, dev) : -sis190_get_mac_addr_from_eeprom (pdev, dev); +if (reg &0x00000001 ) + rc =sis190_get_mac_addr_from_apc (pdev, dev); + } +return rc; }static void sis190_set_speed_auto (struct net_device *dev)
drivers/net/sungem.c +1 -1
@@ -910,7 +910,7 @@ static int gem_poll(struct napi_struct *napi, int budget)* rx ring - must call napi_disable(), which * schedule_timeout()'s if polling is already disabled. */ - work_done +=gem_rx (gp, budget); + work_done +=gem_rx (gp, budget - work_done);if (work_done >= budget)return work_done;
drivers/pci/quirks.c +6 -5
@@ -950,6 +950,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82375, quirk_e* accesses to the SMBus registers, with potentially bad effects. Thus you * should be very careful when adding new entries: if SMM is accessing the * Intel SMBus, this is a very good reason to leave it hidden. +* +* Likewise, many recent laptops use ACPI for thermal management. If the +* ACPI DSDT code accesses the SMBus, then Linux should not access it +* natively, and keeping the SMBus hidden is the right thing to do. If you +* are about to add an entry in the table below, please first disassemble +* the DSDT and double-check that there is no code accessing the SMBus. */ static int asus_hides_smbus;
@@ -1022,11 +1028,6 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)case 0x12bd :/* HP D530 */ asus_hides_smbus =1 ; } -else if (dev->device ==PCI_DEVICE_ID_INTEL_82915GM_HB ) -switch (dev->subsystem_device) { -case 0x099c :/* HP Compaq nx6110 */ - asus_hides_smbus =1 ; - } }else if (unlikely (dev->subsystem_vendor ==PCI_VENDOR_ID_SAMSUNG )) {if (dev->device ==PCI_DEVICE_ID_INTEL_82855PM_HB )switch (dev->subsystem_device) {
drivers/pnp/pnpacpi/rsparser.c +4 -4
@@ -85,7 +85,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, i < PNP_MAX_IRQ) i++;if (i >=PNP_MAX_IRQ && !warned) { -printk (KERN_ERR "pnpacpi: exceeded the max number of IRQ " +printk (KERN_WARNING "pnpacpi: exceeded the max number of IRQ " "resources: %d \n" ,PNP_MAX_IRQ ); warned =1 ;return ;
@@ -187,7 +187,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, res->dma_resource[i].start = dma; res->dma_resource[i].end = dma; }else if (!warned) { -printk (KERN_ERR "pnpacpi: exceeded the max number of DMA " +printk (KERN_WARNING "pnpacpi: exceeded the max number of DMA " "resources: %d \n" ,PNP_MAX_DMA ); warned =1 ; }
@@ -213,7 +213,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res, res->port_resource[i].start = io; res->port_resource[i].end = io + len -1 ; }else if (!warned) { -printk (KERN_ERR "pnpacpi: exceeded the max number of IO " +printk (KERN_WARNING "pnpacpi: exceeded the max number of IO " "resources: %d \n" ,PNP_MAX_PORT ); warned =1 ; }
@@ -241,7 +241,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res, res->mem_resource[i].start = mem; res->mem_resource[i].end = mem + len -1 ; }else if (!warned) { -printk (KERN_ERR "pnpacpi: exceeded the max number of mem " +printk (KERN_WARNING "pnpacpi: exceeded the max number of mem " "resources: %d\n" ,PNP_MAX_MEM ); warned =1 ; }
drivers/uio/uio.c +2 -0
@@ -447,6 +447,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma) vma->vm_flags |=VM_IO |VM_RESERVED ; + vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); + return remap_pfn_range(vma, vma->vm_start, idev->info->mem[mi].addr >> PAGE_SHIFT,
drivers/usb/core/message.c +4 -1
@@ -1189,7 +1189,10 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)return -EINVAL ; } - ret =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ), +if (dev->quirks &USB_QUIRK_NO_SET_INTF ) + ret = -EPIPE ; +else + ret =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ),USB_REQ_SET_INTERFACE ,USB_RECIP_INTERFACE , alternate, interface,NULL ,0 ,5000 );
drivers/usb/core/quirks.c +3 -0
@@ -39,6 +39,9 @@ static const struct usb_device_id usb_quirk_list[] = {/* M-Systems Flash Disk Pioneers */ { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, + /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */ + { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF }, + /* Philips PSC805 audio device */ { USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },
drivers/usb/serial/keyspan.h +4 -0
@@ -637,6 +637,7 @@ static struct usb_serial_driver keyspan_pre_device = { .description = "Keyspan - (without firmware)", .id_table = keyspan_pre_ids, .num_interrupt_in = NUM_DONT_CARE, + .num_interrupt_out = NUM_DONT_CARE, .num_bulk_in = NUM_DONT_CARE, .num_bulk_out = NUM_DONT_CARE, .num_ports = 1,
@@ -651,6 +652,7 @@ static struct usb_serial_driver keyspan_1port_device = { .description = "Keyspan 1 port adapter", .id_table = keyspan_1port_ids, .num_interrupt_in = NUM_DONT_CARE, + .num_interrupt_out = NUM_DONT_CARE, .num_bulk_in = NUM_DONT_CARE, .num_bulk_out = NUM_DONT_CARE, .num_ports = 1,
@@ -678,6 +680,7 @@ static struct usb_serial_driver keyspan_2port_device = { .description = "Keyspan 2 port adapter", .id_table = keyspan_2port_ids, .num_interrupt_in = NUM_DONT_CARE, + .num_interrupt_out = NUM_DONT_CARE, .num_bulk_in = NUM_DONT_CARE, .num_bulk_out = NUM_DONT_CARE, .num_ports = 2,
@@ -705,6 +708,7 @@ static struct usb_serial_driver keyspan_4port_device = { .description = "Keyspan 4 port adapter", .id_table = keyspan_4port_ids, .num_interrupt_in = NUM_DONT_CARE, + .num_interrupt_out = NUM_DONT_CARE, .num_bulk_in = NUM_DONT_CARE, .num_bulk_out = NUM_DONT_CARE, .num_ports = 4,
drivers/usb/serial/ti_usb_3410_5052.c +2 -2
@@ -264,8 +264,8 @@ static struct usb_serial_driver ti_1port_device = { .description = "TI USB 3410 1 port adapter", .usb_driver = &ti_usb_driver, .id_table = ti_id_table_3410, - .num_interrupt_in = 1, - .num_bulk_in = 1, + .num_interrupt_in = NUM_DONT_CARE, + .num_bulk_in = NUM_DONT_CARE, .num_bulk_out = 1, .num_ports = 1, .attach = ti_startup,
drivers/usb/serial/visor.c +1 -1
@@ -191,7 +191,7 @@ static struct usb_serial_driver handspring_device = { .id_table = id_table, .num_interrupt_in = NUM_DONT_CARE, .num_bulk_in = 2, - .num_bulk_out = 2, + .num_bulk_out = NUM_DONT_CARE, .num_ports = 2, .open = visor_open, .close = visor_close,
drivers/usb/storage/transport.c +2 -1
@@ -1010,7 +1010,8 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)US_DEBUGP ("Bulk Status S 0x%x T 0x%x R %u Stat 0x%x\n" ,le32_to_cpu (bcs->Signature), bcs->Tag, residue, bcs->Status); -if (bcs->Tag != us->tag || bcs->Status >US_BULK_STAT_PHASE ) { +if (!(bcs->Tag == us->tag || (us->flags &US_FL_BULK_IGNORE_TAG )) || + bcs->Status >US_BULK_STAT_PHASE ) {US_DEBUGP ("Bulk logical error\n" );return USB_STOR_TRANSPORT_ERROR ; }
drivers/usb/storage/unusual_devs.h +11 -0
@@ -1557,6 +1557,17 @@ UNUSUAL_DEV( 0x22b8, 0x4810, 0x0001, 0x0001, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_CAPACITY), +/* +* Patch by Constantin Baranov <[email protected]> +* Report by Andreas Koenecke. +* Motorola ROKR Z6. +*/ +UNUSUAL_DEV (0x22b8 ,0x6426 ,0x0101 ,0x0101 , +"Motorola" , +"MSnc." , +US_SC_DEVICE ,US_PR_DEVICE ,NULL , +US_FL_FIX_INQUIRY |US_FL_FIX_CAPACITY |US_FL_BULK_IGNORE_TAG ), +/* Reported by Radovan Garabik <[email protected]> */ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999, "MPIO",
drivers/video/fbmem.c +1 -0
@@ -1521,6 +1521,7 @@ module_init(fbmem_init); static void __exitfbmem_exit (void ) { +remove_proc_entry ("fb" ,NULL );class_destroy (fb_class);unregister_chrdev (FB_MAJOR ,"fb" ); }
fs/buffer.c +6 -7
@@ -2565,14 +2565,13 @@ int nobh_write_end(struct file *file, struct address_space *mapping,struct inode *inode = page->mapping->host;struct buffer_head *head = fsdata;struct buffer_head *bh; +BUG_ON (fsdata !=NULL &&page_has_buffers (page)); -if (!PageMappedToDisk (page)) { -if (unlikely (copied < len) && !page_has_buffers (page)) -attach_nobh_buffers (page, head); -if (page_has_buffers (page)) -return generic_write_end (file, mapping, pos, len, - copied, page, fsdata); - } +if (unlikely (copied < len) && !page_has_buffers (page)) +attach_nobh_buffers (page, head); +if (page_has_buffers (page)) +return generic_write_end (file, mapping, pos, len, + copied, page, fsdata);SetPageUptodate (page);set_page_dirty (page);
fs/dcache.c +0 -3
@@ -1408,9 +1408,6 @@ void d_delete(struct dentry * dentry)if (atomic_read (&dentry->d_count) ==1 ) {dentry_iput (dentry);fsnotify_nameremove (dentry, isdir); - -/* remove this and other inotify debug checks after 2.6.18 */ - dentry->d_flags &= ~DCACHE_INOTIFY_PARENT_WATCHED ;return ; }
fs/hfsplus/dir.c +15 -8
@@ -340,16 +340,23 @@ static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)if (inode->i_nlink >0 )drop_nlink (inode); -hfsplus_delete_inode (inode); -if (inode->i_ino != cnid && !inode->i_nlink) { -if (!atomic_read (&HFSPLUS_I (inode).opencnt)) { - res =hfsplus_delete_cat (inode->i_ino,HFSPLUS_SB (sb).hidden_dir,NULL ); -if (!res) -hfsplus_delete_inode (inode); +if (inode->i_ino == cnid) +clear_nlink (inode); +if (!inode->i_nlink) { +if (inode->i_ino != cnid) { +HFSPLUS_SB (sb).file_count--; +if (!atomic_read (&HFSPLUS_I (inode).opencnt)) { + res =hfsplus_delete_cat (inode->i_ino, +HFSPLUS_SB (sb).hidden_dir, +NULL ); +if (!res) +hfsplus_delete_inode (inode); + }else + inode->i_flags |=S_DEAD ; }else - inode->i_flags |=S_DEAD ; +hfsplus_delete_inode (inode); }else -clear_nlink (inode); +HFSPLUS_SB (sb).file_count--; inode->i_ctime =CURRENT_TIME_SEC ;mark_inode_dirty (inode);
fs/inotify.c +15 -15
@@ -168,20 +168,14 @@ static void set_dentry_child_flags(struct inode *inode, int watched)struct dentry *child;list_for_each_entry (child, &alias->d_subdirs, d_u.d_child) { -if (!child->d_inode) { -WARN_ON (child->d_flags &DCACHE_INOTIFY_PARENT_WATCHED ); +if (!child->d_inode)continue ; - } +spin_lock (&child->d_lock); -if (watched) { -WARN_ON (child->d_flags & -DCACHE_INOTIFY_PARENT_WATCHED ); +if (watched) child->d_flags |=DCACHE_INOTIFY_PARENT_WATCHED ; - }else { -WARN_ON (!(child->d_flags & -DCACHE_INOTIFY_PARENT_WATCHED )); - child->d_flags&=~DCACHE_INOTIFY_PARENT_WATCHED ; - } +else + child->d_flags &=~DCACHE_INOTIFY_PARENT_WATCHED ;spin_unlock (&child->d_lock); } }
@@ -253,7 +247,6 @@ void inotify_d_instantiate(struct dentry *entry, struct inode *inode)if (!inode)return ; -WARN_ON (entry->d_flags &DCACHE_INOTIFY_PARENT_WATCHED );spin_lock (&entry->d_lock); parent = entry->d_parent;if (parent->d_inode &&inotify_inode_watched (parent->d_inode))
@@ -627,6 +620,7 @@ s32 inotify_add_watch(struct inotify_handle *ih, struct inotify_watch *watch, struct inode *inode, u32 mask) {int ret =0 ; +int newly_watched;/* don't allow invalid bits: we don't want flags set */ mask &=IN_ALL_EVENTS |IN_ONESHOT ;
@@ -653,12 +647,18 @@ s32 inotify_add_watch(struct inotify_handle *ih, struct inotify_watch *watch,*/ watch->inode =igrab (inode); -if (!inotify_inode_watched (inode)) -set_dentry_child_flags (inode,1 ); -/* Add the watch to the handle's and the inode's list */ + newly_watched = !inotify_inode_watched (inode);list_add (&watch->h_list, &ih->watches);list_add (&watch->i_list, &inode->inotify_watches); +/* +* Set child flags _after_ adding the watch, so there is no race +* windows where newly instantiated children could miss their parent's +* watched flag. +*/ +if (newly_watched) +set_dentry_child_flags (inode,1 ); + out:mutex_unlock (&ih->mutex);mutex_unlock (&inode->inotify_mutex);
fs/locks.c +28 -20
62 lines not on this page · raw message
fs/signalfd.c +6 -1
@@ -110,9 +110,14 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, err |=__put_user (kinfo->si_uid, &uinfo->ssi_uid); err |=__put_user ((long ) kinfo->si_ptr, &uinfo->ssi_ptr);break ; -default :/* this is just in case for now ... */ +default : +/* +* This case catches also the signals queued by sigqueue(). +*/ err |=__put_user (kinfo->si_pid, &uinfo->ssi_pid); err |=__put_user (kinfo->si_uid, &uinfo->ssi_uid); + err |=__put_user ((long ) kinfo->si_ptr, &uinfo->ssi_ptr); + err |=__put_user (kinfo->si_int, &uinfo->ssi_int);break ; }
include/asm-parisc/futex.h +8 -2
@@ -56,6 +56,12 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)int err =0 ;int uval; +/* futex.c wants to do a cmpxchg_inatomic on kernel NULL, which is +* our gateway page, and causes no end of trouble... +*/ +if (segment_eq (KERNEL_DS ,get_fs ()) && !uaddr) +return -EFAULT ; +if (!access_ok (VERIFY_WRITE , uaddr,sizeof (int )))return -EFAULT ;
@@ -67,5 +73,5 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)return uval; } -#endif -#endif +#endif /*__KERNEL__*/ +#endif /*_ASM_PARISC_FUTEX_H*/
include/asm-parisc/pdc.h +1 -2
@@ -645,8 +645,7 @@ int pdc_soft_power_button(int sw_control);void pdc_io_reset (void );void pdc_io_reset_devices (void );int pdc_iodc_getc (void ); -int pdc_iodc_print (unsigned char *str,unsigned count); -void pdc_printf (const char *fmt, ...); +int pdc_iodc_print (const unsigned char *str,unsigned count);void pdc_emergency_unlock (void ); int pdc_sti_call(unsigned long func, unsigned long flags,
include/asm-sparc64/backoff.h +2 -1
@@ -12,7 +12,8 @@mov reg, tmp; \ 88: brnz,pt tmp, 88b; \ sub tmp, 1, tmp; \ -cmp reg,BACKOFF_LIMIT ; \ +set BACKOFF_LIMIT , tmp; \ +cmp reg, tmp; \ bg,pn %xcc, label; \ nop; \ ba,pt %xcc, label; \
include/linux/ethtool.h +1 -0
@@ -12,6 +12,7 @@#ifndef _LINUX_ETHTOOL_H#define _LINUX_ETHTOOL_H +#include <linux/types.h> /* This should work for both 32 and 64 bit userland. */ struct ethtool_cmd {
include/linux/percpu.h +1 -1
@@ -34,7 +34,7 @@#ifdef CONFIG_SMP struct percpu_data { -void *ptrs[NR_CPUS ]; +void *ptrs[1 ]; };#define __percpu_disguise (pdata) (struct percpu_data *)~(unsigned long)(pdata)
include/linux/sched.h +6 -0
@@ -1449,6 +1449,12 @@ static inline void idle_task_exit(void) {}extern void sched_idle_next (void ); +#if defined(CONFIG_NO_HZ ) && defined(CONFIG_SMP ) +extern void wake_up_idle_cpu (int cpu); +#else +static inline void wake_up_idle_cpu (int cpu) { } +#endif +#ifdef CONFIG_SCHED_DEBUG extern unsigned int sysctl_sched_latency;extern unsigned int sysctl_sched_min_granularity;
include/linux/security.h +1 -2
@@ -62,7 +62,6 @@ extern int cap_inode_need_killpriv(struct dentry *dentry);extern int cap_inode_killpriv (struct dentry *dentry);extern int cap_task_post_setuid (uid_t old_ruid,uid_t old_euid,uid_t old_suid,int flags);extern void cap_task_reparent_to_init (struct task_struct *p); -extern int cap_task_kill (struct task_struct *p,struct siginfo *info,int sig,u32 secid);extern int cap_task_setscheduler (struct task_struct *p,int policy,struct sched_param *lp);extern int cap_task_setioprio (struct task_struct *p,int ioprio);extern int cap_task_setnice (struct task_struct *p,int nice);
@@ -2112,7 +2111,7 @@ static inline int security_task_kill (struct task_struct *p, struct siginfo *info, int sig, u32 secid) { - return cap_task_kill(p, info, sig, secid); + return 0; }static inline int security_task_wait (struct task_struct *p)
include/linux/time.h +4 -0
@@ -173,6 +173,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) { ns += a->tv_nsec;while (unlikely (ns >=NSEC_PER_SEC )) { +/* The following asm() prevents the compiler from +* optimising this loop into a modulo operation. */ + asm("" :"+r" (ns)); + ns -=NSEC_PER_SEC ; a->tv_sec++; }
include/linux/usb/quirks.h +3 -0
@@ -9,3 +9,6 @@/* device can't resume correctly so reset it instead */ #define USB_QUIRK_RESET_RESUME 0x00000002 + +/* device can't handle Set-Interface requests */ +#define USB_QUIRK_NO_SET_INTF 0x00000004
include/linux/usb_usual.h +3 -1
@@ -50,7 +50,9 @@US_FLAG (CAPACITY_HEURISTICS ,0x00001000 ) \ /* sometimes sizes is too big */ \US_FLAG (MAX_SECTORS_MIN ,0x00002000 ) \ - /* Sets max_sectors to arch min */ + /* Sets max_sectors to arch min */ \ +US_FLAG (BULK_IGNORE_TAG ,0x00004000 ) \ + /* Ignore tag mismatch in bulk operations */#define US_FLAG (name, value) US_FL_##name = value ,
kernel/sched.c +43 -0
49 lines not on this page · raw message
kernel/timer.c +9 -1
@@ -453,10 +453,18 @@ void add_timer_on(struct timer_list *timer, int cpu)spin_lock_irqsave (&base->lock, flags);timer_set_base (timer, base);internal_add_timer (base, timer); +/* +* Check whether the other CPU is idle and needs to be +* triggered to reevaluate the timer wheel when nohz is +* active. We are protected against the other CPU fiddling +* with the timer by holding the timer base lock. This also +* makes sure that a CPU on the way to idle can not evaluate +* the timer wheel. +*/ +wake_up_idle_cpu (cpu);spin_unlock_irqrestore (&base->lock, flags); } -/** * mod_timer - modify a timer's timeout * @timer: the timer to be modified
mm/allocpercpu.c +14 -1
@@ -6,6 +6,10 @@#include <linux/mm.h> #include <linux/module.h> +#ifndef cache_line_size +#define cache_line_size () L1_CACHE_BYTES +#endif +/** * percpu_depopulate - depopulate per-cpu data for given cpu * @__pdata: per-cpu data to depopulate
@@ -52,6 +56,11 @@ void *percpu_populate(void *__pdata, size_t size, gfp_t gfp, int cpu)struct percpu_data *pdata =__percpu_disguise (__pdata);int node =cpu_to_node (cpu); +/* +* We should make sure each CPU gets private memory. +*/ + size =roundup (size,cache_line_size ()); +BUG_ON (pdata->ptrs[cpu]);if (node_online (node)) pdata->ptrs[cpu] =kmalloc_node (size, gfp|__GFP_ZERO, node);
@@ -98,7 +107,11 @@ EXPORT_SYMBOL_GPL(__percpu_populate_mask);*/ void *__percpu_alloc_mask (size_t size,gfp_t gfp,cpumask_t *mask) { -void *pdata =kzalloc (sizeof (struct percpu_data ), gfp); +/* +* We allocate whole cache lines to avoid false sharing +*/ +size_t sz =roundup (nr_cpu_ids *sizeof (void *),cache_line_size ()); +void *pdata =kzalloc (sz, gfp);void *__pdata =__percpu_disguise (pdata);if (unlikely (!pdata))
mm/slab.c +2 -2
@@ -1484,7 +1484,7 @@ void __init kmem_cache_init(void)list_add (&cache_cache.next, &cache_chain); cache_cache.colour_off =cache_line_size (); cache_cache.array[smp_processor_id ()] = &initarray_cache.cache; - cache_cache.nodelists[node] = &initkmem_list3[CACHE_CACHE ]; + cache_cache.nodelists[node] = &initkmem_list3[CACHE_CACHE + node];/* * struct kmem_cache size depends on nr_node_ids, which
@@ -1605,7 +1605,7 @@ void __init kmem_cache_init(void)int nid;for_each_online_node (nid) { -init_list (&cache_cache, &initkmem_list3[CACHE_CACHE ], nid); +init_list (&cache_cache, &initkmem_list3[CACHE_CACHE + nid], nid);init_list (malloc_sizes[INDEX_AC ].cs_cachep, &initkmem_list3[SIZE_AC + nid], nid);
net/8021q/vlan.c +1 -1
@@ -326,7 +326,7 @@ static int vlan_dev_init(struct net_device *dev)int subclass =0 ;/* IFF_BROADCAST|IFF_MULTICAST; ??? */ - dev->flags = real_dev->flags & ~IFF_UP ; + dev->flags = real_dev->flags & ~(IFF_UP |IFF_PROMISC |IFF_ALLMULTI ); dev->iflink = real_dev->ifindex; dev->state = (real_dev->state & ((1 <<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))) |
net/ax25/ax25_out.c +11 -2
@@ -117,6 +117,12 @@ void ax25_output(ax25_cb *ax25, int paclen, struct sk_buff *skb)unsigned char *p;int frontlen, len, fragno, ka9qfrag, first =1 ; +if (paclen <16 ) { +WARN_ON_ONCE (1 ); +kfree_skb (skb); +return ; + } +if ((skb->len -1 ) > paclen) {if (*skb->data ==AX25_P_TEXT ) {skb_pull (skb,1 );/* skip PID */
@@ -251,8 +257,6 @@ void ax25_kick(ax25_cb *ax25)if (start == end)return ; - ax25->vs = start; -/* * Transmit data until either we're out of data to send or * the window is full. Send a poll on the final I frame if
@@ -261,8 +265,13 @@ void ax25_kick(ax25_cb *ax25)/* * Dequeue the frame and copy it. +* Check for race with ax25_clear_queues(). */ skb =skb_dequeue (&ax25->write_queue); +if (!skb) +return ; + + ax25->vs = start; do { if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) {
net/bluetooth/hci_core.c +2 -2
@@ -901,8 +901,6 @@ int hci_unregister_dev(struct hci_dev *hdev)BT_DBG ("%p name %s type %d" , hdev, hdev->name, hdev->type); -hci_unregister_sysfs (hdev); -write_lock_bh (&hci_dev_list_lock);list_del (&hdev->list);write_unlock_bh (&hci_dev_list_lock);
@@ -914,6 +912,8 @@ int hci_unregister_dev(struct hci_dev *hdev)hci_notify (hdev,HCI_DEV_UNREG ); +hci_unregister_sysfs (hdev); +__hci_dev_put (hdev);return 0 ;
net/core/dev.c +2 -2
@@ -3240,7 +3240,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)return -EOPNOTSUPP ;case SIOCADDMULTI : -if (!dev->set_multicast_list || +if ((!dev->set_multicast_list && !dev->set_rx_mode) || ifr->ifr_hwaddr.sa_family !=AF_UNSPEC )return -EINVAL ;if (!netif_device_present (dev))
@@ -3249,7 +3249,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) dev->addr_len, 1);case SIOCDELMULTI : -if (!dev->set_multicast_list || +if ((!dev->set_multicast_list && !dev->set_rx_mode) || ifr->ifr_hwaddr.sa_family !=AF_UNSPEC )return -EINVAL ;if (!netif_device_present (dev))
net/core/netpoll.c +4 -2
@@ -219,10 +219,12 @@ static void zap_completion_queue(void)while (clist !=NULL ) {struct sk_buff *skb = clist; clist = clist->next; -if (skb->destructor) +if (skb->destructor) { +atomic_inc (&skb->users);dev_kfree_skb_any (skb);/* put this one back */ -else + }else {__kfree_skb (skb); + } } }
net/ipv4/tcp.c +2 -2
@@ -583,7 +583,7 @@ new_segment:if (!(psize -= copy)) goto out; -if (skb->len < mss_now || (flags &MSG_OOB )) +if (skb->len < size_goal || (flags &MSG_OOB ))continue ;if (forced_push (tp)) {
@@ -829,7 +829,7 @@ new_segment:if ((seglen -= copy) ==0 && iovlen ==0 ) goto out; -if (skb->len < mss_now || (flags &MSG_OOB )) +if (skb->len < size_goal || (flags &MSG_OOB ))continue ;if (forced_push (tp)) {
net/ipv4/tcp_output.c +1 -1
@@ -258,7 +258,7 @@ static u16 tcp_select_window(struct sock *sk)* * Relax Will Robinson. */ - new_win = cur_win; + new_win =ALIGN (cur_win,1 << tp->rx_opt.rcv_wscale); } tp->rcv_wnd = new_win; tp->rcv_wup = tp->rcv_nxt;
net/ipv6/netfilter/nf_conntrack_reasm.c +2 -0
@@ -147,7 +147,9 @@ static __inline__ void fq_kill(struct nf_ct_frag6_queue *fq)static void nf_ct_frag6_evictor (void ) { +local_bh_disable ();inet_frag_evictor (&nf_frags); +local_bh_enable (); }static void nf_ct_frag6_expire (unsigned long data)
net/llc/af_llc.c +3 -0
@@ -155,6 +155,9 @@ static int llc_ui_create(struct net *net, struct socket *sock, int protocol)struct sock *sk;int rc = -ESOCKTNOSUPPORT ; +if (!capable (CAP_NET_RAW )) +return -EPERM ; +if (net != &init_net)return -EAFNOSUPPORT ;
net/sched/sch_generic.c +15 -3
@@ -178,10 +178,22 @@ static inline int qdisc_restart(struct net_device *dev)void __qdisc_run (struct net_device *dev) { -do { -if (!qdisc_restart (dev)) +unsigned long start_time = jiffies; + +while (qdisc_restart (dev)) { +if (netif_queue_stopped (dev)) +break ; + +/* +* Postpone processing if +* 1. another process needs the CPU; +* 2. we've been doing it for too long. +*/ +if (need_resched () || jiffies != start_time) { +netif_schedule (dev);break ; - }while (!netif_queue_stopped (dev)); + } + }clear_bit (__LINK_STATE_QDISC_RUNNING, &dev->state); }
net/sched/sch_htb.c +7 -6
@@ -708,9 +708,11 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl,*/ static psched_time_t htb_do_events (struct htb_sched *q,int level) { -int i; - -for (i =0 ; i <500 ; i++) { +/* don't run for longer than 2 jiffies; 2 is used instead of +1 to simplify things when jiffy is going to be incremented +too soon */ +unsigned long stop_at = jiffies +2 ; +while (time_before (jiffies, stop_at)) {struct htb_class *cl;long diff;struct rb_node *p =rb_first (&q->wait_pq[level]);
@@ -728,9 +730,8 @@ static psched_time_t htb_do_events(struct htb_sched *q, int level)if (cl->cmode !=HTB_CAN_SEND )htb_add_to_wait_tree (q, cl, diff); } -if (net_ratelimit ()) -printk (KERN_WARNING "htb: too many events !\n" ); -return q->now +PSCHED_TICKS_PER_SEC /10 ; +/* too much load - let's continue on next jiffie */ +return q->now +PSCHED_TICKS_PER_SEC /HZ ; }/* Returns class->node+prio from id-tree where classe's id is >= id. NULL
net/sctp/bind_addr.c +3 -1
@@ -209,6 +209,7 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new,int sctp_del_bind_addr (struct sctp_bind_addr *bp,union sctp_addr *del_addr) {struct sctp_sockaddr_entry *addr, *temp; +int found =0 ;/* We hold the socket lock when calling this function, * and that acts as a writer synchronizing lock.
@@ -216,13 +217,14 @@ int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr)list_for_each_entry_safe (addr, temp, &bp->address_list, list) {if (sctp_cmp_addr_exact (&addr->a, del_addr)) {/* Found the exact match. */ + found =1 ; addr->valid =0 ;list_del_rcu (&addr->list);break ; } } -if (addr && !addr->valid) { +if (found) {call_rcu (&addr->rcu, sctp_local_addr_free);SCTP_DBG_OBJCNT_DEC (addr);return 0 ;
net/sctp/ipv6.c +3 -1
@@ -89,6 +89,7 @@ static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev,struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr;struct sctp_sockaddr_entry *addr =NULL ;struct sctp_sockaddr_entry *temp; +int found =0 ;switch (ev) {case NETDEV_UP :
@@ -111,13 +112,14 @@ static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev, &sctp_local_addr_list, list) {if (ipv6_addr_equal (&addr->a.v6.sin6_addr, &ifa->addr)) { + found =1 ; addr->valid =0 ;list_del_rcu (&addr->list);break ; } }spin_unlock_bh (&sctp_local_addr_lock); -if (addr && !addr->valid) +if (found)call_rcu (&addr->rcu, sctp_local_addr_free);break ; }
net/sctp/protocol.c +3 -1
@@ -626,6 +626,7 @@ static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;struct sctp_sockaddr_entry *addr =NULL ;struct sctp_sockaddr_entry *temp; +int found =0 ;switch (ev) {case NETDEV_UP :
@@ -645,13 +646,14 @@ static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,list_for_each_entry_safe (addr, temp, &sctp_local_addr_list, list) {if (addr->a.v4.sin_addr.s_addr == ifa->ifa_local) { + found =1 ; addr->valid =0 ;list_del_rcu (&addr->list);break ; } }spin_unlock_bh (&sctp_local_addr_lock); -if (addr && !addr->valid) +if (found)call_rcu (&addr->rcu, sctp_local_addr_free);break ; }
scripts/Makefile.modpost +5 -1
@@ -53,6 +53,9 @@ modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) # Stop after building .o files if NOFINAL is set. Makes compile tests quicker _modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules)) +ifneq ($(KBUILD_BUILDHOST),$(ARCH)) + cross_build := 1 +endif # Step 2), invoke modpost # Includes step 3,4
@@ -62,7 +65,8 @@ modpost = scripts/mod/modpost \ $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \ $(if $(KBUILD_EXTMOD),-I $(modulesymfile)) \ $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ - $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) + $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \ + $(if $(cross_build),-c) quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules cmd_modpost = $(modpost) -s
scripts/mod/file2alias.c +4 -0
@@ -51,11 +51,13 @@ do { \sprintf (str +strlen (str),"*" ); \ }while (0 ) +unsigned int cross_build = 0;/** * Check that sizeof(device_id type) are consistent with size of section * in .o file. If in-consistent then userspace and kernel does not agree * on actual size which is a bug. * Also verify that the final entry in the table is all zeros. +* Ignore both checks if build host differ from target host and size differs. **/ static void device_id_check(const char *modname, const char *device_id, unsigned long size, unsigned long id_size,
@@ -64,6 +66,8 @@ static void device_id_check(const char *modname, const char *device_id,int i;if (size % id_size || size < id_size) { +if (cross_build !=0 ) +return ;fatal ("%s: sizeof(struct %s_device_id)=%lu is not a modulo " "of the size of section __mod_%s_device_table=%lu.\n" "Fix definition of struct %s_device_id "
scripts/mod/modpost.c +4 -1
@@ -1659,7 +1659,7 @@ int main(int argc, char **argv)int opt;int err; -while ((opt =getopt (argc, argv,"i:I:mso:aw" )) !=-1 ) { +while ((opt =getopt (argc, argv,"i:I:cmso:aw" )) !=-1 ) {switch (opt) {case 'i' : kernel_read = optarg;
@@ -1668,6 +1668,9 @@ int main(int argc, char **argv) module_read = optarg; external_module =1 ;break ; +case 'c' : + cross_build =1 ; +break ;case 'm' : modversions =1 ;break ;
scripts/mod/modpost.h +1 -0
@@ -130,6 +130,7 @@ struct elf_info { };/* file2alias.c */ +extern unsigned int cross_build;void handle_moddevtable (struct module *mod,struct elf_info *info,Elf_Sym *sym,const char *symname);void add_moddevtable (struct buffer *buf,struct module *mod);
security/capability.c +0 -1
@@ -40,7 +40,6 @@ static struct security_operations capability_ops = { .inode_need_killpriv = cap_inode_need_killpriv, .inode_killpriv = cap_inode_killpriv, - .task_kill = cap_task_kill, .task_setscheduler = cap_task_setscheduler, .task_setioprio = cap_task_setioprio, .task_setnice = cap_task_setnice,
security/commoncap.c +0 -39
@@ -527,40 +527,6 @@ int cap_task_setnice (struct task_struct *p, int nice) return cap_safe_nice(p); } -int cap_task_kill (struct task_struct *p,struct siginfo *info, -int sig,u32 secid) -{ -if (info !=SEND_SIG_NOINFO && (is_si_special (info) ||SI_FROMKERNEL (info))) -return 0 ; - -/* -* Running a setuid root program raises your capabilities. -* Killing your own setuid root processes was previously -* allowed. -* We must preserve legacy signal behavior in this case. -*/ -if (p->uid == current->uid) -return 0 ; - -/* sigcont is permitted within same session */ -if (sig ==SIGCONT && (task_session_nr (current) ==task_session_nr (p))) -return 0 ; - -if (secid) -/* -* Signal sent as a particular user. -* Capabilities are ignored. May be wrong, but it's the -* only thing we can do at the moment. -* Used only by usb drivers? -*/ -return 0 ; -if (cap_issubset (p->cap_permitted, current->cap_permitted)) -return 0 ; -if (capable (CAP_KILL )) -return 0 ; - -return -EPERM ; -}#else int cap_task_setscheduler (struct task_struct *p,int policy,struct sched_param *lp)
@@ -575,11 +541,6 @@ int cap_task_setnice (struct task_struct *p, int nice) {return 0 ; } -int cap_task_kill (struct task_struct *p,struct siginfo *info, -int sig,u32 secid) -{ -return 0 ; -}#endif void cap_task_reparent_to_init (struct task_struct *p)