Linux 2.6.32.11
Subsystems (60)
I'm announcing the release of the 2.6.32.11 kernel.
All users of the 2.6.32 kernel series should upgrade.
The updated 2.6.32.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.32.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.32.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/mips/mm/tlbex.c | 8 - arch/sh/boot/compressed/misc.c | 2 arch/sparc/prom/p1275.c | 10 - arch/x86/include/asm/fixmap.h | 6 arch/x86/include/asm/msr-index.h | 2 arch/x86/kernel/acpi/boot.c | 5 arch/x86/kernel/apic/apic.c | 14 -- arch/x86/kernel/apic/probe_32.c | 27 +++- arch/x86/kernel/apic/probe_64.c | 13 - arch/x86/kernel/cpu/intel.c | 3 arch/x86/kernel/mpparse.c | 7 - arch/x86/kernel/process.c | 32 +++- arch/x86/kernel/process_64.c | 1 arch/x86/kernel/smpboot.c | 2 block/blk-settings.c | 93 ++++++++++---- drivers/ata/ahci.c | 28 +++- drivers/char/tty_buffer.c | 6 drivers/edac/edac_mce_amd.c | 8 - drivers/gpu/drm/drm_edid.c | 163 +++++++++---------------- drivers/gpu/drm/i915/i915_drv.h | 2 drivers/gpu/drm/i915/i915_gem.c | 21 +-- drivers/gpu/drm/i915/intel_bios.c | 4 drivers/gpu/drm/i915/intel_crt.c | 2 drivers/hwmon/coretemp.c | 2 drivers/i2c/busses/i2c-i801.c | 6 drivers/input/mouse/alps.c | 2 drivers/input/serio/i8042-x86ia64io.h | 7 + drivers/input/tablet/wacom.h | 7 - drivers/input/tablet/wacom_sys.c | 7 - drivers/isdn/gigaset/ev-layer.c | 12 - drivers/isdn/gigaset/interface.c | 1 drivers/leds/leds-gpio.c | 3 drivers/media/video/em28xx/em28xx-dvb.c | 1 drivers/mmc/host/s3cmci.c | 2 drivers/net/e1000e/hw.h | 1 drivers/net/e1000e/ich8lan.c | 1 drivers/net/e1000e/netdev.c | 1 drivers/net/ixgbe/ixgbe_82599.c | 1 drivers/net/ixgbe/ixgbe_main.c | 2 drivers/net/ixgbe/ixgbe_type.h | 1 drivers/net/jme.c | 35 +++++ drivers/net/tg3.c | 23 ++- drivers/net/tg3.h | 3 drivers/net/wireless/ath/ath5k/ath5k.h | 2 drivers/net/wireless/ath/ath5k/base.c | 22 ++- drivers/net/wireless/ath/ath5k/qcu.c | 5 drivers/net/wireless/ath/ath5k/reset.c | 5 drivers/net/wireless/ath/ath9k/ath9k.h | 1 drivers/net/wireless/ath/ath9k/main.c | 26 ++- 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/pcie/aer/aerdrv_core.c | 10 - drivers/pci/quirks.c | 1 drivers/scsi/mvsas/mv_init.c | 1 drivers/scsi/scsi_transport_fc.c | 24 +-- drivers/scsi/ses.c | 4 drivers/staging/rt2860/common/2860_rtmp_init.c | 2 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/efifb.c | 11 + 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/partitions/msdos.c | 85 +++++++------ fs/quota/dquot.c | 45 +++++- include/linux/decompress/mm.h | 14 +- include/linux/hrtimer.h | 13 + include/linux/if_tunnel.h | 1 include/linux/lcm.h | 8 + include/linux/quotaops.h | 11 + include/linux/tty.h | 11 + include/net/mac80211.h | 4 init/main.c | 9 - ipc/mqueue.c | 3 kernel/cpuset.c | 20 +-- kernel/hrtimer.c | 96 ++++++++------ kernel/kthread.c | 2 kernel/perf_event.c | 13 + kernel/sched.c | 76 ++++++----- kernel/softlockup.c | 4 kernel/time/clocksource.c | 4 kernel/time/timer_list.c | 5 kernel/trace/ftrace.c | 2 kernel/trace/ring_buffer.c | 12 - kernel/trace/trace.c | 24 +++ lib/Makefile | 2 lib/lcm.c | 15 ++ mm/mempolicy.c | 40 +++--- mm/readahead.c | 12 + net/bluetooth/l2cap.c | 15 ++ net/bluetooth/rfcomm/core.c | 15 +- net/bluetooth/rfcomm/sock.c | 11 + net/bluetooth/sco.c | 11 + net/mac80211/ieee80211_i.h | 1 net/mac80211/main.c | 15 ++ net/mac80211/mlme.c | 20 ++- net/mac80211/rx.c | 8 + net/netfilter/xt_recent.c | 2 net/sunrpc/auth_gss/auth_gss.c | 5 net/sunrpc/rpc_pipe.c | 2 security/min_addr.c | 3 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 | 11 + tools/perf/Documentation/Makefile | 4 tools/perf/Makefile | 4 133 files changed, 1137 insertions(+), 649 deletions(-)
Adam Jackson (1):
drm/edid: Unify detailed block parsing between base and extension blocks
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 (1):
pci: add support for 82576NS serdes to existing SR-IOV quirk
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
Andrew Patterson (1):
PCI: unconditionally clear AER uncorr status register during cleanup
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
Ben Hutchings (1):
rt2860sta: Fix argument to linux_pci_unmap_single()
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
Bruce Allan (1):
e1000e: enable new 82567V-3 device
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 (1):
sunrpc: handle allocation errors from __rpc_lookup_create()
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 (6):
ALSA: hda: enable MSI for Gateway M-6866
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
ALSA: hda: Use ALC260_WILL quirk for another Acer model (0x1025007f)
Daniel Taylor (1):
fs/partitions/msdos: add support for large disks
David Daney (1):
MIPS: Cleanup forgotten label_module_alloc in tlbex.c
David S. Miller (1):
sparc64: Make prom entry spinlock NMI safe.
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]
Don Skidmore (1):
ixgbe: add support for 82599 KR device 0x1517
Felix Fietkau (1):
ath9k: fix BUG_ON triggered by PAE frames
Francesco Lavra (1):
V4L/DVB (13961): em28xx-dvb: fix memleak in dvb_fini()
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.32.11
Guo-Fu Tseng (2):
jme: Fix VLAN memory leak
jme: Protect vlgrp structure by pause RX actions.
Hisashi Hifumi (1):
readahead: add blk_run_backing_dev
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
Jean Delvare (1):
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
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
Kees Cook (1):
sysctl: require CAP_SYS_RAWIO to set mmap_min_addr
Lai Jiangshan (1):
ring-buffer: Move disabled check into preempt disable section
Lars-Peter Clausen (1):
s3cmci: initialize default platform data no_wprotect and no_detect with 1
Louis Rilling (1):
tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt()
Marcel Holtmann (2):
Bluetooth: Fix sleeping function in RFCOMM within invalid context
Bluetooth: Fix potential bad memory access with sysfs files
Marcin Slusarz (1):
efifb: fix framebuffer handoff
Martin K. Petersen (1):
block: Backport of various I/O topology fixes from 2.6.33 and 2.6.34
Matt Carlson (1):
tg3: Fix 5906 transmit hangs
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 Horman (1):
coredump: suppress uid comparison test if core output files are pipes
Nobuhiro Iwamatsu (1):
sh: Fix zImage boot using fixed PMB.
OGAWA Hirofumi (1):
fs/partition/msdos: fix unusable extended partition for > 512B sector
Oleg Nesterov (1):
x86: set_personality_ia32() misses force_personality32
Patrick McHardy (1):
netfilter: xt_recent: fix regression in rules using a zero hit_count
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):
sched: Mark boot-cpu active before smp_init()
Ping Cheng (1):
Input: wacom - ensure the device is initialized properly upon resume
Ravikiran G Thirumalai (1):
tmpfs: fix oops on mounts with mpol=default
Russell King (2):
decompress: fix new decompressor for PIC
ARM: Fix decompressor's kernel size estimation for ROM=y
Sachin Prabhu (1):
GFS2: Skip check for mandatory locks when unlocking
Senthil Balasubramanian (1):
ath9k: Enable TIM timer interrupt only when needed.
Shaohua Li (1):
drm/i915: fix gpio register detection logic for BIOS without VBT
Srinivas (1):
mvsas: add support for Adaptec ASC-1045/1405 SAS/SATA HBA
Stanislaw Gruszka (1):
iwlwifi: use dma_alloc_coherent
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
Suresh Siddha (2):
x86, apic: Don't use logical-flat mode when CPU hotplug may exceed 8 CPUs
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
Thomas Bächler (1):
Input: alps - add support for the touchpad on Toshiba Tecra A11-11L
Thomas Gleixner (1):
hrtimer: Tune hrtimer_interrupt hang logic
Tilman Schmidt (2):
gigaset: correct clearing of at_state strings on RING
gigaset: prune use of tty_buffer_request_room
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
Vivek Natarajan (3):
mac80211: Retry null data frame for power save
ath9k: Enable IEEE80211_HW_REPORTS_TX_ACK_STATUS flag for ath9k
mac80211: Reset dynamic ps timer in Rx path.
Yoshihiro Shimoda (1):
usb: r8a66597-hcd: fix removed from an attached hub
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 = 32 -EXTRAVERSION = .10 +EXTRAVERSION = .11 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/mips/mm/tlbex.c +0 -8
@@ -73,9 +73,6 @@ static int __cpuinit m4kc_tlbp_war(void)enum label_id { label_second_part =1 , label_leave, -#ifdef MODULE_START - label_module_alloc, -#endif label_vmalloc, label_vmalloc_done, label_tlbw_hazard,
@@ -92,9 +89,6 @@ enum label_id { UASM_L_LA(_second_part) UASM_L_LA(_leave) -#ifdef MODULE_START -UASM_L_LA(_module_alloc) -#endif UASM_L_LA(_vmalloc) UASM_L_LA(_vmalloc_done) UASM_L_LA(_tlbw_hazard)
@@ -802,8 +796,6 @@ static void __cpuinit build_r4000_tlb_refill_handler(void) }else {#if defined(CONFIG_HUGETLB_PAGE )const enum label_id ls = label_tlb_huge_update; -#elif defined(MODULE_START ) -const enum label_id ls = label_module_alloc;#else const enum label_id ls = label_vmalloc;#endif
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 =PHYSADDR ((unsigned long )&_text+PAGE_SIZE ); -#ifdef CONFIG_29BIT +#if defined(CONFIG_29BIT ) || defined(CONFIG_PMB_FIXED ) output_addr |=P2SEG ;#endif #endif
arch/sparc/prom/p1275.c +6 -4
@@ -32,8 +32,7 @@ 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);
@@ -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 ); +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); +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
@@ -104,6 +104,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/acpi/boot.c +0 -5
@@ -1191,9 +1191,6 @@ static void __init acpi_process_madt(void)if (!error) { acpi_lapic =1 ; -#ifdef CONFIG_X86_BIGSMP -generic_bigsmp_probe (); -#endif /* * Parse MADT IO-APIC entries */
@@ -1203,8 +1200,6 @@ static void __init acpi_process_madt(void) acpi_ioapic =1 ; smp_found_config =1 ; -if (apic->setup_apic_routing) - apic->setup_apic_routing (); } }if (error == -EINVAL ) {
arch/x86/kernel/apic/apic.c +0 -14
@@ -1665,9 +1665,7 @@ int __init APIC_init_uniprocessor(void)#endif enable_IR_x2apic (); -#ifdef CONFIG_X86_64 default_setup_apic_routing (); -#endif verify_local_APIC ();connect_bsp_APIC ();
@@ -1915,18 +1913,6 @@ void __cpuinit generic_processor_info(int apicid, int version)if (apicid > max_physical_apicid) max_physical_apicid = apicid; -#ifdef CONFIG_X86_32 -switch (boot_cpu_data.x86_vendor) { -case X86_VENDOR_INTEL : -if (num_processors >8 ) - def_to_bigsmp =1 ; -break ; -case X86_VENDOR_AMD : -if (max_physical_apicid >=8 ) - def_to_bigsmp =1 ; - } -#endif -#if defined(CONFIG_SMP ) || defined(CONFIG_X86_64 )early_per_cpu (x86_cpu_to_apicid, cpu) = apicid;early_per_cpu (x86_bios_cpu_apicid, cpu) = apicid;
arch/x86/kernel/apic/probe_32.c +26 -1
@@ -54,6 +54,31 @@ late_initcall(print_ipi_mode);void default_setup_apic_routing (void ) { +int version = apic_version[boot_cpu_physical_apicid]; + +if (num_possible_cpus () >8 ) { +switch (boot_cpu_data.x86_vendor) { +case X86_VENDOR_INTEL : +if (!APIC_XAPIC (version)) { + def_to_bigsmp =0 ; +break ; + } +/* If P4 and above fall through */ +case X86_VENDOR_AMD : + def_to_bigsmp =1 ; + } + } + +#ifdef CONFIG_X86_BIGSMP +generic_bigsmp_probe (); +#endif + +if (apic->setup_apic_routing) + apic->setup_apic_routing (); +} + +void setup_apic_flat_routing (void ) +{#ifdef CONFIG_X86_IO_APIC printk(KERN_INFO "Enabling APIC mode: Flat. Using %d I/O APICs\n",
@@ -103,7 +128,7 @@ struct apic apic_default = { .init_apic_ldr = default_init_apic_ldr, .ioapic_phys_id_map = default_ioapic_phys_id_map, - .setup_apic_routing = default_setup_apic_routing, + .setup_apic_routing = setup_apic_flat_routing, .multi_timer_check = NULL, .apicid_to_node = default_apicid_to_node, .cpu_to_logical_apicid = default_cpu_to_logical_apicid,
arch/x86/kernel/apic/probe_64.c +2 -11
@@ -67,17 +67,8 @@ void __init default_setup_apic_routing(void) }#endif -if (apic == &apic_flat) { -switch (boot_cpu_data.x86_vendor) { -case X86_VENDOR_INTEL : -if (num_processors >8 ) - apic = &apic_physflat; -break ; -case X86_VENDOR_AMD : -if (max_physical_apicid >=8 ) - apic = &apic_physflat; - } - } +if (apic == &apic_flat &&num_possible_cpus () >8 ) + apic = &apic_physflat;printk (KERN_INFO "Setting APIC routing to %s\n" , apic->name);
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/mpparse.c +0 -7
@@ -359,13 +359,6 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) x86_init.mpparse.mpc_record (1 ); } -#ifdef CONFIG_X86_BIGSMP -generic_bigsmp_probe (); -#endif - -if (apic->setup_apic_routing) - apic->setup_apic_routing (); -if (!num_processors)printk (KERN_ERR "MPTABLE: no processors registered!\n" );return num_processors;
arch/x86/kernel/process.c +24 -8
@@ -439,21 +439,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/kernel/process_64.c +1 -0
@@ -546,6 +546,7 @@ void set_personality_ia32(void)/* Make sure to be in 32bit mode */ set_thread_flag (TIF_IA32 ); + current->personality |= force_personality32;/* Prepare the first "return" to user space */ current_thread_info ()->status |=TS_COMPAT ;
arch/x86/kernel/smpboot.c +0 -2
@@ -1066,9 +1066,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)set_cpu_sibling_map (0 );enable_IR_x2apic (); -#ifdef CONFIG_X86_64 default_setup_apic_routing (); -#endif if (smp_sanity_check (max_cpus) <0 ) {printk (KERN_INFO "SMP disabled\n" );
block/blk-settings.c +68 -25
135 lines not on this page · raw message
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/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 -2
@@ -311,9 +311,13 @@ 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" ,ilog2 ((regs->nbsh &0xf ))); - } +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/drm_edid.c +61 -102
199 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -258,7 +258,7 @@ typedef struct drm_i915_private {struct notifier_block lid_notifier; -int crt_ddc_bus;/* -1 = unknown, else GPIO to use for CRT DDC */ +int crt_ddc_bus;/* 0 = unknown, else GPIO to use for CRT DDC */ struct drm_i915_fence_reg fence_regs[16 ];/* assume 965 */ int fence_reg_start;/* 4 if userland hasn't ioctl'd us yet */ int num_fence_regs;/* 8 on pre-965, 16 otherwise */
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]);
@@ -2246,7 +2243,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 ;
@@ -2269,11 +2265,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; }
@@ -2281,6 +2275,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_bios.c +0 -4
@@ -241,10 +241,6 @@ parse_general_definitions(struct drm_i915_private *dev_priv, GPIOF, }; -/* Set sensible defaults in case we can't find the general block -or it is the wrong chipset */ - dev_priv->crt_ddc_bus =-1 ; - general =find_section (bdb,BDB_GENERAL_DEFINITIONS );if (general) {u16 block_size =get_blocksize (general);
drivers/gpu/drm/i915/intel_crt.c +1 -1
@@ -557,7 +557,7 @@ void intel_crt_init(struct drm_device *dev)else { i2c_reg =GPIOA ;/* Use VBT information for CRT DDC if available */ -if (dev_priv->crt_ddc_bus !=-1 ) +if (dev_priv->crt_ddc_bus !=0 ) i2c_reg = dev_priv->crt_ddc_bus; } intel_output->ddc_bus =intel_i2c_create (dev, i2c_reg,"CRTDDC_A" );
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/input/mouse/alps.c +2 -0
@@ -62,6 +62,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_FW_BK_1 }, /* 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/input/tablet/wacom.h +4 -3
@@ -1,7 +1,7 @@/* * drivers/input/tablet/wacom.h * -* USB Wacom Graphire and Wacom Intuos tablet support +* USB Wacom tablet support * * Copyright (c) 2000-2004 Vojtech Pavlik <[email protected]> * Copyright (c) 2000 Andreas Bach Aaen <[email protected]>
@@ -69,6 +69,7 @@* v1.49 (pc) - Added support for USB Tablet PC (0x90, 0x93, and 0x9A) * v1.50 (pc) - Fixed a TabletPC touch bug in 2.6.28 * v1.51 (pc) - Added support for Intuos4 +* v1.52 (pc) - Query Wacom data upon system resume */ /*
@@ -89,9 +90,9 @@/* * Version Information */ -#define DRIVER_VERSION "v1.51" +#define DRIVER_VERSION "v1.52"#define DRIVER_AUTHOR "Vojtech Pavlik <[email protected]>" -#define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" +#define DRIVER_DESC "USB Wacom tablet driver"#define DRIVER_LICENSE "GPL"MODULE_AUTHOR (DRIVER_AUTHOR );
drivers/input/tablet/wacom_sys.c +4 -3
@@ -1,7 +1,7 @@/* * drivers/input/tablet/wacom_sys.c * -* USB Wacom Graphire and Wacom Intuos tablet support - system specific code +* USB Wacom tablet support - system specific code */ /*
@@ -562,9 +562,10 @@ static int wacom_resume(struct usb_interface *intf)int rv;mutex_lock (&wacom->lock); -if (wacom->open) +if (wacom->open) { rv =usb_submit_urb (wacom->irq,GFP_NOIO ); -else +wacom_query_tablet_data (intf); + }else rv =0 ;mutex_unlock (&wacom->lock);
drivers/isdn/gigaset/ev-layer.c +4 -8
@@ -1243,14 +1243,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/interface.c +0 -1
@@ -635,7 +635,6 @@ void gigaset_if_receive(struct cardstate *cs,if ((tty = cs->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
@@ -610,6 +610,7 @@ static int dvb_fini(struct em28xx *dev)if (dev->dvb) {unregister_dvb (dev->dvb); +kfree (dev->dvb); dev->dvb =NULL ; }
drivers/mmc/host/s3cmci.c +2 -0
@@ -1361,6 +1361,8 @@ static struct mmc_host_ops s3cmci_ops = {static struct s3c24xx_mci_pdata s3cmci_def_pdata = {/* This is currently here to avoid a number of if (host->pdata) * checks. Any zero fields to ensure reaonable defaults are picked. */ + .no_wprotect =1 , + .no_detect =1 , };#ifdef CONFIG_CPU_FREQ
drivers/net/e1000e/hw.h +1 -0
@@ -356,6 +356,7 @@ enum e1e_registers {#define E1000_DEV_ID_80003ES2LAN_COPPER_SPT 0x10BA#define E1000_DEV_ID_80003ES2LAN_SERDES_SPT 0x10BB +#define E1000_DEV_ID_ICH8_82567V_3 0x1501#define E1000_DEV_ID_ICH8_IGP_M_AMT 0x1049#define E1000_DEV_ID_ICH8_IGP_AMT 0x104A#define E1000_DEV_ID_ICH8_IGP_C 0x104B
drivers/net/e1000e/ich8lan.c +1 -0
@@ -3209,6 +3209,7 @@ void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)u32 phy_ctrl;switch (hw->mac.type) { +case e1000_ich8lan:case e1000_ich9lan:case e1000_ich10lan:case e1000_pchlan:
drivers/net/e1000e/netdev.c +1 -0
@@ -5360,6 +5360,7 @@ static struct pci_device_id e1000_pci_tbl[] = { { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_C), board_ich8lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M), board_ich8lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M_AMT), board_ich8lan }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_82567V_3), board_ich8lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE), board_ich9lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G), board_ich9lan },
drivers/net/ixgbe/ixgbe_82599.c +1 -0
@@ -332,6 +332,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)case IXGBE_DEV_ID_82599_KX4 :case IXGBE_DEV_ID_82599_KX4_MEZZ :case IXGBE_DEV_ID_82599_COMBO_BACKPLANE : +case IXGBE_DEV_ID_82599_KR :case IXGBE_DEV_ID_82599_XAUI_LOM :/* Default device ID is mezzanine card KX/KX4 */ media_type = ixgbe_media_type_backplane;
drivers/net/ixgbe/ixgbe_main.c +2 -0
@@ -96,6 +96,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = { board_82599 }, {PCI_VDEVICE (INTEL ,IXGBE_DEV_ID_82599_XAUI_LOM ), board_82599 }, + {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR), + board_82599 }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), board_82599 }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ),
drivers/net/ixgbe/ixgbe_type.h +1 -0
@@ -50,6 +50,7 @@#define IXGBE_DEV_ID_82598EB_XF_LR 0x10F4#define IXGBE_DEV_ID_82599_KX4 0x10F7#define IXGBE_DEV_ID_82599_KX4_MEZZ 0x1514 +#define IXGBE_DEV_ID_82599_KR 0x1517#define IXGBE_DEV_ID_82599_CX4 0x10F9#define IXGBE_DEV_ID_82599_SFP 0x10FB#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC
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/tg3.c +17 -6
@@ -4995,7 +4995,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
@@ -5392,7 +5392,7 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb, mss =0 ;if ((mss =skb_shinfo (skb)->gso_size) !=0 ) {struct iphdr *iph; -int tcp_opt_len, ip_tcp_len, hdr_len; +u32 tcp_opt_len, ip_tcp_len, hdr_len;if (skb_header_cloned (skb) &&pskb_expand_head (skb,0 ,0 ,GFP_ATOMIC )) {
@@ -5423,8 +5423,10 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,IPPROTO_TCP , 0); -if ((tp->tg3_flags2 &TG3_FLG2_HW_TSO ) || - (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5705 )) { +if (tp->tg3_flags2 &TG3_FLG2_HW_TSO_2 ) + mss |= hdr_len <<9 ; +else if ((tp->tg3_flags2 &TG3_FLG2_HW_TSO_1 ) || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5705 ) {if (tcp_opt_len || iph->ihl >5 ) {int tsflags;
@@ -5459,6 +5461,9 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb, would_hit_hwbug =0 ; +if ((tp->tg3_flags3 &TG3_FLG3_SHORT_DMA_BUG ) && len <=8 ) + would_hit_hwbug =1 ; +if (tp->tg3_flags3 &TG3_FLG3_5701_DMA_BUG ) would_hit_hwbug =1 ;else if (tg3_4g_overflow_test (mapping, len))
@@ -5482,6 +5487,10 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb, tnapi->tx_buffers[entry].skb =NULL ; +if ((tp->tg3_flags3 &TG3_FLG3_SHORT_DMA_BUG ) && + len <=8 ) + would_hit_hwbug =1 ; +if (tg3_4g_overflow_test (mapping, len)) would_hit_hwbug =1 ;
@@ -12608,6 +12617,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) } } +if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5906 ) + tp->tg3_flags3 |=TG3_FLG3_SHORT_DMA_BUG ; + tp->irq_max =1 ;#ifdef TG3_NAPI
@@ -13975,8 +13987,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, goto err_out_iounmap; } -if ((tp->tg3_flags3 &TG3_FLG3_5755_PLUS ) || -GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5906 ) +if (tp->tg3_flags3 &TG3_FLG3_5755_PLUS ) dev->netdev_ops = &tg3_netdev_ops;else dev->netdev_ops = &tg3_netdev_ops_dma_bug;
drivers/net/tg3.h +3 -0
@@ -2759,6 +2759,9 @@ struct tg3 {#define TG3_FLG3_TOGGLE_10_100_L1PLLPD 0x00008000#define TG3_FLG3_PHY_IS_FET 0x00010000#define TG3_FLG3_ENABLE_RSS 0x00020000 +#define TG3_FLG3_4G_DMA_BNDRY_BUG 0x00080000 +#define TG3_FLG3_40BIT_DMA_LIMIT_BUG 0x00100000 +#define TG3_FLG3_SHORT_DMA_BUG 0x00200000struct timer_list timer;u16 timer_counter;
drivers/net/wireless/ath/ath5k/ath5k.h +1 -1
@@ -540,7 +540,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
@@ -1511,7 +1511,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 ) {/*
@@ -1538,10 +1539,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/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/reset.c +3 -2
@@ -1382,8 +1382,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
@@ -368,6 +368,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/main.c +15 -11
@@ -1544,6 +1544,7 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)IEEE80211_HW_AMPDU_AGGREGATION |IEEE80211_HW_SUPPORTS_PS |IEEE80211_HW_PS_NULLFUNC_STACK | +IEEE80211_HW_REPORTS_TX_ACK_STATUS |IEEE80211_HW_SPECTRUM_MGMT ;if (AR_SREV_9160_10_OR_LATER (sc->sc_ah) || modparam_nohwcrypt)
@@ -2305,6 +2306,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;
@@ -2336,19 +2350,9 @@ 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); - } - } - sc->ps_enabled = true;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/xmit.c +6 -26
@@ -1320,25 +1320,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);
@@ -1648,7 +1629,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.
@@ -1998,10 +1979,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 ; }
@@ -2210,7 +2190,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) {
@@ -2231,7 +2211,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
@@ -2545,11 +2545,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
@@ -1598,9 +1598,9 @@ EXPORT_SYMBOL(iwl_uninit_drv);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 ; } }
@@ -1616,9 +1616,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
@@ -345,10 +345,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 ; }
@@ -357,7 +357,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);
@@ -365,12 +365,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;
@@ -387,8 +388,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)); }
@@ -125,7 +126,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 ;
@@ -145,7 +146,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, len;if (q->n_bd ==0 )
@@ -164,8 +165,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);
@@ -194,7 +195,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, len;if (q->n_bd ==0 )
@@ -209,8 +210,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);
@@ -301,7 +302,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,
@@ -320,8 +321,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
@@ -356,10 +356,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,
@@ -1272,10 +1272,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/pcie/aer/aerdrv_core.c +3 -7
@@ -78,19 +78,15 @@ EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);int pci_cleanup_aer_uncorrect_error_status (struct pci_dev *dev) {int pos; -u32 status, mask; +u32 status; pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ERR );if (!pos)return -EIO ;pci_read_config_dword (dev, pos +PCI_ERR_UNCOR_STATUS , &status); -pci_read_config_dword (dev, pos +PCI_ERR_UNCOR_SEVER , &mask); -if (dev->error_state == pci_channel_io_normal) - status &= ~mask;/* Clear corresponding nonfatal bits */ -else - status &= mask;/* Clear corresponding fatal bits */ -pci_write_config_dword (dev, pos +PCI_ERR_UNCOR_STATUS , status); +if (status) +pci_write_config_dword (dev, pos +PCI_ERR_UNCOR_STATUS , status);return 0 ; }
drivers/pci/quirks.c +1 -0
@@ -2513,6 +2513,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/scsi/mvsas/mv_init.c +1 -0
@@ -657,6 +657,7 @@ static struct pci_device_id __devinitdata mvs_pci_table[] = { { PCI_VDEVICE(MARVELL, 0x9180), chip_9180 }, { PCI_VDEVICE(ARECA, PCI_DEVICE_ID_ARECA_1300), chip_1300 }, { PCI_VDEVICE(ARECA, PCI_DEVICE_ID_ARECA_1320), chip_1320 }, + { PCI_VDEVICE(ADAPTEC2, 0x0450), chip_6440 }, { } /* terminate list */ };
drivers/scsi/scsi_transport_fc.c +12 -12
@@ -1215,6 +1215,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;
@@ -1804,6 +1813,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 ; }
@@ -3328,18 +3340,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/staging/rt2860/common/2860_rtmp_init.c +1 -1
@@ -716,7 +716,7 @@ VOID RTMPFreeTxRxRingMemory( {if ((pAd->RxRing.Cell[index].DmaBuf.AllocVa) && (pAd->RxRing.Cell[index].pNdisPacket)) { -PCI_UNMAP_SINGLE (pObj->pci_dev, pAd->RxRing.Cell[index].DmaBuf.AllocPa, pAd->RxRing.Cell[index].DmaBuf.AllocSize,PCI_DMA_FROMDEVICE ); +PCI_UNMAP_SINGLE (pAd, pAd->RxRing.Cell[index].DmaBuf.AllocPa, pAd->RxRing.Cell[index].DmaBuf.AllocSize,PCI_DMA_FROMDEVICE );RELEASE_NDIS_PACKET (pAd, pAd->RxRing.Cell[index].pNdisPacket,NDIS_STATUS_SUCCESS ); } }
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
@@ -993,7 +993,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" );
@@ -1553,13 +1553,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);
@@ -1067,7 +1073,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
@@ -1157,6 +1157,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/efifb.c +10 -1
@@ -161,8 +161,17 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,return 0 ; } +static void efifb_destroy (struct fb_info *info) +{ +if (info->screen_base) +iounmap (info->screen_base); +release_mem_region (info->aperture_base, info->aperture_size); +framebuffer_release (info); +} +static struct fb_ops efifb_ops = { .owner =THIS_MODULE , + .fb_destroy = efifb_destroy, .fb_setcolreg = efifb_setcolreg, .fb_fillrect = cfb_fillrect, .fb_copyarea = cfb_copyarea,
@@ -281,7 +290,7 @@ static int __init efifb_probe(struct platform_device *dev) info->par =NULL ; info->aperture_base = efifb_fix.smem_start; - info->aperture_size = size_total; + info->aperture_size = size_remap; info->screen_base =ioremap (efifb_fix.smem_start, efifb_fix.smem_len);if (!info->screen_base) {
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
@@ -1913,8 +1913,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 (!file->f_op) goto close_fail;
fs/gfs2/file.c +1 -1
@@ -606,7 +606,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
@@ -68,4 +68,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
@@ -1797,7 +1797,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/partitions/msdos.c +48 -37
215 lines not on this page · raw message
fs/quota/dquot.c +37 -8
123 lines not on this page · raw message
include/linux/decompress/mm.h +12 -2
@@ -14,11 +14,21 @@/* Code active when included from pre-boot environment: */ +/* +* Some architectures want to ensure there is no local data in their +* pre-boot environment, so that data can arbitarily relocated (via +* GOT references). This is achieved by defining STATIC_RW_DATA to +* be null. +*/ +#ifndef STATIC_RW_DATA +#define STATIC_RW_DATA static +#endif +/* A trivial malloc implementation, adapted from * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 */ -static unsigned long malloc_ptr; -static int malloc_count; +STATIC_RW_DATA unsigned long malloc_ptr; +STATIC_RW_DATA int malloc_count;static void *malloc (int size) {
include/linux/hrtimer.h +9 -4
@@ -162,10 +162,11 @@ struct hrtimer_clock_base {* @expires_next: absolute time of the next event which was scheduled * via clock_set_next_event() * @hres_active: State of high resolution mode -* @check_clocks: Indictator, when set evaluate time source and clock -* event devices whether high resolution mode can be -* activated. -* @nr_events: Total number of timer interrupt events +* @hang_detected: The last hrtimer interrupt detected a hang +* @nr_events: Total number of hrtimer interrupt events +* @nr_retries: Total number of hrtimer interrupt retries +* @nr_hangs: Total number of hrtimer interrupt hangs +* @max_hang_time: Maximum time spent in hrtimer_interrupt */ struct hrtimer_cpu_base {spinlock_t lock;
@@ -173,7 +174,11 @@ struct hrtimer_cpu_base {#ifdef CONFIG_HIGH_RES_TIMERS ktime_t expires_next;int hres_active; +int hang_detected;unsigned long nr_events; +unsigned long nr_retries; +unsigned long nr_hangs; +ktime_t max_hang_time;#endif };
include/linux/if_tunnel.h +1 -0
@@ -2,6 +2,7 @@#define _IF_TUNNEL_H_#include <linux/types.h> +#include <asm/byteorder.h> #ifdef __KERNEL__#include <linux/ip.h>
include/linux/lcm.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef _LCM_H +#define _LCM_H + +#include <linux/compiler.h> + +unsigned long lcm(unsigned long a, unsigned long b) __attribute_const__; + +#endif /* _LCM_H */
include/linux/quotaops.h +9 -2
@@ -26,6 +26,10 @@ static inline void writeout_quota_sb(struct super_block *sb, int type) sb->s_qcop->quota_sync (sb, type); } +void inode_add_rsv_space (struct inode *inode,qsize_t number); +void inode_claim_rsv_space (struct inode *inode,qsize_t number); +void inode_sub_rsv_space (struct inode *inode,qsize_t number); +int dquot_initialize (struct inode *inode,int type);int dquot_drop (struct inode *inode);struct dquot *dqget (struct super_block *sb,unsigned int id,int type);
@@ -42,7 +46,6 @@ int dquot_alloc_inode(const struct inode *inode, qsize_t number);int dquot_reserve_space (struct inode *inode,qsize_t number,int prealloc);int dquot_claim_space (struct inode *inode,qsize_t number);void dquot_release_reserved_space (struct inode *inode,qsize_t number); -qsize_t dquot_get_reserved_space (struct inode *inode);int dquot_free_space (struct inode *inode,qsize_t number);int dquot_free_inode (const struct inode *inode,qsize_t number);
@@ -199,6 +202,8 @@ static inline int vfs_dq_reserve_space(struct inode *inode, qsize_t nr)if (inode->i_sb->dq_op->reserve_space (inode, nr,0 ) ==NO_QUOTA )return 1 ; } +else +inode_add_rsv_space (inode, nr);return 0 ; }
@@ -221,7 +226,7 @@ static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr)if (inode->i_sb->dq_op->claim_space (inode, nr) ==NO_QUOTA )return 1 ; }else -inode_add_bytes (inode, nr); +inode_claim_rsv_space (inode, nr);mark_inode_dirty (inode);return 0 ;
@@ -235,6 +240,8 @@ void vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr) {if (sb_any_quota_active (inode->i_sb)) inode->i_sb->dq_op->release_rsv (inode, nr); +else +inode_sub_rsv_space (inode, nr); }static inline void vfs_dq_free_space_nodirty (struct inode *inode,qsize_t nr)
include/linux/tty.h +11 -0
@@ -68,6 +68,17 @@ struct tty_buffer {unsigned long data[0 ]; }; +/* +* We default to dicing tty buffer allocations to this many characters +* in order to avoid multiple page allocations. We know the size of +* tty_buffer itself but it must also be taken into account that the +* the buffer is 256 byte aligned. See tty_buffer_find for the allocation +* logic this must match +*/ + +#define TTY_BUFFER_PAGE (((PAGE_SIZE - sizeof(struct tty_buffer)) / 2) & ~0xFF) + +struct tty_bufhead {struct delayed_work work;spinlock_t lock;
include/net/mac80211.h +4 -0
@@ -908,6 +908,9 @@ enum ieee80211_tkip_key_type {* @IEEE80211_HW_BEACON_FILTER: * Hardware supports dropping of irrelevant beacon frames to * avoid waking up cpu. +* @IEEE80211_HW_REPORTS_TX_ACK_STATUS: +* Hardware can provide ack status reports of Tx frames to +* the stack. */ enum ieee80211_hw_flags {IEEE80211_HW_RX_INCLUDES_FCS =1 <<1 ,
@@ -924,6 +927,7 @@ enum ieee80211_hw_flags {IEEE80211_HW_SUPPORTS_DYNAMIC_PS =1 <<12 ,IEEE80211_HW_MFP_CAPABLE =1 <<13 ,IEEE80211_HW_BEACON_FILTER =1 <<14 , + IEEE80211_HW_REPORTS_TX_ACK_STATUS = 1<<15, };/**
init/main.c +2 -7
@@ -369,12 +369,6 @@ static void __init smp_init(void) {unsigned int cpu; -/* -* Set up the current CPU as possible to migrate to. -* The other ones will be done by cpu_up/cpu_down() -*/ -set_cpu_active (smp_processor_id (), true); -/* FIXME: This should be done in userspace --RR */ for_each_present_cpu (cpu) {if (num_online_cpus () >= setup_max_cpus)
@@ -486,6 +480,7 @@ static void __init boot_cpu_init(void)int cpu =smp_processor_id ();/* Mark the boot cpu "present", "online" etc for SMP and UP case */ set_cpu_online (cpu, true); +set_cpu_active (cpu, true);set_cpu_present (cpu, true);set_cpu_possible (cpu, true); }
@@ -851,7 +846,7 @@ static int __init kernel_init(void * unused)/* * init can allocate pages on any node */ -set_mems_allowed (node_possible_map); +set_mems_allowed (node_states[N_HIGH_MEMORY ]);/* * init can run on any cpu. */
ipc/mqueue.c +1 -2
@@ -706,7 +706,7 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode, dentry =lookup_one_len (name, ipc_ns->mq_mnt->mnt_root,strlen (name));if (IS_ERR (dentry)) { error =PTR_ERR (dentry); - goto out_err; + goto out_putfd; }mntget (ipc_ns->mq_mnt);
@@ -744,7 +744,6 @@ out:mntput (ipc_ns->mq_mnt); out_putfd:put_unused_fd (fd); -out_err: fd = error; out_upsem:mutex_unlock (&ipc_ns->mq_mnt->mnt_root->d_inode->i_mutex);
kernel/cpuset.c +12 -8
@@ -921,9 +921,6 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,* call to guarantee_online_mems(), as we know no one is changing * our task's cpuset. * -* Hold callback_mutex around the two modifications of our tasks -* mems_allowed to synchronize with cpuset_mems_allowed(). -* * While the mm_struct we are migrating is typically from some * other task, the task_struct mems_allowed that we are hacking * is for our current task, which must allocate new pages for that
@@ -1392,11 +1389,10 @@ static void cpuset_attach(struct cgroup_subsys *ss, struct cgroup *cont,if (cs == &top_cpuset) {cpumask_copy (cpus_attach, cpu_possible_mask); - to = node_possible_map; }else {guarantee_online_cpus (cs, cpus_attach); -guarantee_online_mems (cs, &to); } +guarantee_online_mems (cs, &to);/* do per-task migration stuff possibly for each in the threadgroup */ cpuset_attach_task (tsk, &to, cs);
@@ -2091,15 +2087,23 @@ static int cpuset_track_online_cpus(struct notifier_block *unused_nb,static int cpuset_track_online_nodes (struct notifier_block *self,unsigned long action,void *arg) { +nodemask_t oldmems; +cgroup_lock ();switch (action) {case MEM_ONLINE : -case MEM_OFFLINE : + oldmems = top_cpuset.mems_allowed;mutex_lock (&callback_mutex); top_cpuset.mems_allowed = node_states[N_HIGH_MEMORY ];mutex_unlock (&callback_mutex); -if (action ==MEM_OFFLINE ) -scan_for_empty_cpusets (&top_cpuset); +update_tasks_nodemask (&top_cpuset, &oldmems,NULL ); +break ; +case MEM_OFFLINE : +/* +* needn't update top_cpuset.mems_allowed explicitly because +* scan_for_empty_cpusets() will update it. +*/ +scan_for_empty_cpusets (&top_cpuset);break ;default :break ;
kernel/hrtimer.c +57 -39
138 lines not on this page · raw message
kernel/kthread.c +1 -1
@@ -196,7 +196,7 @@ int kthreadd(void *unused)set_task_comm (tsk,"kthreadd" );ignore_signals (tsk);set_cpus_allowed_ptr (tsk, cpu_all_mask); -set_mems_allowed (node_possible_map); +set_mems_allowed (node_states[N_HIGH_MEMORY ]); current->flags |=PF_NOFREEZE |PF_FREEZER_NOSIG ;
kernel/perf_event.c +12 -1
@@ -4981,12 +4981,22 @@ int perf_event_init_task(struct task_struct *child)return ret; } +static void __init perf_event_init_all_cpus (void ) +{ +int cpu; +struct perf_cpu_context *cpuctx; +
Lines of this file are not shown. View the raw message.
kernel/sched.c +43 -33
76 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.
Hi.
The updates aren't available on git.kernel.org yet. Something wrong with the mirroring perhaps?
Regards,
Nigel
Quoted 4 lines · Nigel Cunningham
Hi.
The updates aren't available on git.kernel.org yet. Something wrong with the mirroring perhaps?
Perhaps. I generate the tarballs directly from the git.kernel.org trees, so the data is there otherwise the tarballs would not have been created.
Does it show up now? Which tree are you looking at?
thanks,
greg k-h
Quoted 11 lines · Greg KH
Quoted 4 lines · Nigel Cunningham
Hi.
The updates aren't available on git.kernel.org yet. Something wrong with the mirroring perhaps?
Perhaps. I generate the tarballs directly from the git.kernel.org trees, so the data is there otherwise the tarballs would not have been created.
Does it show up now? Which tree are you looking at?
Slow mirror propagation, I suppose. I see the tag now on european mirrors but did not yesterday after the announcement.
Hi Greg.
Quoted 11 lines · Greg KH
Quoted 4 lines · Nigel Cunningham
Hi.
The updates aren't available on git.kernel.org yet. Something wrong with the mirroring perhaps?
Perhaps. I generate the tarballs directly from the git.kernel.org trees, so the data is there otherwise the tarballs would not have been created.
Does it show up now? Which tree are you looking at?
Yeah, they all appeared about half an hour after I sent that message. Perhaps it was just overloading or such like. I was looking at 2.6.31, 32 and 33 (doing the pull/merge/push for the TuxOnIce trees).
Regards,
Nigel