Linux 2.6.33.2
Subsystems (72)
Documentation/filesystems/tmpfs.txt +5 -1
@@ -82,11 +82,13 @@ tmpfs has a mount option to set the NUMA memory allocation policy for all files in that instance (if CONFIG_NUMA is enabled) - which can be adjusted on the fly via 'mount -o remount ...' -mpol=default prefers to allocate memory from the local node +mpol=default use the process allocation policy + (see set_mempolicy(2)) mpol=prefer:Node prefers to allocate memory from the given Node mpol=bind:NodeList allocates memory only from nodes in NodeList mpol=interleave prefers to allocate from each node in turn mpol=interleave:NodeList allocates from each node of NodeList in turn +mpol=local prefers to allocate memory from the local node NodeList format is a comma-separated list of decimal numbers and ranges, a range being two hyphen-separated decimal numbers, the smallest and
@@ -134,3 +136,5 @@ Author: Christoph Rohland <[email protected]>, 1.12.01 Updated: Hugh Dickins, 4 June 2007 +Updated: + KOSAKI Motohiro, 16 Mar 2010
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 33 -EXTRAVERSION = .1 +EXTRAVERSION = .2 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/arm/boot/compressed/head.S +23 -27
151 lines not on this page · raw message
arch/arm/boot/compressed/vmlinux.lds.in +3 -0
@@ -36,6 +36,9 @@ SECTIONS _etext = .; + /* Assume size of decompressed image is 4x the compressed image */ + _image_size = (_etext - _text) * 4; + _got_start = .; .got : { *(.got) } _got_end = .;
arch/powerpc/kernel/perf_event.c +4 -4
@@ -1164,10 +1164,10 @@ static void record_and_restart(struct perf_event *event, unsigned long val,* Finally record data if requested. */ if (record) { -struct perf_sample_data data = { - .addr = ~0ULL , - .period = event->hw.last_period, - }; +struct perf_sample_data data; + +perf_sample_data_init (&data, ~0ULL ); + data.period = event->hw.last_period;if (event->attr.sample_type &PERF_SAMPLE_ADDR )perf_get_data_addr (regs, &data.addr);
arch/sh/boot/compressed/misc.c +1 -1
@@ -132,7 +132,7 @@ void decompress_kernel(void) output_addr = (CONFIG_MEMORY_START +0x2000 );#else output_addr =__pa ((unsigned long )&_text+PAGE_SIZE ); -#ifdef CONFIG_29BIT +#if defined(CONFIG_29BIT ) || defined(CONFIG_PMB_LEGACY ) output_addr |=P2SEG ;#endif #endif
arch/sparc/kernel/perf_event.c +2 -2
@@ -1189,7 +1189,7 @@ static int __kprobes perf_event_nmi_handler(struct notifier_block *self, regs = args->regs; - data.addr =0 ; +perf_sample_data_init (&data,0 ); cpuc = &__get_cpu_var (cpu_hw_events);
@@ -1337,7 +1337,7 @@ static void perf_callchain_user_32(struct pt_regs *regs,callchain_store (entry,PERF_CONTEXT_USER );callchain_store (entry, regs->tpc); - ufp = regs->u_regs[UREG_I6 ]; + ufp = regs->u_regs[UREG_I6 ] &0xffffffffUL ; do { struct sparc_stackf32 *usf, sf; unsigned long pc;
arch/sparc/prom/p1275.c +7 -5
@@ -32,10 +32,9 @@ extern void prom_cif_interface(void);extern void prom_cif_callback (void );/* -* This provides SMP safety on the p1275buf. prom_callback() drops this lock -* to allow recursuve acquisition. +* This provides SMP safety on the p1275buf. */ -DEFINE_SPINLOCK (prom_entry_lock); +DEFINE_RAW_SPINLOCK (prom_entry_lock);long p1275_cmd (const char *service,long fmt, ...) {
@@ -47,7 +46,9 @@ long p1275_cmd(const char *service, long fmt, ...) p = p1275buf.prom_buffer; -spin_lock_irqsave (&prom_entry_lock, flags); +raw_local_save_flags (flags); +raw_local_irq_restore (PIL_NMI ); +raw_spin_lock (&prom_entry_lock); p1275buf.prom_args[0 ] = (unsigned long )p;/* service */ strcpy (p, service);
@@ -139,7 +140,8 @@ long p1275_cmd(const char *service, long fmt, ...)va_end (list); x = p1275buf.prom_args [nargs +3 ]; -spin_unlock_irqrestore (&prom_entry_lock, flags); +raw_spin_unlock (&prom_entry_lock); +raw_local_irq_restore (flags);return x; }
arch/x86/include/asm/fixmap.h +3 -3
@@ -82,6 +82,9 @@ enum fixed_addresses {#endif FIX_DBGP_BASE, FIX_EARLYCON_MEM_BASE, +#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT + FIX_OHCI1394_BASE, +#endif #ifdef CONFIG_X86_LOCAL_APIC FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */#endif
@@ -126,9 +129,6 @@ enum fixed_addresses {FIX_BTMAP_END = __end_of_permanent_fixed_addresses +256 - (__end_of_permanent_fixed_addresses &255 ),FIX_BTMAP_BEGIN =FIX_BTMAP_END +NR_FIX_BTMAPS *FIX_BTMAPS_SLOTS -1 , -#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT -FIX_OHCI1394_BASE , -#endif #ifdef CONFIG_X86_32 FIX_WP_TEST, #endif
arch/x86/include/asm/msr-index.h +2 -0
@@ -105,6 +105,8 @@#define MSR_AMD64_PATCH_LEVEL 0x0000008b#define MSR_AMD64_NB_CFG 0xc001001f#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141#define MSR_AMD64_IBSFETCHCTL 0xc0011030#define MSR_AMD64_IBSFETCHLINAD 0xc0011031#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032
arch/x86/kernel/cpu/intel.c +2 -1
@@ -70,7 +70,8 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)if (c->x86_power & (1 <<8 )) {set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC );set_cpu_cap (c,X86_FEATURE_NONSTOP_TSC ); - sched_clock_stable =1 ; +if (!check_tsc_unstable ()) + sched_clock_stable =1 ; }/*
arch/x86/kernel/cpu/perf_event.c +3 -6
@@ -1636,10 +1636,9 @@ static void intel_pmu_drain_bts_buffer(struct cpu_hw_events *cpuc) ds->bts_index = ds->bts_buffer_base; +perf_sample_data_init (&data,0 ); data.period = event->hw.last_period; - data.addr =0 ; - data.raw =NULL ; regs.ip =0 ;/*
@@ -1756,8 +1755,7 @@ static int p6_pmu_handle_irq(struct pt_regs *regs)int idx, handled =0 ;u64 val; - data.addr =0 ; - data.raw =NULL ; +perf_sample_data_init (&data,0 ); cpuc = &__get_cpu_var (cpu_hw_events);
@@ -1802,8 +1800,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)int bit, loops;u64 ack, status; - data.addr =0 ; - data.raw =NULL ; +perf_sample_data_init (&data,0 ); cpuc = &__get_cpu_var (cpu_hw_events);
arch/x86/kernel/dumpstack_64.c +8 -2
@@ -125,9 +125,15 @@ fixup_bp_irq_link(unsigned long bp, unsigned long *stack, {#ifdef CONFIG_FRAME_POINTER struct stack_frame *frame = (struct stack_frame *)bp; +unsigned long next; -if (!in_irq_stack (stack, irq_stack, irq_stack_end)) -return (unsigned long )frame->next_frame; +if (!in_irq_stack (stack, irq_stack, irq_stack_end)) { +if (!probe_kernel_address (&frame->next_frame, next)) +return next; +else +WARN_ONCE (1 ,"Perf: bad frame pointer = %p in " +"callchain\n" , &frame->next_frame); + }#endif return bp; }
arch/x86/kernel/hw_breakpoint.c +0 -5
@@ -531,8 +531,3 @@ void hw_breakpoint_pmu_read(struct perf_event *bp) {/* TODO */ } - -void hw_breakpoint_pmu_unthrottle (struct perf_event *bp) -{ -/* TODO */ -}
arch/x86/kernel/process.c +24 -8
@@ -519,21 +519,37 @@ static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) }/* -* Check for AMD CPUs, which have potentially C1E support +* Check for AMD CPUs, where APIC timer interrupt does not wake up CPU from C1e. +* For more information see +* - Erratum #400 for NPT family 0xf and family 0x10 CPUs +* - Erratum #365 for family 0x11 (not affected because C1e not in use) */ static int __cpuinit check_c1e_idle (const struct cpuinfo_x86 *c) { +u64 val;if (c->x86_vendor !=X86_VENDOR_AMD ) -return 0 ; - -if (c->x86 <0x0F ) -return 0 ; + goto no_c1e_idle;/* Family 0x0f models < rev F do not have C1E */ -if (c->x86 ==0x0f && c->x86_model <0x40 ) -return 0 ; +if (c->x86 ==0x0F && c->x86_model >=0x40 ) +return 1 ; -return 1 ; +if (c->x86 ==0x10 ) { +/* +* check OSVW bit for CPUs that are not affected +* by erratum #400 +*/ +rdmsrl (MSR_AMD64_OSVW_ID_LENGTH , val); +if (val >=2 ) { +rdmsrl (MSR_AMD64_OSVW_STATUS , val); +if (!(val &BIT (1 ))) + goto no_c1e_idle; + } +return 1 ; + } + +no_c1e_idle: +return 0 ; }static cpumask_var_t c1e_mask;
arch/x86/kvm/x86.c +1 -0
@@ -1351,6 +1351,7 @@ int kvm_dev_ioctl_check_extension(long ext)case KVM_CAP_XEN_HVM :case KVM_CAP_ADJUST_CLOCK :case KVM_CAP_VCPU_EVENTS : +case KVM_CAP_X86_ROBUST_SINGLESTEP : r =1 ;break ;case KVM_CAP_COALESCED_MMIO :
arch/x86/mm/pageattr.c +23 -2
@@ -291,8 +291,29 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,*/ if (kernel_set_to_readonly &&within (address, (unsigned long )_text, - (unsigned long )__end_rodata_hpage_align)) -pgprot_val (forbidden) |= _PAGE_RW; + (unsigned long )__end_rodata_hpage_align)) { +unsigned int level; + +/* +* Don't enforce the !RW mapping for the kernel text mapping, +* if the current mapping is already using small page mapping. +* No need to work hard to preserve large page mappings in this +* case. +* +* This also fixes the Linux Xen paravirt guest boot failure +* (because of unexpected read-only mappings for kernel identity +* mappings). In this paravirt guest case, the kernel text +* mapping and the kernel identity mapping share the same +* page-table pages. Thus we can't really use different +* protections for the kernel text and identity mappings. Also, +* these shared mappings are made of small page mappings. +* Thus this don't enforce !RW mapping for small page kernel +* text mapping logic will help Linux Xen parvirt guest boot +* aswell. +*/ +if (lookup_address (address, &level) && (level !=PG_LEVEL_4K )) +pgprot_val (forbidden) |= _PAGE_RW; + }#endif prot =__pgprot (pgprot_val (prot) & ~pgprot_val (forbidden));
drivers/ata/ahci.c +20 -8
@@ -2831,6 +2831,14 @@ static bool ahci_broken_suspend(struct pci_dev *pdev)* On HP dv[4-6] and HDX18 with earlier BIOSen, link * to the harddisk doesn't become online after * resuming from STR. Warn and fail suspend. +* +* http://bugzilla.kernel.org/show_bug.cgi?id=12276 +* +* Use dates instead of versions to match as HP is +* apparently recycling both product and version +* strings. +* +* http://bugzilla.kernel.org/show_bug.cgi?id=15462 */ { .ident = "dv4",
@@ -2839,7 +2847,7 @@ static bool ahci_broken_suspend(struct pci_dev *pdev)DMI_MATCH (DMI_PRODUCT_NAME , "HP Pavilion dv4 Notebook PC"), }, - .driver_data ="F.30" ,/* cutoff BIOS version */ + .driver_data ="20090105" ,/* F.30 */ }, { .ident = "dv5",
@@ -2848,7 +2856,7 @@ static bool ahci_broken_suspend(struct pci_dev *pdev)DMI_MATCH (DMI_PRODUCT_NAME , "HP Pavilion dv5 Notebook PC"), }, - .driver_data ="F.16" ,/* cutoff BIOS version */ + .driver_data ="20090506" ,/* F.16 */ }, { .ident = "dv6",
@@ -2857,7 +2865,7 @@ static bool ahci_broken_suspend(struct pci_dev *pdev)DMI_MATCH (DMI_PRODUCT_NAME , "HP Pavilion dv6 Notebook PC"), }, - .driver_data ="F.21" ,/* cutoff BIOS version */ + .driver_data ="20090423" ,/* F.21 */ }, { .ident = "HDX18",
@@ -2866,7 +2874,7 @@ static bool ahci_broken_suspend(struct pci_dev *pdev)DMI_MATCH (DMI_PRODUCT_NAME , "HP HDX18 Notebook PC"), }, - .driver_data = "F.23", /* cutoff BIOS version */ + .driver_data = "20090430", /* F.23 */ },/* * Acer eMachines G725 has the same problem. BIOS
@@ -2874,6 +2882,8 @@ static bool ahci_broken_suspend(struct pci_dev *pdev)* work. Inbetween, there are V1.06, V2.06 and V3.03 * that we don't have much idea about. For now, * blacklist anything older than V3.04. +* +* http://bugzilla.kernel.org/show_bug.cgi?id=15104 */ { .ident = "G725",
@@ -2881,19 +2891,21 @@ static bool ahci_broken_suspend(struct pci_dev *pdev) DMI_MATCH(DMI_SYS_VENDOR, "eMachines"), DMI_MATCH(DMI_PRODUCT_NAME, "eMachines G725"), }, - .driver_data = "V3.04", /* cutoff BIOS version */ + .driver_data = "20091216", /* V3.04 */ }, { }/* terminate list */ };const struct dmi_system_id *dmi =dmi_first_match (sysids); -const char *ver; +int year, month, date; +char buf[9 ];if (!dmi || pdev->bus->number || pdev->devfn !=PCI_DEVFN (0x1f ,2 ))return false; - ver =dmi_get_system_info (DMI_BIOS_VERSION ); +dmi_get_date (DMI_BIOS_DATE , &year, &month, &date); +snprintf (buf,sizeof (buf),"%04d%02d%02d" , year, month, date); -return !ver ||strcmp (ver, dmi->driver_data) <0 ; +return strcmp (buf, dmi->driver_data) <0 ; }static bool ahci_broken_online (struct pci_dev *pdev)
drivers/ata/pata_via.c +4 -0
@@ -588,6 +588,10 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)u8 rev = isa->revision;pci_dev_put (isa); +if ((id->device ==0x0415 || id->device ==0x3164 ) && + (config->id != id->device)) +continue ; +if (rev >= config->rev_min && rev <= config->rev_max)break ; }
drivers/char/tty_buffer.c +4 -2
@@ -247,7 +247,8 @@ int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, {int copied =0 ; do { - int space = tty_buffer_request_room(tty, size - copied); + int goal = min(size - copied, TTY_BUFFER_PAGE); + int space = tty_buffer_request_room(tty, goal); struct tty_buffer *tb = tty->buf.tail; /* If there is no space then tb may be NULL */ if (unlikely(space == 0))
@@ -283,7 +284,8 @@ int tty_insert_flip_string_flags(struct tty_struct *tty, {int copied =0 ; do { - int space = tty_buffer_request_room(tty, size - copied); + int goal = min(size - copied, TTY_BUFFER_PAGE); + int space = tty_buffer_request_room(tty, goal); struct tty_buffer *tb = tty->buf.tail; /* If there is no space then tb may be NULL */ if (unlikely(space == 0))
drivers/edac/edac_mce_amd.c +6 -1
@@ -316,7 +316,12 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)if (regs->nbsh &K8_NBSH_ERR_CPU_VAL )pr_cont (", core: %u\n" , (u8)(regs->nbsh &0xf )); }else { -pr_cont (", core: %d\n" ,fls ((regs->nbsh &0xf ) -1 )); +u8 assoc_cpus = regs->nbsh &0xf ; + +if (assoc_cpus >0 ) +pr_cont (", core: %d" ,fls (assoc_cpus) -1 ); + +pr_cont ("\n" ); }pr_emerg ("%s.\n" ,EXT_ERR_MSG (xec));
drivers/gpu/drm/i915/i915_gem.c +12 -9
@@ -1470,9 +1470,6 @@ i915_gem_object_put_pages(struct drm_gem_object *obj) obj_priv->dirty =0 ;for (i =0 ; i < page_count; i++) { -if (obj_priv->pages[i] ==NULL ) -break ; -if (obj_priv->dirty)set_page_dirty (obj_priv->pages[i]);
@@ -2228,7 +2225,6 @@ i915_gem_object_get_pages(struct drm_gem_object *obj,struct address_space *mapping;struct inode *inode;struct page *page; -int ret;if (obj_priv->pages_refcount++ !=0 )return 0 ;
@@ -2251,11 +2247,9 @@ i915_gem_object_get_pages(struct drm_gem_object *obj,mapping_gfp_mask (mapping) | __GFP_COLD | gfpmask); -if (IS_ERR (page)) { - ret =PTR_ERR (page); -i915_gem_object_put_pages (obj); -return ret; - } +if (IS_ERR (page)) + goto err_pages; + obj_priv->pages[i] = page; }
@@ -2263,6 +2257,15 @@ i915_gem_object_get_pages(struct drm_gem_object *obj,i915_gem_object_do_bit_17_swizzle (obj);return 0 ; + +err_pages: +while (i--) +page_cache_release (obj_priv->pages[i]); + +drm_free_large (obj_priv->pages); + obj_priv->pages =NULL ; + obj_priv->pages_refcount--; +return PTR_ERR (page); }static void i965_write_fence_reg (struct drm_i915_fence_reg *reg)
drivers/gpu/drm/i915/intel_overlay.c +9 -4
@@ -1083,14 +1083,18 @@ int intel_overlay_put_image(struct drm_device *dev, void *data, drmmode_obj =drm_mode_object_find (dev, put_image_rec->crtc_id,DRM_MODE_OBJECT_CRTC ); -if (!drmmode_obj) -return -ENOENT ; +if (!drmmode_obj) { + ret = -ENOENT ; + goto out_free; + } crtc =to_intel_crtc (obj_to_crtc (drmmode_obj)); new_bo =drm_gem_object_lookup (dev, file_priv, put_image_rec->bo_handle); -if (!new_bo) -return -ENOENT ; +if (!new_bo) { + ret = -ENOENT ; + goto out_free; + }mutex_lock (&dev->mode_config.mutex);mutex_lock (&dev->struct_mutex);
@@ -1180,6 +1184,7 @@ out_unlock:mutex_unlock (&dev->struct_mutex);mutex_unlock (&dev->mode_config.mutex);drm_gem_object_unreference (new_bo); +out_free:kfree (params);return ret;
drivers/gpu/drm/nouveau/nouveau_connector.c +4 -2
@@ -239,12 +239,14 @@ nouveau_connector_detect(struct drm_connector *connector)if (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS ) nv_encoder =find_encoder_by_type (connector,OUTPUT_LVDS );if (nv_encoder && nv_connector->native_mode) { +unsigned status = connector_status_connected; +#ifdef CONFIG_ACPI if (!nouveau_ignorelid && !acpi_lid_open ()) -return connector_status_disconnected; + status = connector_status_unknown;#endif nouveau_connector_set_encoder (connector, nv_encoder); -return connector_status_connected; +return status; }/* Cleanup the previous EDID block. */
drivers/hwmon/coretemp.c +1 -1
@@ -228,7 +228,7 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *if (err) {dev_warn (dev,"Unable to access MSR 0xEE, for Tjmax, left" -" at default" ); +" at default\n" ); }else if (eax &0x40000000 ) { tjmax = tjmax_ee; }
drivers/i2c/busses/i2c-i801.c +4 -2
@@ -415,9 +415,11 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write, data->block[0 ] =32 ;/* max for SMBus block reads */ } +/* Experience has shown that the block buffer can only be used for +SMBus (not I2C) block transactions, even though the datasheet +doesn't mention this limitation. */ if ((i801_features &FEATURE_BLOCK_BUFFER ) - && !(command ==I2C_SMBUS_I2C_BLOCK_DATA - && read_write ==I2C_SMBUS_READ ) + && command !=I2C_SMBUS_I2C_BLOCK_DATA &&i801_set_block_buffer_mode () ==0 ) result =i801_block_transaction_by_block (data, read_write, hwpec);
drivers/i2c/busses/i2c-powermac.c +18 -7
@@ -122,9 +122,14 @@ static s32 i2c_powermac_smbus_xfer( struct i2c_adapter* adap, rc =pmac_i2c_xfer (bus, addrdir, subsize, subaddr, buf, len);if (rc) { -dev_err (&adap->dev, -"I2C transfer at 0x%02x failed, size %d, err %d\n" , - addrdir >>1 , size, rc); +if (rc == -ENXIO ) +dev_dbg (&adap->dev, +"I2C transfer at 0x%02x failed, size %d, " +"err %d\n" , addrdir >>1 , size, rc); +else +dev_err (&adap->dev, +"I2C transfer at 0x%02x failed, size %d, " +"err %d\n" , addrdir >>1 , size, rc); goto bail; }
@@ -175,10 +180,16 @@ static int i2c_powermac_master_xfer( struct i2c_adapter *adap, goto bail; } rc =pmac_i2c_xfer (bus, addrdir,0 ,0 , msgs->buf, msgs->len); -if (rc <0 ) -dev_err (&adap->dev,"I2C %s 0x%02x failed, err %d\n" , - addrdir &1 ?"read from" :"write to" , addrdir >>1 , - rc); +if (rc <0 ) { +if (rc == -ENXIO ) +dev_dbg (&adap->dev,"I2C %s 0x%02x failed, err %d\n" , + addrdir &1 ?"read from" :"write to" , + addrdir >>1 , rc); +else +dev_err (&adap->dev,"I2C %s 0x%02x failed, err %d\n" , + addrdir &1 ?"read from" :"write to" , + addrdir >>1 , rc); + } bail:pmac_i2c_close (bus);return rc <0 ? rc :1 ;
drivers/ide/icside.c +60 -4
107 lines not on this page · raw message
drivers/ide/ide-probe.c +3 -9
@@ -695,14 +695,8 @@ static int ide_probe_port(ide_hwif_t *hwif)if (irqd)disable_irq (hwif->irq); - rc =ide_port_wait_ready (hwif); -if (rc == -ENODEV ) { -printk (KERN_INFO "%s: no devices on the port\n" , hwif->name); - goto out; - }else if (rc == -EBUSY ) -printk (KERN_ERR "%s: not ready before the probe\n" , hwif->name); -else - rc = -ENODEV ; +if (ide_port_wait_ready (hwif) == -EBUSY ) +printk (KERN_DEBUG "%s: Wait for ready failed before probe !\n" , hwif->name);/* * Second drive should only exist if first drive was found,
@@ -713,7 +707,7 @@ static int ide_probe_port(ide_hwif_t *hwif)if (drive->dev_flags &IDE_DFLAG_PRESENT ) rc =0 ; } -out: +/* * Use cached IRQ number. It might be (and is...) changed by probe * code above
drivers/ide/pdc202xx_old.c +2 -2
@@ -100,13 +100,13 @@ static int pdc202xx_test_irq(ide_hwif_t *hwif)* bit 7: error, bit 6: interrupting, * bit 5: FIFO full, bit 4: FIFO empty */ -return ((sc1d &0x50 ) ==0x40 ) ?1 :0 ; +return ((sc1d &0x50 ) ==0x50 ) ?1 :0 ; }else {/* * bit 3: error, bit 2: interrupting, * bit 1: FIFO full, bit 0: FIFO empty */ -return ((sc1d &0x05 ) ==0x04 ) ?1 :0 ; +return ((sc1d &0x05 ) ==0x05 ) ?1 :0 ; } }
drivers/input/mouse/alps.c +2 -0
@@ -63,6 +63,8 @@ static const struct alps_model_info alps_model_data[] = { { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS }, /* Dell Vostro 1400 */ + { { 0x52, 0x01, 0x14 }, 0xff, 0xff, + ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */ }; /*
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -442,6 +442,13 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { }, }, { +/* Medion Akoya E1222 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"MEDION" ), + DMI_MATCH(DMI_PRODUCT_NAME, "E122X"), + }, + }, + {/* Mivvy M310 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "VIOOO"),
drivers/isdn/gigaset/capi.c +26 -20
93 lines not on this page · raw message
drivers/isdn/gigaset/common.c +4 -2
@@ -505,7 +505,7 @@ void gigaset_freecs(struct cardstate *cs)case 2 :/* error in initcshw */ /* Deregister from LL */ make_invalid (cs,VALID_ID ); -gigaset_isdn_unregister (cs); +gigaset_isdn_unregdev (cs);/* fall through */ case 1 :/* error when registering to LL */
@@ -767,7 +767,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels, cs->cmdbytes =0 ;gig_dbg (DEBUG_INIT ,"setting up iif" ); -if (!gigaset_isdn_register (cs, modulename)) { +if (!gigaset_isdn_regdev (cs, modulename)) {pr_err ("error registering ISDN device\n" ); goto error; }
@@ -1214,11 +1214,13 @@ static int __init gigaset_init_module(void) gigaset_debuglevel =DEBUG_DEFAULT ; pr_info(DRIVER_DESC DRIVER_DESC_DEBUG "\n"); +gigaset_isdn_regdrv ();return 0 ; } static void __exit gigaset_exit_module(void) { +gigaset_isdn_unregdrv (); }module_init (gigaset_init_module);
drivers/isdn/gigaset/dummyll.c +11 -3
@@ -57,12 +57,20 @@ void gigaset_isdn_stop(struct cardstate *cs) { } -int gigaset_isdn_register (struct cardstate *cs,const char *isdnid) +int gigaset_isdn_regdev (struct cardstate *cs,const char *isdnid) { -pr_info ("no ISDN subsystem interface\n" );return 1 ; } -void gigaset_isdn_unregister (struct cardstate *cs) +void gigaset_isdn_unregdev (struct cardstate *cs) +{ +} + +void gigaset_isdn_regdrv (void ) +{ +pr_info ("no ISDN subsystem interface\n" ); +} + +void gigaset_isdn_unregdrv (void ) { }
drivers/isdn/gigaset/ev-layer.c +4 -8
@@ -1259,14 +1259,10 @@ static void do_action(int action, struct cardstate *cs,* note that bcs may be NULL if no B channel is free */ at_state2->ConState =700 ; -kfree (at_state2->str_var[STR_NMBR ]); - at_state2->str_var[STR_NMBR ] =NULL ; -kfree (at_state2->str_var[STR_ZCPN ]); - at_state2->str_var[STR_ZCPN ] =NULL ; -kfree (at_state2->str_var[STR_ZBC ]); - at_state2->str_var[STR_ZBC ] =NULL ; -kfree (at_state2->str_var[STR_ZHLC ]); - at_state2->str_var[STR_ZHLC ] =NULL ; +for (i =0 ; i <STR_NUM ; ++i) { +kfree (at_state2->str_var[i]); + at_state2->str_var[i] =NULL ; + } at_state2->int_var[VAR_ZCTP ] =-1 ;spin_lock_irqsave (&cs->lock, flags);
drivers/isdn/gigaset/gigaset.h +4 -2
@@ -674,8 +674,10 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size);*/ /* Called from common.c for setting up/shutting down with the ISDN subsystem */ -int gigaset_isdn_register (struct cardstate *cs,const char *isdnid); -void gigaset_isdn_unregister (struct cardstate *cs); +void gigaset_isdn_regdrv (void ); +void gigaset_isdn_unregdrv (void ); +int gigaset_isdn_regdev (struct cardstate *cs,const char *isdnid); +void gigaset_isdn_unregdev (struct cardstate *cs);/* Called from hardware module to indicate completion of an skb */ void gigaset_skb_sent (struct bc_state *bcs,struct sk_buff *skb);
drivers/isdn/gigaset/i4l.c +20 -8
@@ -632,15 +632,13 @@ void gigaset_isdn_stop(struct cardstate *cs) }/** -* gigaset_isdn_register() - register to LL +* gigaset_isdn_regdev() - register to LL * @cs: device descriptor structure. * @isdnid: device name. * -* Called by main module to register the device with the LL. -* * Return value: 1 for success, 0 for failure */ -int gigaset_isdn_register (struct cardstate *cs,const char *isdnid) +int gigaset_isdn_regdev (struct cardstate *cs,const char *isdnid) {isdn_if *iif;
@@ -690,15 +688,29 @@ int gigaset_isdn_register(struct cardstate *cs, const char *isdnid) }/** -* gigaset_isdn_unregister() - unregister from LL +* gigaset_isdn_unregdev() - unregister device from LL * @cs: device descriptor structure. -* -* Called by main module to unregister the device from the LL. */ -void gigaset_isdn_unregister (struct cardstate *cs) +void gigaset_isdn_unregdev (struct cardstate *cs) {gig_dbg (DEBUG_CMD ,"sending UNLOAD" );gigaset_i4l_cmd (cs,ISDN_STAT_UNLOAD );kfree (cs->iif); cs->iif =NULL ; } + +/** +* gigaset_isdn_regdrv() - register driver to LL +*/ +void gigaset_isdn_regdrv (void ) +{ +/* nothing to do */ +} + +/** +* gigaset_isdn_unregdrv() - unregister driver from LL +*/ +void gigaset_isdn_unregdrv (void ) +{ +/* nothing to do */ +}
drivers/isdn/gigaset/interface.c +0 -1
@@ -632,7 +632,6 @@ void gigaset_if_receive(struct cardstate *cs,if (tty ==NULL )gig_dbg (DEBUG_ANY ,"receive on closed device" );else { -tty_buffer_request_room (tty, len);tty_insert_flip_string (tty, buffer, len);tty_flip_buffer_push (tty); }
drivers/leds/leds-gpio.c +1 -2
@@ -211,7 +211,6 @@ static int __devinit of_gpio_leds_probe(struct of_device *ofdev, const struct of_device_id *match) {struct device_node *np = ofdev->node, *child; -struct gpio_led led;struct gpio_led_of_platform_data *pdata;int count =0 , ret;
@@ -226,8 +225,8 @@ static int __devinit of_gpio_leds_probe(struct of_device *ofdev,if (!pdata)return -ENOMEM ; -memset (&led,0 ,sizeof (led));for_each_child_of_node (np, child) { +struct gpio_led led = {};enum of_gpio_flags flags;const char *state;
drivers/media/video/em28xx/em28xx-dvb.c +1 -0
@@ -606,6 +606,7 @@ static int dvb_fini(struct em28xx *dev)if (dev->dvb) {unregister_dvb (dev->dvb); +kfree (dev->dvb); dev->dvb =NULL ; }
drivers/net/bonding/bond_main.c +2 -0
@@ -4935,6 +4935,8 @@ int bond_create(struct net *net, const char *name) } res =register_netdevice (bond_dev); +if (res <0 ) + goto out_netdev; out:rtnl_unlock ();
drivers/net/can/bfin_can.c +2 -1
@@ -26,6 +26,7 @@#define DRV_NAME "bfin_can"#define BFIN_CAN_TIMEOUT 100 +#define TX_ECHO_SKB_MAX 1/* * transmit and receive channels
@@ -590,7 +591,7 @@ struct net_device *alloc_bfin_candev(void)struct net_device *dev;struct bfin_can_priv *priv; - dev =alloc_candev (sizeof (*priv)); + dev =alloc_candev (sizeof (*priv),TX_ECHO_SKB_MAX );if (!dev)return NULL ;
drivers/net/e100.c +1 -1
@@ -2854,7 +2854,7 @@ static int __devinit e100_probe(struct pci_dev *pdev, } nic->cbs_pool =pci_pool_create (netdev->name, nic->pdev, - nic->params.cbs.count *sizeof (struct cb ), + nic->params.cbs.max *sizeof (struct cb ),sizeof (u32),0 ); DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n",
drivers/net/jme.c +35 -0
@@ -946,6 +946,8 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx) jme->jme_vlan_rx (skb, jme->vlgrp,le16_to_cpu (rxdesc->descwb.vlan));NET_STAT (jme).rx_bytes +=4 ; + }else { +dev_kfree_skb (skb); } }else { jme->jme_rx (skb);
@@ -2085,12 +2087,45 @@ jme_tx_timeout(struct net_device *netdev)jme_reset_link (jme); } +static inline void jme_pause_rx (struct jme_adapter *jme) +{ +atomic_dec (&jme->link_changing); + +jme_set_rx_pcc (jme,PCC_OFF ); +if (test_bit (JME_FLAG_POLL , &jme->flags)) { +JME_NAPI_DISABLE (jme); + }else { +tasklet_disable (&jme->rxclean_task); +tasklet_disable (&jme->rxempty_task); + } +} + +static inline void jme_resume_rx (struct jme_adapter *jme) +{ +struct dynpcc_info *dpi = &(jme->dpi); + +if (test_bit (JME_FLAG_POLL , &jme->flags)) { +JME_NAPI_ENABLE (jme); + }else { +tasklet_hi_enable (&jme->rxclean_task); +tasklet_hi_enable (&jme->rxempty_task); + } + dpi->cur =PCC_P1 ; + dpi->attempt =PCC_P1 ; + dpi->cnt =0 ; +jme_set_rx_pcc (jme,PCC_P1 ); + +atomic_inc (&jme->link_changing); +} +static void jme_vlan_rx_register (struct net_device *netdev,struct vlan_group *grp) {struct jme_adapter *jme =netdev_priv (netdev); +jme_pause_rx (jme); jme->vlgrp = grp; +jme_resume_rx (jme); } static void
drivers/net/pppol2tp.c +5 -1
@@ -756,6 +756,7 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)/* Try to dequeue as many skbs from reorder_q as we can. */ pppol2tp_recv_dequeue (session); +sock_put (sock);return 0 ;
@@ -772,6 +773,7 @@ discard_bad_csum:UDP_INC_STATS_USER (&init_net,UDP_MIB_INERRORS ,0 ); tunnel->stats.rx_errors++;kfree_skb (skb); +sock_put (sock);return 0 ;
@@ -1180,7 +1182,8 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)/* Calculate UDP checksum if configured to do so */ if (sk_tun->sk_no_check ==UDP_CSUM_NOXMIT ) skb->ip_summed =CHECKSUM_NONE ; -else if (!(skb_dst (skb)->dev->features &NETIF_F_V4_CSUM )) { +else if ((skb_dst (skb) &&skb_dst (skb)->dev) && + (!(skb_dst (skb)->dev->features &NETIF_F_V4_CSUM ))) { skb->ip_summed =CHECKSUM_COMPLETE ; csum =skb_checksum (skb,0 , udp_len,0 ); uh->check = csum_tcpudp_magic(inet->inet_saddr,
@@ -1661,6 +1664,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,if (tunnel_sock ==NULL ) goto end; +sock_hold (tunnel_sock); tunnel = tunnel_sock->sk_user_data; }else { tunnel =pppol2tp_tunnel_find (sock_net (sk), sp->pppol2tp.s_tunnel);
drivers/net/r8169.c +24 -5
@@ -186,7 +186,12 @@ static struct pci_device_id rtl8169_pci_tbl[] = {MODULE_DEVICE_TABLE (pci, rtl8169_pci_tbl); -static int rx_copybreak =200 ; +/* +* we set our copybreak very high so that we don't have +* to allocate 16k frames all the time (see note in +* rtl8169_open() +*/ +static int rx_copybreak =16383 ;static int use_dac; static struct { u32 msg_enable;
@@ -3245,9 +3250,13 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev) }static void rtl8169_set_rxbufsize (struct rtl8169_private *tp, -struct net_device *dev) +unsigned int mtu) { -unsigned int max_frame = dev->mtu +VLAN_ETH_HLEN +ETH_FCS_LEN ; +unsigned int max_frame = mtu +VLAN_ETH_HLEN +ETH_FCS_LEN ; + +if (max_frame !=16383 ) +printk (KERN_WARNING "WARNING! Changing of MTU on this NIC" +"May lead to frame reception errors!\n" ); tp->rx_buf_sz = (max_frame >RX_BUF_SIZE ) ? max_frame :RX_BUF_SIZE ; }
@@ -3259,7 +3268,17 @@ static int rtl8169_open(struct net_device *dev)int retval = -ENOMEM ; -rtl8169_set_rxbufsize (tp, dev); +/* +* Note that we use a magic value here, its wierd I know +* its done because, some subset of rtl8169 hardware suffers from +* a problem in which frames received that are longer than +* the size set in RxMaxSize register return garbage sizes +* when received. To avoid this we need to turn off filtering, +* which is done by setting a value of 16383 in the RxMaxSize register +* and allocating 16k frames to handle the largest possible rx value +* thats what the magic math below does. +*/ +rtl8169_set_rxbufsize (tp,16383 -VLAN_ETH_HLEN -ETH_FCS_LEN );/* * Rx and Tx desscriptors needs 256 bytes alignment.
@@ -3912,7 +3931,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)rtl8169_down (dev); -rtl8169_set_rxbufsize (tp, dev); +rtl8169_set_rxbufsize (tp, dev->mtu); ret =rtl8169_init_ring (dev);if (ret <0 )
drivers/net/tg3.c +1 -1
@@ -5223,7 +5223,7 @@ static void tg3_poll_controller(struct net_device *dev)struct tg3 *tp =netdev_priv (dev);for (i =0 ; i < tp->irq_cnt; i++) - tg3_interrupt(tp->napi[i].irq_vec, dev); + tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]); }#endif
drivers/net/wireless/ath/ath5k/ath5k.h +1 -1
@@ -535,7 +535,7 @@ struct ath5k_txq_info {u32 tqi_cbr_period;/* Constant bit rate period */ u32 tqi_cbr_overflow_limit;u32 tqi_burst_time; -u32 tqi_ready_time;/* Not used */ +u32 tqi_ready_time;/* Time queue waits after an event */ };/*
drivers/net/wireless/ath/ath5k/base.c +19 -3
@@ -1537,7 +1537,8 @@ ath5k_beaconq_config(struct ath5k_softc *sc) ret =ath5k_hw_get_tx_queueprops (ah, sc->bhalq, &qi);if (ret) -return ret; + goto err; +if (sc->opmode ==NL80211_IFTYPE_AP || sc->opmode ==NL80211_IFTYPE_MESH_POINT ) {/*
@@ -1564,10 +1565,25 @@ ath5k_beaconq_config(struct ath5k_softc *sc)if (ret) {ATH5K_ERR (sc,"%s: unable to update parameters for beacon " "hardware queue!\n" , __func__); -return ret; + goto err; } + ret =ath5k_hw_reset_tx_queue (ah, sc->bhalq);/* push to h/w */ +if (ret) + goto err; -return ath5k_hw_reset_tx_queue (ah, sc->bhalq);/* push to h/w */ ; +/* reconfigure cabq with ready time to 80% of beacon_interval */ + ret =ath5k_hw_get_tx_queueprops (ah,AR5K_TX_QUEUE_ID_CAB , &qi); +if (ret) + goto err; + + qi.tqi_ready_time = (sc->bintval *80 ) /100 ; + ret =ath5k_hw_set_tx_queueprops (ah,AR5K_TX_QUEUE_ID_CAB , &qi); +if (ret) + goto err; + + ret =ath5k_hw_reset_tx_queue (ah,AR5K_TX_QUEUE_ID_CAB ); +err: +return ret; } static void
drivers/net/wireless/ath/ath5k/phy.c +19 -18
@@ -1386,38 +1386,39 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah, goto done;/* Calibration has finished, get the results and re-run */ + +/* work around empty results which can apparently happen on 5212 */ for (i =0 ; i <=10 ; i++) { iq_corr =ath5k_hw_reg_read (ah,AR5K_PHY_IQRES_CAL_CORR ); i_pwr =ath5k_hw_reg_read (ah,AR5K_PHY_IQRES_CAL_PWR_I ); q_pwr =ath5k_hw_reg_read (ah,AR5K_PHY_IQRES_CAL_PWR_Q ); +ATH5K_DBG_UNLIMIT (ah->ah_sc,ATH5K_DEBUG_CALIBRATE , +"iq_corr:%x i_pwr:%x q_pwr:%x" , iq_corr, i_pwr, q_pwr); +if (i_pwr && q_pwr) +break ; } i_coffd = ((i_pwr >>1 ) + (q_pwr >>1 )) >>7 ; q_coffd = q_pwr >>7 ; -/* No correction */ -if (i_coffd ==0 || q_coffd ==0 ) +/* protect against divide by 0 and loss of sign bits */ +if (i_coffd ==0 || q_coffd <2 ) goto done; - i_coff = ((-iq_corr) / i_coffd); + i_coff = (-iq_corr) / i_coffd; + i_coff =clamp (i_coff,-32 ,31 );/* signed 6 bit */ -/* Boundary check */ -if (i_coff >31 ) - i_coff =31 ; -if (i_coff <-32 ) - i_coff =-32 ; + q_coff = (i_pwr / q_coffd) -128 ; + q_coff =clamp (q_coff,-16 ,15 );/* signed 5 bit */ - q_coff = (((s32 )i_pwr / q_coffd) -128 ); +ATH5K_DBG_UNLIMIT (ah->ah_sc,ATH5K_DEBUG_CALIBRATE , +"new I:%d Q:%d (i_coffd:%x q_coffd:%x)" , + i_coff, q_coff, i_coffd, q_coffd); -/* Boundary check */ -if (q_coff >15 ) - q_coff =15 ; -if (q_coff <-16 ) - q_coff =-16 ; - -/* Commit new I/Q value */ -AR5K_REG_ENABLE_BITS (ah,AR5K_PHY_IQ ,AR5K_PHY_IQ_CORR_ENABLE | - ((u32 )q_coff) | ((u32 )i_coff <<AR5K_PHY_IQ_CORR_Q_I_COFF_S )); +/* Commit new I/Q values (set enable bit last to match HAL sources) */ +AR5K_REG_WRITE_BITS (ah,AR5K_PHY_IQ ,AR5K_PHY_IQ_CORR_Q_I_COFF , i_coff); +AR5K_REG_WRITE_BITS (ah,AR5K_PHY_IQ ,AR5K_PHY_IQ_CORR_Q_Q_COFF , q_coff); +AR5K_REG_ENABLE_BITS (ah,AR5K_PHY_IQ ,AR5K_PHY_IQ_CORR_ENABLE );/* Re-enable calibration -if we don't we'll commit * the same values again and again */
drivers/net/wireless/ath/ath5k/qcu.c +3 -2
@@ -408,12 +408,13 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)break ;case AR5K_TX_QUEUE_CAB : +/* XXX: use BCN_SENT_GT, if we can figure out how */ AR5K_REG_ENABLE_BITS (ah,AR5K_QUEUE_MISC (queue), -AR5K_QCU_MISC_FRSHED_BCN_SENT_GT | +AR5K_QCU_MISC_FRSHED_DBA_GT |AR5K_QCU_MISC_CBREXP_DIS |AR5K_QCU_MISC_CBREXP_BCN_DIS ); - ath5k_hw_reg_write(ah, ((AR5K_TUNE_BEACON_INTERVAL - + ath5k_hw_reg_write(ah, ((tq->tqi_ready_time - (AR5K_TUNE_SW_BEACON_RESP - AR5K_TUNE_DMA_BEACON_RESP) - AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF) * 1024) |
drivers/net/wireless/ath/ath5k/reg.h +1 -0
@@ -2187,6 +2187,7 @@*/ #define AR5K_PHY_IQ 0x9920/* Register Address */ #define AR5K_PHY_IQ_CORR_Q_Q_COFF 0x0000001f/* Mask for q correction info */ +#define AR5K_PHY_IQ_CORR_Q_Q_COFF_S 0#define AR5K_PHY_IQ_CORR_Q_I_COFF 0x000007e0/* Mask for i correction info */ #define AR5K_PHY_IQ_CORR_Q_I_COFF_S 5#define AR5K_PHY_IQ_CORR_ENABLE 0x00000800/* Enable i/q correction */
drivers/net/wireless/ath/ath5k/reset.c +3 -2
@@ -1371,8 +1371,9 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,* Set clocks to 32KHz operation and use an * external 32KHz crystal when sleeping if one * exists */ -if (ah->ah_version ==AR5K_AR5212 ) -ath5k_hw_set_sleep_clock (ah, true); +if (ah->ah_version ==AR5K_AR5212 && + ah->ah_op_mode !=NL80211_IFTYPE_AP ) +ath5k_hw_set_sleep_clock (ah, true);/* * Disable beacons and reset the register
drivers/net/wireless/ath/ath9k/ath9k.h +1 -0
@@ -267,6 +267,7 @@ void ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid, u16 *ssn);void ath_tx_aggr_stop (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid);void ath_tx_aggr_resume (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid); +void ath9k_enable_ps (struct ath_softc *sc);/********/ /* VIFs */
drivers/net/wireless/ath/ath9k/beacon.c +7 -0
@@ -573,6 +573,13 @@ static void ath_beacon_config_sta(struct ath_softc *sc,u64 tsf;int num_beacons, offset, dtim_dec_count, cfp_dec_count; +/* No need to configure beacon if we are not associated */ +if (!common->curaid) { +ath_print (common,ATH_DBG_BEACON , +"STA is not yet associated..skipping beacon config\n" ); +return ; + } +memset (&bs,0 ,sizeof (bs)); intval = conf->beacon_interval &ATH9K_BEACON_PERIOD ;
drivers/net/wireless/ath/ath9k/hw.c +6 -1
@@ -380,7 +380,6 @@ static void ath9k_hw_init_config(struct ath_hw *ah) ah->config.pcie_clock_req =0 ; ah->config.pcie_waen =0 ; ah->config.analog_shiftreg =1 ; - ah->config.ht_enable =1 ; ah->config.ofdm_trig_low =200 ; ah->config.ofdm_trig_high =500 ; ah->config.cck_trig_high =200 ;
@@ -392,6 +391,11 @@ static void ath9k_hw_init_config(struct ath_hw *ah) ah->config.spurchans[i][1 ] =AR_NO_SPUR ; } +if (ah->hw_version.devid !=AR2427_DEVID_PCIE ) + ah->config.ht_enable =1 ; +else + ah->config.ht_enable =0 ; + ah->config.intr_mitigation = true;/*
@@ -590,6 +594,7 @@ static bool ath9k_hw_devid_supported(u16 devid)case AR5416_DEVID_AR9287_PCI :case AR5416_DEVID_AR9287_PCIE :case AR9271_USB : +case AR2427_DEVID_PCIE :return true;default :break ;
drivers/net/wireless/ath/ath9k/hw.h +1 -0
@@ -40,6 +40,7 @@#define AR9280_DEVID_PCI 0x0029#define AR9280_DEVID_PCIE 0x002a#define AR9285_DEVID_PCIE 0x002b +#define AR2427_DEVID_PCIE 0x002c#define AR5416_AR9100_DEVID 0x000b
drivers/net/wireless/ath/ath9k/main.c +18 -11
@@ -1854,11 +1854,14 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) hw->flags =IEEE80211_HW_RX_INCLUDES_FCS |IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |IEEE80211_HW_SIGNAL_DBM | -IEEE80211_HW_AMPDU_AGGREGATION |IEEE80211_HW_SUPPORTS_PS |IEEE80211_HW_PS_NULLFUNC_STACK | +IEEE80211_HW_REPORTS_TX_ACK_STATUS |IEEE80211_HW_SPECTRUM_MGMT ; +if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_HT ) + hw->flags |=IEEE80211_HW_AMPDU_AGGREGATION ; +if (AR_SREV_9160_10_OR_LATER (sc->sc_ah) || modparam_nohwcrypt) hw->flags |=IEEE80211_HW_MFP_CAPABLE ;
@@ -2679,6 +2682,19 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,mutex_unlock (&sc->mutex); } +void ath9k_enable_ps (struct ath_softc *sc) +{ + sc->ps_enabled = true; +if (!(sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_AUTOSLEEP )) { +if ((sc->imask &ATH9K_INT_TIM_TIMER ) ==0 ) { + sc->imask |=ATH9K_INT_TIM_TIMER ; +ath9k_hw_set_interrupts (sc->sc_ah, + sc->imask); + } + } +ath9k_hw_setrxabort (sc->sc_ah,1 ); +} +static int ath9k_config (struct ieee80211_hw *hw,u32 changed) {struct ath_wiphy *aphy = hw->priv;
@@ -2732,22 +2748,13 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)if (changed &IEEE80211_CONF_CHANGE_PS ) {if (conf->flags &IEEE80211_CONF_PS ) { sc->sc_flags |=SC_OP_PS_ENABLED ; -if (!(ah->caps.hw_caps & -ATH9K_HW_CAP_AUTOSLEEP )) { -if ((sc->imask &ATH9K_INT_TIM_TIMER ) ==0 ) { - sc->imask |=ATH9K_INT_TIM_TIMER ; -ath9k_hw_set_interrupts (sc->sc_ah, - sc->imask); - } - }/* * At this point we know hardware has received an ACK * of a previously sent null data frame. */ if ((sc->sc_flags &SC_OP_NULLFUNC_COMPLETED )) { sc->sc_flags &= ~SC_OP_NULLFUNC_COMPLETED ; - sc->ps_enabled = true; -ath9k_hw_setrxabort (sc->sc_ah,1 ); +ath9k_enable_ps (sc); } }else { sc->ps_enabled = false;
drivers/net/wireless/ath/ath9k/pci.c +1 -0
@@ -25,6 +25,7 @@ static struct pci_device_id ath_pci_id_table[] __devinitdata = { { PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI */ { PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */ { PCI_VDEVICE(ATHEROS, 0x002B) }, /* PCI-E */ + { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */ { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI */ { PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */ { 0 }
drivers/net/wireless/ath/ath9k/rc.c +3 -3
@@ -1323,7 +1323,7 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,static void ath_rate_update (void *priv,struct ieee80211_supported_band *sband,struct ieee80211_sta *sta,void *priv_sta, -u32 changed) +u32 changed,enum nl80211_channel_type oper_chan_type) {struct ath_softc *sc = priv;struct ath_rate_priv *ath_rc_priv = priv_sta;
@@ -1340,8 +1340,8 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,if (sc->sc_ah->opmode !=NL80211_IFTYPE_STATION )return ; -if (sc->hw->conf.channel_type ==NL80211_CHAN_HT40MINUS || - sc->hw->conf.channel_type ==NL80211_CHAN_HT40PLUS ) +if (oper_chan_type ==NL80211_CHAN_HT40MINUS || + oper_chan_type ==NL80211_CHAN_HT40PLUS ) oper_cw40 = true; oper_sgi40 = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
drivers/net/wireless/ath/ath9k/xmit.c +6 -26
@@ -1353,25 +1353,6 @@ static enum ath9k_pkt_type get_hw_packet_type(struct sk_buff *skb)return htype; } -static bool is_pae (struct sk_buff *skb) -{ -struct ieee80211_hdr *hdr; -__le16 fc; - - hdr = (struct ieee80211_hdr *)skb->data; - fc = hdr->frame_control; - -if (ieee80211_is_data (fc)) { -if (ieee80211_is_nullfunc (fc) || -/* Port Access Entity (IEEE 802.1X) */ - (skb->protocol ==cpu_to_be16 (ETH_P_PAE ))) { -return true; - } - } - -return false; -} -static int get_hw_crypto_keytype (struct sk_buff *skb) {struct ieee80211_tx_info *tx_info =IEEE80211_SKB_CB (skb);
@@ -1701,7 +1682,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, goto tx_done; } -if ((tx_info->flags &IEEE80211_TX_CTL_AMPDU ) && !is_pae (skb)) { +if (tx_info->flags &IEEE80211_TX_CTL_AMPDU ) {/* * Try aggregation if it's a unicast data frame * and the destination is HT capable.
@@ -2053,10 +2034,9 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)*/ if (bf->bf_isnullfunc && (ds->ds_txstat.ts_status &ATH9K_TX_ACKED )) { -if ((sc->sc_flags &SC_OP_PS_ENABLED )) { - sc->ps_enabled = true; -ath9k_hw_setrxabort (sc->sc_ah,1 ); - }else +if ((sc->sc_flags &SC_OP_PS_ENABLED )) +ath9k_enable_ps (sc); +else sc->sc_flags |=SC_OP_NULLFUNC_COMPLETED ; }
@@ -2264,7 +2244,7 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)if (ATH_TXQ_SETUP (sc, i)) { txq = &sc->tx.txq[i]; -spin_lock (&txq->axq_lock); +spin_lock_bh (&txq->axq_lock);list_for_each_entry_safe (ac, ac_tmp, &txq->axq_acq, list) {
@@ -2285,7 +2265,7 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an) } } -spin_unlock (&txq->axq_lock); +spin_unlock_bh (&txq->axq_lock); } } }
drivers/net/wireless/b43/main.c +4 -7
@@ -852,19 +852,16 @@ static void b43_op_update_tkip_key(struct ieee80211_hw *hw,if (B43_WARN_ON (!modparam_hwtkip))return ; -mutex_lock (&wl->mutex); - +/* This is only called from the RX path through mac80211, where +* our mutex is already locked. */ +B43_WARN_ON (!mutex_is_locked (&wl->mutex)); dev = wl->current_dev; -if (!dev ||b43_status (dev) <B43_STAT_INITIALIZED ) - goto out_unlock; +B43_WARN_ON (!dev ||b43_status (dev) <B43_STAT_INITIALIZED );keymac_write (dev, index,NULL );/* First zero out mac to avoid race */ rx_tkip_phase1_write (dev, index, iv32, phase1key);keymac_write (dev, index, addr); - -out_unlock: -mutex_unlock (&wl->mutex); } static void do_key_write(struct b43_wldev *dev,
drivers/net/wireless/iwlwifi/iwl-3945.c +3 -5
@@ -2474,11 +2474,9 @@ int iwl3945_hw_set_hw_params(struct iwl_priv *priv)memset ((void *)&priv->hw_params,0 ,sizeof (struct iwl_hw_params )); - priv->shared_virt = -pci_alloc_consistent (priv->pci_dev, -sizeof (struct iwl3945_shared ), - &priv->shared_phys); - + priv->shared_virt =dma_alloc_coherent (&priv->pci_dev->dev, +sizeof (struct iwl3945_shared ), + &priv->shared_phys,GFP_KERNEL );if (!priv->shared_virt) {IWL_ERR (priv,"failed to allocate pci memory\n" );mutex_unlock (&priv->mutex);
drivers/net/wireless/iwlwifi/iwl-core.c +6 -6
@@ -1658,9 +1658,9 @@ EXPORT_SYMBOL(iwl_set_tx_power);void iwl_free_isr_ict (struct iwl_priv *priv) {if (priv->ict_tbl_vir) { -pci_free_consistent (priv->pci_dev, (sizeof (u32) *ICT_COUNT ) + -PAGE_SIZE , priv->ict_tbl_vir, - priv->ict_tbl_dma); +dma_free_coherent (&priv->pci_dev->dev, + (sizeof (u32) *ICT_COUNT ) +PAGE_SIZE , + priv->ict_tbl_vir, priv->ict_tbl_dma); priv->ict_tbl_vir =NULL ; } }
@@ -1676,9 +1676,9 @@ int iwl_alloc_isr_ict(struct iwl_priv *priv)if (priv->cfg->use_isr_legacy)return 0 ;/* allocate shrared data table */ - priv->ict_tbl_vir =pci_alloc_consistent (priv->pci_dev, (sizeof (u32) * -ICT_COUNT ) +PAGE_SIZE , - &priv->ict_tbl_dma); + priv->ict_tbl_vir =dma_alloc_coherent (&priv->pci_dev->dev, + (sizeof (u32) *ICT_COUNT ) +PAGE_SIZE , + &priv->ict_tbl_dma,GFP_KERNEL );if (!priv->ict_tbl_vir)return -ENOMEM ;
drivers/net/wireless/iwlwifi/iwl-helpers.h +4 -3
@@ -80,8 +80,8 @@ static inline void iwl_free_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc) {if (desc->v_addr) -pci_free_consistent (pci_dev, desc->len, - desc->v_addr, desc->p_addr); +dma_free_coherent (&pci_dev->dev, desc->len, + desc->v_addr, desc->p_addr); desc->v_addr =NULL ; desc->len =0 ; }
@@ -89,7 +89,8 @@ static inline void iwl_free_fw_desc(struct pci_dev *pci_dev,static inline int iwl_alloc_fw_desc (struct pci_dev *pci_dev,struct fw_desc *desc) { - desc->v_addr =pci_alloc_consistent (pci_dev, desc->len, &desc->p_addr); + desc->v_addr =dma_alloc_coherent (&pci_dev->dev, desc->len, + &desc->p_addr,GFP_KERNEL );return (desc->v_addr !=NULL ) ?0 : -ENOMEM ; }
drivers/net/wireless/iwlwifi/iwl-rx.c +11 -10
@@ -350,10 +350,10 @@ void iwl_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq) } } -pci_free_consistent (priv->pci_dev,4 *RX_QUEUE_SIZE , rxq->bd, - rxq->dma_addr); -pci_free_consistent (priv->pci_dev,sizeof (struct iwl_rb_status ), - rxq->rb_stts, rxq->rb_stts_dma); +dma_free_coherent (&priv->pci_dev->dev,4 *RX_QUEUE_SIZE , rxq->bd, + rxq->dma_addr); +dma_free_coherent (&priv->pci_dev->dev,sizeof (struct iwl_rb_status ), + rxq->rb_stts, rxq->rb_stts_dma); rxq->bd =NULL ; rxq->rb_stts =NULL ; }
@@ -362,7 +362,7 @@ EXPORT_SYMBOL(iwl_rx_queue_free);int iwl_rx_queue_alloc (struct iwl_priv *priv) {struct iwl_rx_queue *rxq = &priv->rxq; -struct pci_dev *dev = priv->pci_dev; +struct device *dev = &priv->pci_dev->dev;int i;spin_lock_init (&rxq->lock);
@@ -370,12 +370,13 @@ int iwl_rx_queue_alloc(struct iwl_priv *priv)INIT_LIST_HEAD (&rxq->rx_used);/* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */ - rxq->bd =pci_alloc_consistent (dev,4 *RX_QUEUE_SIZE , &rxq->dma_addr); + rxq->bd =dma_alloc_coherent (dev,4 *RX_QUEUE_SIZE , &rxq->dma_addr, +GFP_KERNEL );if (!rxq->bd) goto err_bd; - rxq->rb_stts =pci_alloc_consistent (dev,sizeof (struct iwl_rb_status ), - &rxq->rb_stts_dma); + rxq->rb_stts =dma_alloc_coherent (dev,sizeof (struct iwl_rb_status ), + &rxq->rb_stts_dma,GFP_KERNEL );if (!rxq->rb_stts) goto err_rb;
@@ -392,8 +393,8 @@ int iwl_rx_queue_alloc(struct iwl_priv *priv)return 0 ; err_rb: -pci_free_consistent (priv->pci_dev,4 *RX_QUEUE_SIZE , rxq->bd, - rxq->dma_addr); +dma_free_coherent (&priv->pci_dev->dev,4 *RX_QUEUE_SIZE , rxq->bd, + rxq->dma_addr); err_bd:return -ENOMEM ; }
drivers/net/wireless/iwlwifi/iwl-tx.c +13 -12
@@ -60,7 +60,8 @@ static const u16 default_tid_to_tx_fifo[] = {static inline int iwl_alloc_dma_ptr (struct iwl_priv *priv,struct iwl_dma_ptr *ptr,size_t size) { - ptr->addr =pci_alloc_consistent (priv->pci_dev, size, &ptr->dma); + ptr->addr =dma_alloc_coherent (&priv->pci_dev->dev, size, &ptr->dma, +GFP_KERNEL );if (!ptr->addr)return -ENOMEM ; ptr->size = size;
@@ -73,7 +74,7 @@ static inline void iwl_free_dma_ptr(struct iwl_priv *priv,if (unlikely (!ptr->addr))return ; -pci_free_consistent (priv->pci_dev, ptr->size, ptr->addr, ptr->dma); +dma_free_coherent (&priv->pci_dev->dev, ptr->size, ptr->addr, ptr->dma);memset (ptr,0 ,sizeof (*ptr)); }
@@ -126,7 +127,7 @@ void iwl_free_tfds_in_queue(struct iwl_priv *priv,if (priv->stations[sta_id].tid[tid].tfds_in_queue >= freed) priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;else { -IWL_ERR (priv,"free more than tfds_in_queue (%u:%d)\n" , +IWL_DEBUG_TX (priv,"free more than tfds_in_queue (%u:%d)\n" , priv->stations[sta_id].tid[tid].tfds_in_queue, freed); priv->stations[sta_id].tid[tid].tfds_in_queue =0 ;
@@ -146,7 +147,7 @@ void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id) {struct iwl_tx_queue *txq = &priv->txq[txq_id];struct iwl_queue *q = &txq->q; -struct pci_dev *dev = priv->pci_dev; +struct device *dev = &priv->pci_dev->dev;int i;if (q->n_bd ==0 )
@@ -163,8 +164,8 @@ void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id)/* De-alloc circular buffer of TFDs */ if (txq->q.n_bd) -pci_free_consistent (dev, priv->hw_params.tfd_size * - txq->q.n_bd, txq->tfds, txq->q.dma_addr); +dma_free_coherent (dev, priv->hw_params.tfd_size * + txq->q.n_bd, txq->tfds, txq->q.dma_addr);/* De-alloc array of per-TFD driver data */ kfree (txq->txb);
@@ -193,7 +194,7 @@ void iwl_cmd_queue_free(struct iwl_priv *priv) {struct iwl_tx_queue *txq = &priv->txq[IWL_CMD_QUEUE_NUM ];struct iwl_queue *q = &txq->q; -struct pci_dev *dev = priv->pci_dev; +struct device *dev = &priv->pci_dev->dev;int i;if (q->n_bd ==0 )
@@ -205,8 +206,8 @@ void iwl_cmd_queue_free(struct iwl_priv *priv)/* De-alloc circular buffer of TFDs */ if (txq->q.n_bd) -pci_free_consistent (dev, priv->hw_params.tfd_size * - txq->q.n_bd, txq->tfds, txq->q.dma_addr); +dma_free_coherent (dev, priv->hw_params.tfd_size * txq->q.n_bd, + txq->tfds, txq->q.dma_addr);/* deallocate arrays */ kfree (txq->cmd);
@@ -297,7 +298,7 @@ static int iwl_queue_init(struct iwl_priv *priv, struct iwl_queue *q,static int iwl_tx_queue_alloc (struct iwl_priv *priv,struct iwl_tx_queue *txq,u32 id) { -struct pci_dev *dev = priv->pci_dev; +struct device *dev = &priv->pci_dev->dev;size_t tfd_sz = priv->hw_params.tfd_size *TFD_QUEUE_SIZE_MAX ;/* Driver private data, only for Tx (not command) queues,
@@ -316,8 +317,8 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv,/* Circular buffer of transmit frame descriptors (TFDs), * shared with device */ - txq->tfds =pci_alloc_consistent (dev, tfd_sz, &txq->q.dma_addr); - + txq->tfds =dma_alloc_coherent (dev, tfd_sz, &txq->q.dma_addr, +GFP_KERNEL );if (!txq->tfds) {IWL_ERR (priv,"pci_alloc_consistent(%zd) failed\n" , tfd_sz); goto error;
drivers/net/wireless/iwlwifi/iwl3945-base.c +8 -8
@@ -352,10 +352,10 @@ static int iwl3945_send_beacon_cmd(struct iwl_priv *priv)static void iwl3945_unset_hw_params (struct iwl_priv *priv) {if (priv->shared_virt) -pci_free_consistent (priv->pci_dev, -sizeof (struct iwl3945_shared ), - priv->shared_virt, - priv->shared_phys); +dma_free_coherent (&priv->pci_dev->dev, +sizeof (struct iwl3945_shared ), + priv->shared_virt, + priv->shared_phys); } static void iwl3945_build_tx_cmd_hwcrypto(struct iwl_priv *priv,
@@ -1253,10 +1253,10 @@ static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rx } } -pci_free_consistent (priv->pci_dev,4 *RX_QUEUE_SIZE , rxq->bd, - rxq->dma_addr); -pci_free_consistent (priv->pci_dev,sizeof (struct iwl_rb_status ), - rxq->rb_stts, rxq->rb_stts_dma); +dma_free_coherent (&priv->pci_dev->dev,4 *RX_QUEUE_SIZE , rxq->bd, + rxq->dma_addr); +dma_free_coherent (&priv->pci_dev->dev,sizeof (struct iwl_rb_status ), + rxq->rb_stts, rxq->rb_stts_dma); rxq->bd =NULL ; rxq->rb_stts =NULL ; }
drivers/net/wireless/wl12xx/wl1251_debugfs.c +2 -1
@@ -443,7 +443,8 @@ out:void wl1251_debugfs_reset (struct wl1251 *wl) { -memset (wl->stats.fw_stats,0 ,sizeof (*wl->stats.fw_stats)); +if (wl->stats.fw_stats !=NULL ) +memset (wl->stats.fw_stats,0 ,sizeof (*wl->stats.fw_stats)); wl->stats.retry_count =0 ; wl->stats.excessive_retries =0 ; }
drivers/pci/pci.c +20 -23
94 lines not on this page · raw message
drivers/pci/quirks.c +1 -0
@@ -2534,6 +2534,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e7, quirk_i82576_sriov);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x10e8 , quirk_i82576_sriov);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x150a , quirk_i82576_sriov);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x150d , quirk_i82576_sriov); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x1518 , quirk_i82576_sriov);#endif /* CONFIG_PCI_IOV */
drivers/platform/x86/classmate-laptop.c +21 -10
@@ -34,6 +34,11 @@ struct cmpc_accel {#define CMPC_ACCEL_SENSITIVITY_DEFAULT 5 +#define CMPC_ACCEL_HID "ACCE0000" +#define CMPC_TABLET_HID "TBLT0000" +#define CMPC_BL_HID "IPML200" +#define CMPC_KEYS_HID "FnBT0000" +/* * Generic input device code. */
@@ -282,10 +287,9 @@ static int cmpc_accel_remove(struct acpi_device *acpi, int type) }static const struct acpi_device_id cmpc_accel_device_ids[] = { - {"ACCE0000" ,0 }, + {CMPC_ACCEL_HID ,0 }, {"" ,0 } }; -MODULE_DEVICE_TABLE (acpi, cmpc_accel_device_ids);static struct acpi_driver cmpc_accel_acpi_driver = { .owner =THIS_MODULE ,
@@ -366,10 +370,9 @@ static int cmpc_tablet_resume(struct acpi_device *acpi) }static const struct acpi_device_id cmpc_tablet_device_ids[] = { - {"TBLT0000" ,0 }, + {CMPC_TABLET_HID ,0 }, {"" ,0 } }; -MODULE_DEVICE_TABLE (acpi, cmpc_tablet_device_ids);static struct acpi_driver cmpc_tablet_acpi_driver = { .owner =THIS_MODULE ,
@@ -477,17 +480,16 @@ static int cmpc_bl_remove(struct acpi_device *acpi, int type)return 0 ; } -static const struct acpi_device_id cmpc_device_ids[] = { - {"IPML200" ,0 }, +static const struct acpi_device_id cmpc_bl_device_ids[] = { + {CMPC_BL_HID ,0 }, {"" ,0 } }; -MODULE_DEVICE_TABLE (acpi, cmpc_device_ids);static struct acpi_driver cmpc_bl_acpi_driver = { .owner =THIS_MODULE , .name ="cmpc" , .class ="cmpc" , - .ids = cmpc_device_ids, + .ids = cmpc_bl_device_ids, .ops = { .add = cmpc_bl_add, .remove = cmpc_bl_remove
@@ -540,10 +542,9 @@ static int cmpc_keys_remove(struct acpi_device *acpi, int type) }static const struct acpi_device_id cmpc_keys_device_ids[] = { - {"FnBT0000" ,0 }, + {CMPC_KEYS_HID ,0 }, {"" ,0 } }; -MODULE_DEVICE_TABLE (acpi, cmpc_keys_device_ids);static struct acpi_driver cmpc_keys_acpi_driver = { .owner =THIS_MODULE ,
@@ -607,3 +608,13 @@ static void cmpc_exit(void)module_init (cmpc_init);module_exit (cmpc_exit); + +static const struct acpi_device_id cmpc_device_ids[] = { + {CMPC_ACCEL_HID ,0 }, + {CMPC_TABLET_HID ,0 }, + {CMPC_BL_HID ,0 }, + {CMPC_KEYS_HID ,0 }, + {"" ,0 } +}; + +MODULE_DEVICE_TABLE (acpi, cmpc_device_ids);
drivers/scsi/qlogicpti.c +1 -1
@@ -738,7 +738,7 @@ static int __devinit qpti_register_irq(struct qlogicpti *qpti)* sanely maintain. */ if (request_irq (qpti->irq, qpti_intr, -IRQF_SHARED ,"Qlogic/PTI" , qpti)) +IRQF_SHARED ,"QlogicPTI" , qpti)) goto fail;printk ("qlogicpti%d: IRQ %d " , qpti->qpti_id, qpti->irq);
drivers/scsi/scsi_transport_fc.c +12 -12
@@ -1216,6 +1216,15 @@ store_fc_vport_delete(struct device *dev, struct device_attribute *attr, {struct fc_vport *vport =transport_class_to_vport (dev);struct Scsi_Host *shost =vport_to_shost (vport); +unsigned long flags; + +spin_lock_irqsave (shost->host_lock, flags); +if (vport->flags & (FC_VPORT_DEL |FC_VPORT_CREATING )) { +spin_unlock_irqrestore (shost->host_lock, flags); +return -EBUSY ; + } + vport->flags |=FC_VPORT_DELETING ; +spin_unlock_irqrestore (shost->host_lock, flags);fc_queue_work (shost, &vport->vport_delete_work);return count;
@@ -1805,6 +1814,9 @@ store_fc_host_vport_delete(struct device *dev, struct device_attribute *attr,list_for_each_entry (vport, &fc_host->vports, peers) {if ((vport->channel ==0 ) && (vport->port_name == wwpn) && (vport->node_name == wwnn)) { +if (vport->flags & (FC_VPORT_DEL |FC_VPORT_CREATING )) +break ; + vport->flags |=FC_VPORT_DELETING ; match =1 ;break ; }
@@ -3354,18 +3366,6 @@ fc_vport_terminate(struct fc_vport *vport)unsigned long flags;int stat; -spin_lock_irqsave (shost->host_lock, flags); -if (vport->flags &FC_VPORT_CREATING ) { -spin_unlock_irqrestore (shost->host_lock, flags); -return -EBUSY ; - } -if (vport->flags & (FC_VPORT_DEL )) { -spin_unlock_irqrestore (shost->host_lock, flags); -return -EALREADY ; - } - vport->flags |=FC_VPORT_DELETING ; -spin_unlock_irqrestore (shost->host_lock, flags); -if (i->f->vport_delete) stat = i->f->vport_delete (vport);else
drivers/scsi/ses.c +2 -2
@@ -591,8 +591,6 @@ static int ses_intf_add(struct device *cdev, ses_dev->page10_len = len; buf =NULL ; } -kfree (hdr_buf); - scomp =kzalloc (sizeof (struct ses_component ) * components,GFP_KERNEL );if (!scomp) goto err_free;
@@ -604,6 +602,8 @@ static int ses_intf_add(struct device *cdev, goto err_free; } +kfree (hdr_buf); + edev->scratch = ses_dev;for (i =0 ; i < components; i++) edev->component[i].scratch = scomp + i;
drivers/usb/core/devio.c +14 -3
@@ -1176,6 +1176,13 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,free_async (as);return -ENOMEM ; } +/* Isochronous input data may end up being discontiguous +* if some of the packets are short. Clear the buffer so +* that the gaps don't leak kernel data to userspace. +*/ +if (is_in && uurb->type ==USBDEVFS_URB_TYPE_ISO ) +memset (as->urb->transfer_buffer,0 , + uurb->buffer_length); } as->urb->dev = ps->dev; as->urb->pipe = (uurb->type << 30) |
@@ -1312,10 +1319,14 @@ static int processcompl(struct async *as, void __user * __user *arg)void __user *addr = as->userurb;unsigned int i; -if (as->userbuffer && urb->actual_length) -if (copy_to_user (as->userbuffer, urb->transfer_buffer, - urb->actual_length)) +if (as->userbuffer && urb->actual_length) { +if (urb->number_of_packets >0 )/* Isochronous */ + i = urb->transfer_buffer_length; +else /* Non-Isoc */ + i = urb->actual_length; +if (copy_to_user (as->userbuffer, urb->transfer_buffer, i)) goto err_out; + }if (put_user (as->status, &userurb->status)) goto err_out;if (put_user (urb->actual_length, &userurb->actual_length))
drivers/usb/host/ehci-hcd.c +1 -1
@@ -995,7 +995,7 @@ rescan:/* endpoints can be iso streams. for now, we don't * accelerate iso completions ... so spin a while. */ -if (qh->hw->hw_info1 ==0 ) { +if (qh->hw ==NULL ) {ehci_vdbg (ehci,"iso delay\n" ); goto idle_timeout; }
drivers/usb/host/ehci-sched.c +21 -7
@@ -1121,8 +1121,8 @@ iso_stream_find (struct ehci_hcd *ehci, struct urb *urb) urb->interval); } -/* if dev->ep [epnum] is a QH, info1.maxpacket is nonzero */ - }else if (unlikely (stream->hw_info1 !=0 )) { +/* if dev->ep [epnum] is a QH, hw is set */ + }else if (unlikely (stream->hw !=NULL )) {ehci_dbg (ehci,"dev %s ep%d%s, not iso??\n" , urb->dev->devpath, epnum,usb_pipein (urb->pipe) ?"in" :"out" );
@@ -1563,13 +1563,27 @@ itd_patch(static inline void itd_link (struct ehci_hcd *ehci,unsigned frame,struct ehci_itd *itd) { -/* always prepend ITD/SITD ... only QH tree is order-sensitive */ - itd->itd_next = ehci->pshadow [frame]; - itd->hw_next = ehci->periodic [frame]; - ehci->pshadow [frame].itd = itd; +union ehci_shadow *prev = &ehci->pshadow[frame]; +__hc32 *hw_p = &ehci->periodic[frame]; +union ehci_shadow here = *prev; +__hc32 type =0 ; + +/* skip any iso nodes which might belong to previous microframes */ +while (here.ptr) { + type =Q_NEXT_TYPE (ehci, *hw_p); +if (type ==cpu_to_hc32 (ehci,Q_TYPE_QH )) +break ; + prev =periodic_next_shadow (ehci, prev, type); + hw_p =shadow_next_periodic (ehci, &here, type); + here = *prev; + } + + itd->itd_next = here; + itd->hw_next = *hw_p; + prev->itd = itd; itd->frame = frame;wmb (); - ehci->periodic[frame] =cpu_to_hc32 (ehci, itd->itd_dma |Q_TYPE_ITD ); + *hw_p =cpu_to_hc32 (ehci, itd->itd_dma |Q_TYPE_ITD ); }/* fit urb's itds into the selected schedule slot; activate as needed */
drivers/usb/host/ehci.h +2 -3
@@ -394,9 +394,8 @@ struct ehci_iso_sched {* acts like a qh would, if EHCI had them for ISO. */ struct ehci_iso_stream { -/* first two fields match QH, but info1 == 0 */ -__hc32 hw_next; -__hc32 hw_info1; +/* first field matches ehci_hq, but is NULL */ +struct ehci_qh_hw *hw;u32 refcount;u8 bEndpointAddress;
drivers/usb/host/r8a66597-hcd.c +11 -5
@@ -418,7 +418,7 @@ static u8 alloc_usb_address(struct r8a66597 *r8a66597, struct urb *urb)/* this function must be called with interrupt disabled */ static void free_usb_address (struct r8a66597 *r8a66597, -struct r8a66597_device *dev) +struct r8a66597_device *dev,int reset) {int port;
@@ -430,7 +430,13 @@ static void free_usb_address(struct r8a66597 *r8a66597, dev->state =USB_STATE_DEFAULT ; r8a66597->address_map &= ~(1 << dev->address); dev->address =0 ; -dev_set_drvdata (&dev->udev->dev,NULL ); +/* +* Only when resetting USB, it is necessary to erase drvdata. When +* a usb device with usb hub is disconnect, "dev->udev" is already +* freed on usb_desconnect(). So we cannot access the data. +*/ +if (reset) +dev_set_drvdata (&dev->udev->dev,NULL );list_del (&dev->device_list);kfree (dev);
@@ -1069,7 +1075,7 @@ static void r8a66597_usb_disconnect(struct r8a66597 *r8a66597, int port)struct r8a66597_device *dev = r8a66597->root_hub[port].dev;disable_r8a66597_pipe_all (r8a66597, dev); -free_usb_address (r8a66597, dev); +free_usb_address (r8a66597, dev,0 );start_root_hub_sampling (r8a66597, port,0 ); }
@@ -2085,7 +2091,7 @@ static void update_usb_address_map(struct r8a66597 *r8a66597,spin_lock_irqsave (&r8a66597->lock, flags); dev =get_r8a66597_device (r8a66597, addr);disable_r8a66597_pipe_all (r8a66597, dev); -free_usb_address (r8a66597, dev); +free_usb_address (r8a66597, dev,0 );put_child_connect_map (r8a66597, addr);spin_unlock_irqrestore (&r8a66597->lock, flags); }
@@ -2228,7 +2234,7 @@ static int r8a66597_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, rh->port |= (1 <<USB_PORT_FEAT_RESET );disable_r8a66597_pipe_all (r8a66597, dev); -free_usb_address (r8a66597, dev); +free_usb_address (r8a66597, dev,1 );r8a66597_mdfy (r8a66597,USBRST ,USBRST |UACT ,get_dvstctr_reg (port));
drivers/usb/host/xhci-hcd.c +1 -0
@@ -1173,6 +1173,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci, cmd_completion = &virt_dev->cmd_completion; cmd_status = &virt_dev->cmd_status; } +init_completion (cmd_completion);if (!ctx_change) ret = xhci_queue_configure_endpoint(xhci, in_ctx->dma,
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -658,6 +658,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, { USB_DEVICE(EVOLUTION_VID, EVO_HYBRID_PID) }, { USB_DEVICE(EVOLUTION_VID, EVO_RCM4_PID) }, + { USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },
drivers/usb/serial/ftdi_sio_ids.h +7 -0
@@ -501,6 +501,13 @@#define CONTEC_COM1USBH_PID 0x8311/* COM-1(USB)H */ /* +* Contec products (http://www.contec.com) +* Submitted by Daniel Sangorrin +*/ +#define CONTEC_VID 0x06CE/* Vendor ID */ +#define CONTEC_COM1USBH_PID 0x8311/* COM-1(USB)H */ + +/* * Definitions for B&B Electronics products. */ #define BANDB_VID 0x0856/* B&B Electronics Vendor ID */
drivers/usb/serial/option.c +5 -2
@@ -288,7 +288,9 @@ static int option_resume(struct usb_serial *serial);#define QUALCOMM_VENDOR_ID 0x05C6 -#define MAXON_VENDOR_ID 0x16d8 +#define CMOTECH_VENDOR_ID 0x16d8 +#define CMOTECH_PRODUCT_6008 0x6008 +#define CMOTECH_PRODUCT_6280 0x6280#define TELIT_VENDOR_ID 0x1bc7#define TELIT_PRODUCT_UC864E 0x1003
@@ -520,7 +522,8 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ - { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ + { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6280) }, /* BP3-USB & BP3-EXT HSDPA */ + { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6008) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
drivers/usb/serial/qcserial.c +29 -0
@@ -47,6 +47,35 @@ static struct usb_device_id id_table[] = { {USB_DEVICE(0x05c6, 0x9221)}, /* Generic Gobi QDL device */ {USB_DEVICE(0x05c6, 0x9231)}, /* Generic Gobi QDL device */ {USB_DEVICE(0x1f45, 0x0001)}, /* Unknown Gobi QDL device */ + {USB_DEVICE(0x413c, 0x8185)}, /* Dell Gobi 2000 QDL device (N0218, VU936) */ + {USB_DEVICE(0x413c, 0x8186)}, /* Dell Gobi 2000 Modem device (N0218, VU936) */ + {USB_DEVICE(0x05c6, 0x9224)}, /* Sony Gobi 2000 QDL device (N0279, VU730) */ + {USB_DEVICE(0x05c6, 0x9225)}, /* Sony Gobi 2000 Modem device (N0279, VU730) */ + {USB_DEVICE(0x05c6, 0x9244)}, /* Samsung Gobi 2000 QDL device (VL176) */ + {USB_DEVICE(0x05c6, 0x9245)}, /* Samsung Gobi 2000 Modem device (VL176) */ + {USB_DEVICE(0x03f0, 0x241d)}, /* HP Gobi 2000 QDL device (VP412) */ + {USB_DEVICE(0x03f0, 0x251d)}, /* HP Gobi 2000 Modem device (VP412) */ + {USB_DEVICE(0x05c6, 0x9214)}, /* Acer Gobi 2000 QDL device (VP413) */ + {USB_DEVICE(0x05c6, 0x9215)}, /* Acer Gobi 2000 Modem device (VP413) */ + {USB_DEVICE(0x05c6, 0x9264)}, /* Asus Gobi 2000 QDL device (VR305) */ + {USB_DEVICE(0x05c6, 0x9265)}, /* Asus Gobi 2000 Modem device (VR305) */ + {USB_DEVICE(0x05c6, 0x9234)}, /* Top Global Gobi 2000 QDL device (VR306) */ + {USB_DEVICE(0x05c6, 0x9235)}, /* Top Global Gobi 2000 Modem device (VR306) */ + {USB_DEVICE(0x05c6, 0x9274)}, /* iRex Technologies Gobi 2000 QDL device (VR307) */ + {USB_DEVICE(0x05c6, 0x9275)}, /* iRex Technologies Gobi 2000 Modem device (VR307) */ + {USB_DEVICE(0x1199, 0x9000)}, /* Sierra Wireless Gobi 2000 QDL device (VT773) */ + {USB_DEVICE(0x1199, 0x9001)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9002)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9003)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9004)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9005)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9006)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9007)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9008)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9009)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x900a)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x16d8, 0x8001)}, /* CMDTech Gobi 2000 QDL device (VU922) */ + {USB_DEVICE(0x16d8, 0x8002)}, /* CMDTech Gobi 2000 Modem device (VU922) */ { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, id_table);
drivers/video/Kconfig +12 -0
@@ -909,6 +909,18 @@ config FB_XVR2500 mostly initialized the card already. It is treated as a completely dumb framebuffer device. +config FB_XVR1000 + bool "Sun XVR-1000 support" + depends on (FB = y) && SPARC64 + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the framebuffer device for the Sun XVR-1000 and similar + graphics cards. The driver only works on sparc64 systems where + the system firmware has mostly initialized the card already. It + is treated as a completely dumb framebuffer device. + config FB_PVR2 tristate "NEC PowerVR 2 display support" depends on FB && SH_DREAMCAST
drivers/video/Makefile +1 -0
@@ -79,6 +79,7 @@ obj-$(CONFIG_FB_N411) += n411.o obj-$(CONFIG_FB_HGA) += hgafb.o obj-$(CONFIG_FB_XVR500) += sunxvr500.o obj-$(CONFIG_FB_XVR2500) += sunxvr2500.o +obj-$(CONFIG_FB_XVR1000) += sunxvr1000.o obj-$(CONFIG_FB_IGA) += igafb.o obj-$(CONFIG_FB_APOLLO) += dnfb.o obj-$(CONFIG_FB_Q40) += q40fb.o
drivers/video/sunxvr1000.c new file +228 -0
228 lines not on this page · raw message
drivers/virtio/virtio_pci.c +2 -1
@@ -473,7 +473,8 @@ static void vp_del_vqs(struct virtio_device *vdev)list_for_each_entry_safe (vq, n, &vdev->vqs, list) { info = vq->priv; -if (vp_dev->per_vq_vectors) +if (vp_dev->per_vq_vectors && + info->msix_vector !=VIRTIO_MSI_NO_VECTOR )free_irq (vp_dev->msix_entries[info->msix_vector].vector, vq);vp_del_vq (vq);
fs/exec.c +2 -1
@@ -1923,8 +1923,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)/* * Dont allow local users get cute and trick others to coredump * into their pre-created files: +* Note, this is not relevant for pipes */ -if (inode->i_uid !=current_fsuid ()) +if (!ispipe && (inode->i_uid !=current_fsuid ())) goto close_fail;if (!cprm.file->f_op) goto close_fail;
fs/gfs2/file.c +1 -1
@@ -640,7 +640,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)if (!(fl->fl_flags &FL_POSIX ))return -ENOLCK ; -if (__mandatory_lock (&ip->i_inode)) +if (__mandatory_lock (&ip->i_inode) && fl->fl_type !=F_UNLCK )return -ENOLCK ;if (cmd ==F_CANCELLK ) {
fs/nfs/delegation.h +6 -0
@@ -71,4 +71,10 @@ static inline int nfs_inode_return_delegation(struct inode *inode) }#endif +static inline int nfs_have_delegated_attributes (struct inode *inode) +{ +return nfs_have_delegation (inode,FMODE_READ ) && + !(NFS_I (inode)->cache_validity &NFS_INO_REVAL_FORCED ); +} +#endif
fs/nfs/dir.c +1 -1
@@ -1789,7 +1789,7 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str cache =nfs_access_search_rbtree (inode, cred);if (cache ==NULL ) goto out; -if (!nfs_have_delegation (inode,FMODE_READ ) && +if (!nfs_have_delegated_attributes (inode) && !time_in_range_open (jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo)) goto out_stale; res->jiffies = cache->jiffies;
fs/nfs/file.c +2 -1
@@ -486,7 +486,8 @@ static int nfs_release_page(struct page *page, gfp_t gfp) {dfprintk (PAGECACHE ,"NFS: release_page(%p)\n" , page); -if (gfp & __GFP_WAIT) +/* Only do I/O if gfp is a superset of GFP_KERNEL */ +if ((gfp &GFP_KERNEL ) ==GFP_KERNEL )nfs_wb_page (page->mapping->host, page);/* If PagePrivate() is set, then the page is not freeable */ if (PagePrivate (page))
fs/nfs/inode.c +1 -1
@@ -759,7 +759,7 @@ int nfs_attribute_timeout(struct inode *inode) {struct nfs_inode *nfsi =NFS_I (inode); -if (nfs_have_delegation (inode,FMODE_READ )) +if (nfs_have_delegated_attributes (inode))return 0 ;return !time_in_range_open (jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo); }
fs/nfs/pagelist.c +13 -10
@@ -112,12 +112,10 @@ void nfs_unlock_request(struct nfs_page *req)*/ int nfs_set_page_tag_locked (struct nfs_page *req) { -struct nfs_inode *nfsi =NFS_I (req->wb_context->path.dentry->d_inode); -if (!nfs_lock_request_dontget (req))return 0 ;if (req->wb_page !=NULL ) -radix_tree_tag_set (&nfsi->nfs_page_tree, req->wb_index,NFS_PAGE_TAG_LOCKED ); +radix_tree_tag_set (&NFS_I (req->wb_context->path.dentry->d_inode)->nfs_page_tree, req->wb_index,NFS_PAGE_TAG_LOCKED );return 1 ; }
@@ -126,10 +124,10 @@ int nfs_set_page_tag_locked(struct nfs_page *req)*/ void nfs_clear_page_tag_locked (struct nfs_page *req) { -struct inode *inode = req->wb_context->path.dentry->d_inode; -struct nfs_inode *nfsi =NFS_I (inode); -if (req->wb_page !=NULL ) { +struct inode *inode = req->wb_context->path.dentry->d_inode; +struct nfs_inode *nfsi =NFS_I (inode); +spin_lock (&inode->i_lock);radix_tree_tag_clear (&nfsi->nfs_page_tree, req->wb_index,NFS_PAGE_TAG_LOCKED );nfs_unlock_request (req);
@@ -142,16 +140,22 @@ void nfs_clear_page_tag_locked(struct nfs_page *req)* nfs_clear_request - Free up all resources allocated to the request * @req: * -* Release page resources associated with a write request after it -* has completed. +* Release page and open context resources associated with a read/write +* request after it has completed. */ void nfs_clear_request (struct nfs_page *req) {struct page *page = req->wb_page; +struct nfs_open_context *ctx = req->wb_context; +if (page !=NULL ) {page_cache_release (page); req->wb_page =NULL ; } +if (ctx !=NULL ) { +put_nfs_open_context (ctx); + req->wb_context =NULL ; + } }
@@ -165,9 +169,8 @@ static void nfs_free_request(struct kref *kref) { struct nfs_page *req = container_of(kref, struct nfs_page, wb_kref); -/* Release struct file or cached credential */ +/* Release struct file and open context */ nfs_clear_request (req); -put_nfs_open_context (req->wb_context);nfs_page_free (req); }
fs/nilfs2/segment.c +1 -2
@@ -1902,8 +1902,7 @@ static void nilfs_segctor_abort_construction(struct nilfs_sc_info *sci,list_splice_tail_init (&sci->sc_write_logs, &logs); ret =nilfs_wait_on_logs (&logs); -if (ret) -nilfs_abort_logs (&logs,NULL , sci->sc_super_root, ret); +nilfs_abort_logs (&logs,NULL , sci->sc_super_root, ret ? : err);list_splice_tail_init (&sci->sc_segbufs, &logs);nilfs_cancel_segusage (&logs, nilfs->ns_sufile);
fs/partitions/msdos.c +48 -37
215 lines not on this page · raw message
fs/quota/dquot.c +37 -8
71 lines not on this page · raw message
kernel/sched.c +43 -33
76 lines not on this page · raw message
net/ipv4/tcp.c +44 -21
65 lines not on this page · raw message
net/sctp/input.c +27 -15
42 lines not on this page · raw message
tools/perf/builtin-annotate.c +32 -31
63 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
I'm announcing the release of the 2.6.33.2 kernel.
All users of the 2.6.33 kernel series should upgrade.
The updated 2.6.33.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.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.33.y.git;a=summarythanks,
greg k-h
------------
Documentation/filesystems/tmpfs.txt | 6 Makefile | 2 arch/arm/boot/compressed/head.S | 50 ++--- arch/arm/boot/compressed/vmlinux.lds.in | 3 arch/powerpc/kernel/perf_event.c | 8 arch/sh/boot/compressed/misc.c | 2 arch/sparc/kernel/perf_event.c | 4 arch/sparc/prom/p1275.c | 12 - arch/x86/include/asm/fixmap.h | 6 arch/x86/include/asm/msr-index.h | 2 arch/x86/kernel/cpu/intel.c | 3 arch/x86/kernel/cpu/perf_event.c | 9 - arch/x86/kernel/dumpstack_64.c | 10 - arch/x86/kernel/hw_breakpoint.c | 5 arch/x86/kernel/process.c | 32 ++- arch/x86/kvm/x86.c | 1 arch/x86/mm/pageattr.c | 25 ++ drivers/ata/ahci.c | 28 ++- drivers/ata/pata_via.c | 4 drivers/char/tty_buffer.c | 6 drivers/edac/edac_mce_amd.c | 7 drivers/gpu/drm/i915/i915_gem.c | 21 +- drivers/gpu/drm/i915/intel_overlay.c | 13 + drivers/gpu/drm/nouveau/nouveau_connector.c | 6 drivers/hwmon/coretemp.c | 2 drivers/i2c/busses/i2c-i801.c | 6 drivers/i2c/busses/i2c-powermac.c | 25 ++ drivers/ide/icside.c | 64 +++++++ drivers/ide/ide-probe.c | 12 - drivers/ide/pdc202xx_old.c | 4 drivers/input/mouse/alps.c | 2 drivers/input/serio/i8042-x86ia64io.h | 7 drivers/isdn/gigaset/capi.c | 46 +++-- drivers/isdn/gigaset/common.c | 6 drivers/isdn/gigaset/dummyll.c | 14 + drivers/isdn/gigaset/ev-layer.c | 12 - drivers/isdn/gigaset/gigaset.h | 6 drivers/isdn/gigaset/i4l.c | 28 ++- drivers/isdn/gigaset/interface.c | 1 drivers/leds/leds-gpio.c | 3 drivers/media/video/em28xx/em28xx-dvb.c | 1 drivers/net/bonding/bond_main.c | 2 drivers/net/can/bfin_can.c | 3 drivers/net/e100.c | 2 drivers/net/jme.c | 35 ++++ drivers/net/pppol2tp.c | 6 drivers/net/r8169.c | 29 ++- drivers/net/tg3.c | 2 drivers/net/wireless/ath/ath5k/ath5k.h | 2 drivers/net/wireless/ath/ath5k/base.c | 22 ++ drivers/net/wireless/ath/ath5k/phy.c | 37 ++-- drivers/net/wireless/ath/ath5k/qcu.c | 5 drivers/net/wireless/ath/ath5k/reg.h | 1 drivers/net/wireless/ath/ath5k/reset.c | 5 drivers/net/wireless/ath/ath9k/ath9k.h | 1 drivers/net/wireless/ath/ath9k/beacon.c | 7 drivers/net/wireless/ath/ath9k/hw.c | 7 drivers/net/wireless/ath/ath9k/hw.h | 1 drivers/net/wireless/ath/ath9k/main.c | 29 ++- drivers/net/wireless/ath/ath9k/pci.c | 1 drivers/net/wireless/ath/ath9k/rc.c | 6 drivers/net/wireless/ath/ath9k/xmit.c | 32 --- drivers/net/wireless/b43/main.c | 11 - drivers/net/wireless/iwlwifi/iwl-3945.c | 8 drivers/net/wireless/iwlwifi/iwl-core.c | 12 - drivers/net/wireless/iwlwifi/iwl-helpers.h | 7 drivers/net/wireless/iwlwifi/iwl-rx.c | 21 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 25 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 16 - drivers/net/wireless/wl12xx/wl1251_debugfs.c | 3 drivers/pci/pci.c | 43 ++--- drivers/pci/quirks.c | 1 drivers/platform/x86/classmate-laptop.c | 31 ++- drivers/scsi/qlogicpti.c | 2 drivers/scsi/scsi_transport_fc.c | 24 +- drivers/scsi/ses.c | 4 drivers/usb/core/devio.c | 17 +- drivers/usb/host/ehci-hcd.c | 2 drivers/usb/host/ehci-sched.c | 28 ++- drivers/usb/host/ehci.h | 5 drivers/usb/host/r8a66597-hcd.c | 16 + drivers/usb/host/xhci-hcd.c | 1 drivers/usb/serial/ftdi_sio.c | 1 drivers/usb/serial/ftdi_sio_ids.h | 7 drivers/usb/serial/option.c | 7 drivers/usb/serial/qcserial.c | 29 +++ drivers/video/Kconfig | 12 + drivers/video/Makefile | 1 drivers/video/sunxvr1000.c | 228 +++++++++++++++++++++++++++ drivers/virtio/virtio_pci.c | 3 fs/exec.c | 3 fs/gfs2/file.c | 2 fs/nfs/delegation.h | 6 fs/nfs/dir.c | 2 fs/nfs/file.c | 3 fs/nfs/inode.c | 2 fs/nfs/pagelist.c | 23 +- fs/nilfs2/segment.c | 3 fs/partitions/msdos.c | 85 +++++----- fs/quota/dquot.c | 45 ++++- include/linux/decompress/mm.h | 14 + include/linux/if_tunnel.h | 1 include/linux/kfifo.h | 2 include/linux/kvm.h | 1 include/linux/netdevice.h | 8 include/linux/netfilter/nfnetlink.h | 2 include/linux/netlink.h | 2 include/linux/perf_event.h | 7 include/linux/quotaops.h | 11 + include/linux/skbuff.h | 6 include/linux/tty.h | 11 + include/net/mac80211.h | 7 include/net/netlink.h | 6 include/net/sock.h | 17 +- include/net/xfrm.h | 3 init/main.c | 2 ipc/mqueue.c | 3 kernel/cpuset.c | 20 +- kernel/hw_breakpoint.c | 1 kernel/irq/chip.c | 31 ++- kernel/irq/manage.c | 18 ++ kernel/kthread.c | 2 kernel/perf_event.c | 34 ++-- kernel/sched.c | 76 +++++---- kernel/softlockup.c | 4 kernel/time/clocksource.c | 4 kernel/trace/ftrace.c | 2 kernel/trace/ring_buffer.c | 12 - kernel/trace/trace.c | 25 ++ mm/mempolicy.c | 40 ++-- net/8021q/vlan_core.c | 4 net/bluetooth/l2cap.c | 15 + net/bluetooth/rfcomm/core.c | 13 + net/bluetooth/rfcomm/sock.c | 11 + net/bluetooth/sco.c | 11 + net/core/dev.c | 8 net/core/sock.c | 16 + net/dccp/minisocks.c | 2 net/ipv4/ip_gre.c | 4 net/ipv4/route.c | 33 ++- net/ipv4/tcp.c | 65 +++++-- net/ipv4/tcp_input.c | 3 net/ipv4/tcp_ipv4.c | 6 net/ipv4/tcp_minisocks.c | 2 net/ipv4/tcp_output.c | 18 +- net/ipv4/udp.c | 6 net/ipv4/xfrm4_policy.c | 5 net/ipv6/route.c | 13 + net/ipv6/tcp_ipv6.c | 6 net/ipv6/udp.c | 28 ++- net/ipv6/xfrm6_policy.c | 3 net/llc/llc_c_ac.c | 2 net/llc/llc_conn.c | 3 net/mac80211/ieee80211_i.h | 1 net/mac80211/mlme.c | 23 ++ net/mac80211/rate.h | 5 net/mac80211/status.c | 17 +- net/netfilter/nf_conntrack_netlink.c | 3 net/netfilter/nfnetlink.c | 4 net/netfilter/xt_recent.c | 2 net/netlink/af_netlink.c | 17 +- net/sctp/input.c | 42 +++- net/sctp/socket.c | 3 net/sunrpc/auth_gss/auth_gss.c | 5 net/sunrpc/rpc_pipe.c | 2 net/sunrpc/svc_xprt.c | 13 - net/sunrpc/svcsock.c | 1 net/tipc/socket.c | 6 net/x25/x25_dev.c | 2 net/xfrm/xfrm_policy.c | 7 sound/pci/ac97/ac97_patch.c | 2 sound/pci/cmipci.c | 14 + sound/pci/hda/hda_intel.c | 10 + sound/pci/hda/patch_conexant.c | 15 + sound/pci/hda/patch_realtek.c | 10 - tools/perf/Documentation/Makefile | 4 tools/perf/Makefile | 4 tools/perf/builtin-annotate.c | 63 +++---- tools/perf/builtin-probe.c | 1 tools/perf/util/probe-finder.c | 3 tools/perf/util/symbol.c | 2 tools/perf/util/symbol.h | 2 182 files changed, 1692 insertions(+), 718 deletions(-)
Adel Gadllah (1):
iwlwifi: Silence tfds_in_queue message
Alan Cox (1):
tty: Keep the default buffering to sub-page units
Alan Stern (1):
USB: fix usbfs regression
Alexander Duyck (2):
pci: add support for 82576NS serdes to existing SR-IOV quirk
skbuff: remove unused dma_head & dma_maps fields
Alexandra Kossovsky (1):
tcp: Fix OOB POLLIN avoidance.
Andiry Xu (1):
USB: xHCI: re-initialize cmd_completion
Andreas Herrmann (1):
x86, amd: Restrict usage of c1e_idle()
Andrei Emeltchenko (1):
Bluetooth: Fix kernel crash on L2CAP stress tests
André Goddard Rosa (1):
mqueue: fix mq_open() file descriptor leak on user-space processes
Anton Vorontsov (1):
leds-gpio: fix default state handling on OF platforms
Arnaldo Carvalho de Melo (1):
perf annotate: Defer allocating sym_priv->hist array
Barry Song (1):
can: fix bfin_can build error after alloc_candev() change
Bartlomiej Zolnierkiewicz (1):
icside: bring back ->maskproc method
Ben Skeggs (1):
drm/nouveau: report unknown connector state if lid closed
Bernhard Rosenkraenzer (1):
USB: qcserial: add new device ids
Bob Copeland (2):
ath5k: dont use external sleep clock in AP mode
ath5k: fix setup for CAB queue
Borislav Petkov (1):
edac, mce: Filter out invalid values
Bruno Randolf (1):
ath5k: fix I/Q calibration (for real)
Chris Wilson (1):
drm/i915: Avoid NULL deref in get_pages() unwind after error.
Christoph Fritz (1):
Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table
Clemens Ladisch (3):
ALSA: cmipci: work around invalid PCM pointer
USB: EHCI: fix ITD list order
USB: EHCI: adjust ehci_iso_stream for changes in ehci_qh
Colin Ian King (1):
softlockup: Stop spurious softlockup messages due to overflow
Dan Carpenter (2):
sunrpc: handle allocation errors from __rpc_lookup_create() drm/i915: fix small leak on overlay error path
Daniel Chen (1):
ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist
Daniel Sangorrin (1):
USB: serial: ftdi: add CONTEC vendor and product id
Daniel T Chen (4):
ALSA: hda: Use LPIB and 6stack-dig for eMachines T5212
ALSA: hda: Fix 0 dB offset for HP laptops using CX20551 (Waikiki)
ALSA: hda: Use LPIB for ga-ma770-ud3 board
ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist
Daniel Taylor (1):
fs/partitions/msdos: add support for large disks
David Härdeman (1):
kfifo: fix KFIFO_INIT in include/linux/kfifo.h
David S. Miller (5):
sparc64: Make prom entry spinlock NMI safe.
Revert "ide: skip probe if there are no devices on the port (v2)"
sparc64: Properly truncate pt_regs framepointer in perf callback.
sparc64: Add very basic XVR-1000 framebuffer driver.
e100: Fix ring parameter change handling regression.
Dean Nelson (4):
PCI: fix return value from pcix_get_max_mmrbc()
PCI: fix access of PCI_X_CMD by pcix get and set mmrbc functions
PCI: cleanup error return for pcix get and set mmrbc functions
hwmon: (coretemp) Add missing newline to dev_warn() message
Dimitri Sivanich (1):
x86: Fix sched_clock_cpu for systems with unsynchronized TSC
Dmitry Monakhov (1):
quota: manage reserved space when quota is not active [v2]
Eric Dumazet (2):
net: Potential null skb->dev dereference
tcp: Fix tcp_make_synack()
Felix Fietkau (1):
ath9k: fix BUG_ON triggered by PAE frames
Francesco Lavra (1):
V4L/DVB (13961): em28xx-dvb: fix memleak in dvb_fini()
Frederic Weisbecker (2):
x86/stacktrace: Don't dereference bad frame pointers
hw-breakpoints: Remove stub unthrottle callback
Gal Rosen (1):
SCSI: scsi_transport_fc: Fix synchronization issue while deleting vport
Grazvydas Ignotas (1):
wl1251: fix potential crash
Greg Kroah-Hartman (1):
Linux 2.6.33.2
Guenter Roeck (1):
ipv4: Don't drop redirected route cache entry unless PTMU actually expired
Guo-Fu Tseng (2):
jme: Fix VLAN memory leak
jme: Protect vlgrp structure by pause RX actions.
Herbert Xu (1):
ipsec: Fix bogus bundle flowi
J. Bruce Fields (2):
Revert "sunrpc: fix peername failed on closed listener" Revert "sunrpc: move the close processing after do recvfrom method"
James Chapman (2):
l2tp: Fix oops in pppol2tp_xmit
l2tp: Fix UDP socket reference count bugs in the pppol2tp driver
Jan Beulich (1):
x86: Fix placement of FIX_OHCI1394_BASE
Jan Kara (1):
quota: Fix warning when a delayed write happens before quota is enabled
Jan Kiszka (1):
KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP
Jean Delvare (2):
i2c-powermac: Be less verbose in the absence of real errors.
i2c-i801: Don't use the block buffer for I2C block writes
John Kacur (1):
perf: Make the install relative to DESTDIR if specified
John Stultz (1):
timekeeping: Prevent oops when GENERIC_TIME=n
[email protected] (1):
pata_via: fix VT6410/6415/6330 detection issue
Julia Lawall (1):
drivers/scsi/ses.c: eliminate double free
KOSAKI Motohiro (4):
tmpfs: mpol=bind:0 don't cause mount error.
tmpfs: handle MPOL_LOCAL mount option properly
tmpfs: cleanup mpol_parse_str()
doc: add the documentation for mpol=local
Lai Jiangshan (2):
ring-buffer: Move disabled check into preempt disable section
tracing: Fix warning in s_next of trace file ops
Lennart Schulte (1):
tcp: Fix tcp_mark_head_lost() with packets == 0
Louis Rilling (1):
tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt()
Luis R. Rodriguez (1):
ath9k: add support for 802.11n bonded out AR2427
Marcel Holtmann (1):
Bluetooth: Fix potential bad memory access with sysfs files
Masami Hiramatsu (1):
perf probe: Fix probe_point buffer overrun
Meelis Roos (1):
qlogicpti: Remove slash in QlogicPTI irq name
Mel Gorman (1):
tty: Take a 256 byte padding into account when buffering below sub-page units
Miao Xie (1):
cpuset: fix the problem that cpuset_mem_spread_node() returns an offline node
Michael Buesch (1):
b43: Workaround circular locking in hw-tkip key update callback
Michael S. Tsirkin (1):
virtio: fix out of range array access
Ming Lei (1):
ath9k: fix lockdep warning when unloading module
Nathaniel McCallum (3):
USB: option: fix incorrect manufacturer name in usb/serial/option: MAXON->CMOTECH
USB: option: move hardcoded PID to a macro in usb/serial/option
USB: option: add support for a new CMOTECH device to usb/serial/option
Neil Brown (1):
nfsd: ensure sockets are closed on error
Neil Horman (2):
coredump: suppress uid comparison test if core output files are pipes
r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
Nobuhiro Iwamatsu (1):
sh: Fix zImage boot using fixed PMB.
OGAWA Hirofumi (1):
fs/partition/msdos: fix unusable extended partition for > 512B sector
Pablo Neira Ayuso (3):
netlink: fix NETLINK_RECV_NO_ENOBUFS in netlink_set_err()
netfilter: ctnetlink: fix reliable event delivery if message building fails
netlink: fix unaligned access in nla_get_be64()
Patrick McHardy (2):
netfilter: xt_recent: fix regression in rules using a zero hit_count
bonding: fix device leak on error in bond_create()
Paul Mackerras (1):
perf_event: Fix oops triggered by cpu offline/online
Paulius Zaleckas (1):
if_tunnel.h: add missing ams/byteorder.h include
Peter Zijlstra (1):
perf: Provide generic perf_sample_data initialization
Ralf Gerbig (1):
ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55
Ravikiran G Thirumalai (1):
tmpfs: fix oops on mounts with mpol=default
Russell King (3):
decompress: fix new decompressor for PIC
ARM: Fix decompressor's kernel size estimation for ROM=y
ide: Fix Promise UDMA33 IDE driver (pdc202xx_old)
Ryusuke Konishi (1):
nilfs2: fix hang-up of cleaner after log writer returned with error
Sachin Prabhu (1):
GFS2: Skip check for mandatory locks when unlocking
Senthil Balasubramanian (2):
ath9k: Enable TIM timer interrupt only when needed.
ath9k: configure the beacon only if the STA is associated
Stanislaw Gruszka (1):
iwlwifi: use dma_alloc_coherent
Steven J. Magnani (1):
NET_DMA: free skbs periodically
Steven Rostedt (4):
function-graph: Init curr_ret_stack with ret_stack
tracing: Use same local variable when resetting the ring buffer
tracing: Disable buffer switching when starting or stopping trace
tracing: Do not record user stack trace from NMI context
Sujith (1):
mac80211: Fix HT rate control configuration
Suresh Siddha (2):
x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already
sched: Fix SCHED_MC regression caused by change in sched cpu_power
Takashi Iwai (3):
ALSA: hda - Fix input source elements of secondary ADCs on Realtek
ALSA: hda - Disable MSI for Nvidia controller
ALSA: hda - Fix secondary ADC of ALC260 basic model
Tejun Heo (1):
ahci: use BIOS date in broken_suspend list
Thadeu Lima de Souza Cascardo (1):
classmate-laptop: use a single MODULE_DEVICE_TABLE to get correct aliases
Thomas Bächler (1):
Input: alps - add support for the touchpad on Toshiba Tecra A11-11L
Thomas Gleixner (1):
genirq: Prevent oneshot irq thread race
Tilman Schmidt (5):
gigaset: correct clearing of at_state strings on RING
gigaset: prune use of tty_buffer_request_room
gigaset: avoid registering CAPI driver more than once
gigaset: fix build failure
gigaset: correct range checking off by one error
Timo Teräs (2):
ip_gre: include route header_len in max_headroom calculation
ipv4: check rt_genid in dst_check
Trond Myklebust (4):
NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode()
NFS: Avoid a deadlock in nfs_release_page
NFS: Prevent another deadlock in nfs_release_page()
SUNRPC: Fix a potential memory leak in auth_gss
Vitaliy Gusev (1):
route: Fix caught BUG_ON during rt_secret_rebuild_oneshot()
Vivek Natarajan (2):
mac80211: Retry null data frame for power save
ath9k: Enable IEEE80211_HW_REPORTS_TX_ACK_STATUS flag for ath9k
YOSHIFUJI Hideaki / 吉藤英明 (1):
ipv6: Don't drop cache route entry unless timer actually expired.
Yoshihiro Shimoda (1):
usb: r8a66597-hcd: fix removed from an attached hub
Zhu Yi (9):
net: add limit for socket backlog
tcp: use limited socket backlog
udp: use limited socket backlog
llc: use limited socket backlog
sctp: use limited socket backlog
tipc: use limited socket backlog
x25: use limited socket backlog
net: backlog functions rename
net: add __must_check to sk_add_backlog