Linux 3.2.2
I'm announcing the release of the 3.2.2 kernel.
All users of the 3.2 kernel series must upgrade.
The updated 3.2.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.2.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/ia64/kernel/acpi.c | 10 arch/score/kernel/entry.S | 2 arch/x86/include/asm/amd_nb.h | 2 arch/x86/include/asm/uv/uv_bau.h | 106 +++++++ arch/x86/kernel/amd_nb.c | 31 ++ arch/x86/kernel/apic/x2apic_uv_x.c | 7 arch/x86/mm/mmap.c | 4 arch/x86/mm/srat.c | 4 arch/x86/pci/Makefile | 3 arch/x86/pci/acpi.c | 18 + arch/x86/pci/amd_bus.c | 42 --- arch/x86/platform/uv/tlb_uv.c | 363 ++++++++++++++++++++++----- block/scsi_ioctl.c | 52 +++ drivers/acpi/acpica/dsargs.c | 24 + drivers/acpi/numa.c | 6 drivers/acpi/processor_core.c | 26 + drivers/bcma/host_pci.c | 3 drivers/block/cciss.c | 6 drivers/block/ub.c | 3 drivers/block/virtio_blk.c | 4 drivers/cdrom/cdrom.c | 3 drivers/gpu/drm/radeon/r100.c | 5 drivers/gpu/drm/radeon/r600_hdmi.c | 7 drivers/gpu/drm/radeon/radeon_device.c | 5 drivers/gpu/drm/radeon/rs600.c | 4 drivers/hid/Kconfig | 3 drivers/hid/hid-core.c | 24 + drivers/hid/hid-ids.h | 31 +- drivers/hid/hid-multitouch.c | 71 ++++- drivers/i2c/busses/i2c-ali1535.c | 11 drivers/i2c/busses/i2c-eg20t.c | 2 drivers/i2c/busses/i2c-nforce2.c | 2 drivers/i2c/busses/i2c-omap.c | 2 drivers/i2c/busses/i2c-sis5595.c | 4 drivers/i2c/busses/i2c-sis630.c | 6 drivers/i2c/busses/i2c-viapro.c | 7 drivers/ide/ide-floppy_ioctl.c | 3 drivers/idle/intel_idle.c | 9 drivers/md/dm-flakey.c | 11 drivers/md/dm-linear.c | 12 drivers/md/dm-mpath.c | 6 drivers/md/raid1.c | 11 drivers/media/video/cx23885/cx23885-dvb.c | 5 drivers/media/video/cx88/cx88-cards.c | 24 - drivers/media/video/uvc/uvc_v4l2.c | 9 drivers/media/video/uvc/uvcvideo.h | 1 drivers/media/video/v4l2-ioctl.c | 4 drivers/mmc/core/mmc.c | 2 drivers/mmc/host/sdhci.c | 6 drivers/mtd/mtd_blkdevs.c | 3 drivers/mtd/mtdoops.c | 5 drivers/mtd/tests/mtd_stresstest.c | 7 drivers/mtd/ubi/cdev.c | 3 drivers/mtd/ubi/debug.h | 5 drivers/mtd/ubi/eba.c | 6 drivers/mtd/ubi/ubi.h | 2 drivers/mtd/ubi/vtbl.c | 2 drivers/mtd/ubi/wl.c | 12 drivers/net/usb/asix.c | 15 + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 5 drivers/net/wireless/ath/ath9k/calib.c | 1 drivers/net/wireless/ath/ath9k/mac.c | 5 drivers/net/wireless/ath/ath9k/main.c | 8 drivers/net/wireless/iwlegacy/iwl3945-base.c | 9 drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 3 drivers/net/wireless/rt2x00/rt2800pci.c | 28 -- drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 4 drivers/pci/msi.c | 10 drivers/pnp/quirks.c | 42 +++ drivers/rtc/interface.c | 4 drivers/scsi/mpt2sas/mpt2sas_base.c | 83 ++---- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 11 drivers/scsi/sd.c | 13 drivers/scsi/sym53c8xx_2/sym_glue.c | 4 drivers/target/target_core_cdb.c | 12 drivers/target/target_core_transport.c | 14 + drivers/xen/xenbus/xenbus_xs.c | 6 fs/aio.c | 11 fs/cifs/connect.c | 23 + fs/dcache.c | 78 ++--- fs/ext4/ioctl.c | 28 +- fs/ext4/super.c | 7 fs/nfs/blocklayout/blocklayout.c | 28 +- fs/nfs/blocklayout/extents.c | 11 fs/nfs/callback_proc.c | 2 fs/nfs/file.c | 4 fs/nfs/nfs4proc.c | 96 ++++--- fs/nfs/nfs4xdr.c | 31 +- fs/nfs/objlayout/objio_osd.c | 3 fs/nfs/objlayout/objlayout.c | 4 fs/nfs/pnfs.c | 12 fs/nfs/pnfs.h | 1 fs/nfs/super.c | 43 +-- fs/nfsd/export.c | 2 fs/nfsd/nfs4state.c | 17 + fs/notify/mark.c | 8 fs/proc/base.c | 145 ++-------- fs/proc/task_mmu.c | 3 fs/proc/uptime.c | 9 fs/ubifs/debug.h | 17 - fs/xfs/xfs_discard.c | 4 include/acpi/acpi_numa.h | 1 include/linux/blkdev.h | 3 include/linux/crash_dump.h | 1 include/linux/dcache.h | 1 include/linux/memcontrol.h | 6 include/linux/nfs_xdr.h | 5 include/linux/pci_regs.h | 2 include/linux/shmem_fs.h | 1 include/linux/sunrpc/svcsock.h | 2 include/linux/sunrpc/xdr.h | 2 include/linux/swap.h | 2 include/linux/videodev2.h | 1 include/media/tuner.h | 3 include/target/target_core_base.h | 1 include/xen/interface/io/xs_wire.h | 3 init/do_mounts.c | 35 ++ ipc/shm.c | 37 +- kernel/kprobes.c | 2 kernel/trace/ftrace.c | 27 -- kernel/tracepoint.c | 7 mm/filemap.c | 18 - mm/memcontrol.c | 44 +++ mm/page_alloc.c | 11 mm/shmem.c | 53 +++ mm/slub.c | 5 mm/vmscan.c | 118 ++------ net/mac80211/ieee80211_i.h | 13 net/mac80211/main.c | 58 ---- net/mac80211/offchannel.c | 68 ++--- net/mac80211/rx.c | 10 net/mac80211/scan.c | 77 +---- net/mac80211/tx.c | 3 net/mac80211/work.c | 77 ----- net/mac80211/wpa.c | 2 net/sunrpc/svc.c | 20 - net/sunrpc/svc_xprt.c | 53 ++- net/sunrpc/xdr.c | 3 scripts/kconfig/streamline_config.pl | 52 ++- scripts/recordmcount.h | 2 security/integrity/ima/ima_api.c | 4 security/integrity/ima/ima_queue.c | 17 - security/tomoyo/util.c | 6 sound/pci/hda/hda_intel.c | 1 sound/pci/hda/hda_local.h | 7 sound/pci/hda/hda_proc.c | 2 sound/pci/hda/patch_cirrus.c | 27 -- sound/pci/hda/patch_conexant.c | 2 sound/pci/hda/patch_sigmatel.c | 38 +- sound/pci/hda/patch_via.c | 5 sound/pci/ice1712/amp.c | 7 sound/pci/oxygen/xonar_wm87x6.c | 1 sound/usb/endpoint.c | 5 sound/usb/usx2y/usb_stream.c | 6 156 files changed, 1837 insertions(+), 1038 deletions(-)
Aaron Lu (1):
mmc: sdhci: Fix tuning timer incorrect setting when suspending host
Alex Deucher (1):
drm/radeon/kms: disable writeback on pre-R300 asics
Alex Williamson (1):
PCI: Fix PCI_EXP_TYPE_RC_EC value
Alexander Aring (1):
I2C: OMAP: correct SYSC register offset for OMAP4
Alexander Elbs (1):
mmc: sd: Fix SDR12 timing regression
Ananth N Mavinakayanahalli (1):
kprobes: initialize before using a hlist
Andy Adamson (2):
NFSv4.1: fix backchannel slotid off-by-one bug
NFSv4: include bitmap in nfsv4 get acl data
Artem Bityutskiy (4):
UBI: fix use-after-free on error path
UBI: fix debugging messages
UBIFS: fix debugging messages
UBIFS: make debugging messages light again
Ben Hutchings (1):
drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range
Benjamin Tissoires (5):
HID: multitouch: cleanup with eGalax PID definitions
HID: multitouch: add support for the MSI Windpad 110W
HID: hid-multitouch: add support for new Hanvon panels
HID: multitouch: add support of Atmel multitouch panels
HID: multitouch: add support for 3M 32"
Bhavesh Parekh (1):
UBI: fix missing scrub when there is a bit-flip
Bjorn Helgaas (3):
x86/PCI: amd: factor out MMCONFIG discovery
x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y
PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
Boaz Harrosh (2):
pnfs-obj: pNFS errors are communicated on iodata->pnfs_error
pnfs-obj: Must return layout on IO error
Brian Norris (1):
mtd: mtd_blkdevs: don't increase 'open' count on error path
Chase Douglas (1):
HID: bump maximum global item tag report size to 96 bytes
Chris Bagwell (1):
HID: hid-multitouch - add another eGalax id
Chuck Lever (1):
NFS: Retry mounting NFSROOT
Clemens Ladisch (1):
ALSA: virtuoso: Xonar DS: fix polarity of front output
Cliff Wickman (3):
x86/UV2: Fix new UV2 hardware by using native UV2 broadcast mode x86/UV2: Fix BAU destination timeout initialization x86/UV2: Work around BAU bug
Dan Carpenter (1):
V4L/DVB: v4l2-ioctl: integer overflow in video_usercopy()
Dan Rosenberg (1):
score: fix off-by-one index into syscall table
Dave Chinner (2):
dcache: use a dispose list in select_parent
xfs: fix endian conversion issue in discard code
David Daney (1):
recordmcount: Fix handling of elf64 big-endian objects.
David Henningsson (4):
ALSA: HDA: Fix master control for Cirrus Logic 421X
ALSA: HDA: Fix automute for Cirrus Logic 421x
ALSA: HDA: Use LPIB position fix for Macbook Pro 7,1
ALSA: HDA: Fix internal microphone on Dell Studio 16 XPS 1645
David Herrmann (1):
HID: wiimote: Select INPUT_FF_MEMLESS
Djalal Harouni (1):
ext4: add missing ext4_resize_end on error paths
Eric Dumazet (1):
slub: fix a possible memleak in __slab_alloc()
Eric W. Biederman (1):
PCI: msi: Disable msi interrupts when we initialize a pci device
Fabio Estevam (1):
include/linux/crash_dump.h needs elf.h
Felix Fietkau (1):
ath9k_hw: fix interpretation of the rx KeyMiss flag
Gary Hade (1):
x86/PCI: Ignore CPU non-addressable _CRS reserved memory resources
Girish K S (1):
mmc: core: Fix voltage select in DDR mode
Gleb Natapov (1):
Unused iocbs in a batch should not be accounted as active.
Greg Kroah-Hartman (1):
Linux 3.2.2
Haogang Chen (1):
uvcvideo: Fix integer overflow in uvc_ioctl_ctrl_map()
Hugh Dickins (2):
SHM_UNLOCK: fix long unpreemptible section
SHM_UNLOCK: fix Unevictable pages stranded after swap
Ian Campbell (1):
xen/xenbus: Reject replies with payload > XENSTORE_PAYLOAD_MAX.
J. Bruce Fields (4):
svcrpc: fix double-free on shutdown of nfsd after changing pool mode
svcrpc: destroy server sockets all at once
svcrpc: avoid memory-corruption on pool shutdown
nfsd4: fix lockowner matching
Jack Steiner (1):
x86, UV: Update Boot messages for SGI UV2 platform
Jean Delvare (1):
i2c: Fix error value returned by several bus drivers
Jeff Layton (2):
nfs: fix regression in handling of context= option in NFSv4
cifs: lower default wsize when unix extensions are not used
Jiri Olsa (1):
ftrace: Fix unregister ftrace_ops accounting
Johannes Berg (1):
mac80211: revert on-channel work optimisations
Jussi Kivilinna (2):
asix: fix setting custom MAC address on Asix 88178 devices
asix: fix setting custom MAC address on Asix 88772 devices
KAMEZAWA Hiroyuki (1):
memcg: add mem_cgroup_replace_page_cache() to fix LRU issue
Karsten Wiese (1):
ALSA: snd-usb-us122l: Delete calls to preempt_disable
Kurt Garloff (3):
ACPI: Store SRAT table revision
ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64) ACPI, ia64: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64)
Larry Finger (1):
rtl8192se: Fix BUG caused by failure to check skb allocation
Lin Ming (2):
ACPICA: Put back the call to acpi_os_validate_address
ACPI: processor: fix acpi_get_cpuid for UP processor
Linus Torvalds (1):
proc: clean up and fix /proc/<pid>/mem handling
Ludwig Nussel (1):
x86: Fix mmap random address range
Marek Vasut (1):
HID: multitouch: Add egalax ID for Acer Iconia W500
Martin Schwidefsky (1):
fix cputime overflow in uptime_proc_show
Masatoshi Hoshikawa (1):
HID: hid-multitouch: add support 9 new Xiroku devices
Michal Hocko (1):
mm: fix NULL ptr dereference in __count_immobile_pages
Michel Dänzer (1):
radeon: Fix disabling PCI bus mastering on big endian hosts.
Miklos Szeredi (2):
fsnotify: don't BUG in fsnotify_destroy_mark() fix shrink_dcache_parent() livelock
Miroslav Slugen (3):
cx23885-dvb: check if dvb_attach() succeded
cx88: fix: don't duplicate xc4000 entry for radio
tuner: Fix numberspace conflict between xc4000 and pti 5nf05 tuners
NeilBrown (2):
NFS - fix recent breakage to NFS error handling. md/raid1: perform bad-block tests for WriteMostly devices too.
Paolo Bonzini (3):
block: add and use scsi_blk_cmd_ioctl
block: fail SCSI passthrough ioctls on partition devices
dm: do not forward ioctls from logical volumes to the underlying device
Pavel Hofman (1):
ALSA: ice1724 - Check for ac97 to avoid kernel oops
Peng Tao (3):
pnfsblock: acquire im_lock in _preload_range
pnfsblock: don't spinlock when freeing block_dev
pnfsblock: limit bio page count
Rafał Miłecki (2):
drm/radeon/kms: workaround invalid AVI infoframe checksum issue
bcma: invalidate the mapped core over suspend/resume
Rajkumar Manoharan (1):
ath9k: Fix regression in channelwidth switch at the same channel
Richard Weinberger (2):
UBI: fix nameless volumes handling
UBI: make vid_hdr non-static
Roberto Sassu (2):
ima: free duplicate measurement memory
ima: fix invalid memory reference
Roland Dreier (2):
target: Set response format in INQUIRY response
target: Set additional sense length field in sense data
Roman Tereshonkov (2):
mtdoops: fix the oops_page_used array size
mtd: mtdoops: skip reading initially bad blocks
Sasha Levin (1):
nfsd: Fix oops when parsing a 0 length export
Shaohua Li (1):
intel_idle: fix API misuse
Stanislaw Gruszka (3):
mac80211: fix rx->key NULL pointer dereference in promiscuous mode
rt2800pci: fix spurious interrupts generation
iwlegacy: 3945: fix hw passive scan on radar channels
Steven Rostedt (3):
kconfig/streamline-config.pl: Simplify backslash line concatination kconfig/streamline-config.pl: Fix parsing Makefile with variables tracepoints/module: Fix disabling tracepoints with taint CRAP or OOT
Stratos Psomadakis (1):
sym53c8xx: Fix NULL pointer dereference in slave_destroy
Takashi Iwai (5):
ALSA: usb-audio - Avoid flood of frame-active debug messages
ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
Tetsuo Handa (1):
TOMOYO: Accept \000 as a valid character.
Thomas Renninger (1):
intel idle: Make idle driver more robust
Toshiharu Okada (1):
i2c-eg20t: modified the setting of transfer rate.
Wey-Yi Guy (1):
iwlagn: check for SMPS mode
Will Deacon (1):
proc: clear_refs: do not clear reserved pages
Wolfram Sang (1):
mtd: tests: stresstest: bail out if device has not enough eraseblocks
Xi Wang (1):
ext4: fix undefined behavior in ext4_fill_flex_info()
[email protected] (2):
SCSI: mpt2sas: Release spinlock for the raid device list before blocking it
SCSI: mpt2sas : Fix for memory allocation error for large host credits
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/ia64/kernel/acpi.c +6 -4
@@ -429,22 +429,24 @@ static u32 __devinitdata pxm_flag[PXM_FLAG_LEN];static struct acpi_table_slit __initdata *slit_table;cpumask_t early_cpu_possible_map =CPU_MASK_NONE ; -static int get_processor_proximity_domain (struct acpi_srat_cpu_affinity *pa) +static int __init +get_processor_proximity_domain (struct acpi_srat_cpu_affinity *pa) {int pxm; pxm = pa->proximity_domain_lo; -if (ia64_platform_is ("sn2" )) +if (ia64_platform_is ("sn2" ) || acpi_srat_revision >=2 ) pxm += pa->proximity_domain_hi[0 ] <<8 ;return pxm; } -static int get_memory_proximity_domain (struct acpi_srat_mem_affinity *ma) +static int __init +get_memory_proximity_domain (struct acpi_srat_mem_affinity *ma) {int pxm; pxm = ma->proximity_domain; -if (!ia64_platform_is ("sn2" )) +if (!ia64_platform_is ("sn2" ) && acpi_srat_revision <=1 ) pxm &=0xff ;return pxm;
arch/score/kernel/entry.S +1 -1
@@ -408,7 +408,7 @@ ENTRY(handle_sys) sw r9, [r0, PT_EPC] cmpi.c r27, __NR_syscalls # check syscall number - bgtu illegal_syscall + bgeu illegal_syscall slli r8, r27, 2 # get syscall routine la r11, sys_call_table
arch/x86/include/asm/amd_nb.h +2 -0
@@ -1,6 +1,7 @@#ifndef _ASM_X86_AMD_NB_H#define _ASM_X86_AMD_NB_H +#include <linux/ioport.h> #include <linux/pci.h> struct amd_nb_bus_dev_range {
@@ -13,6 +14,7 @@ extern const struct pci_device_id amd_nb_misc_ids[];extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];extern bool early_is_amd_nb (u32 value); +extern struct resource *amd_get_mmconfig_range (struct resource *res);extern int amd_cache_northbridges (void );extern void amd_flush_garts (void );extern int amd_numa_init (void );
arch/x86/include/asm/uv/uv_bau.h +98 -8
180 lines not on this page · raw message
arch/x86/kernel/amd_nb.c +31 -0
@@ -119,6 +119,37 @@ bool __init early_is_amd_nb(u32 device)return false; } +struct resource *amd_get_mmconfig_range (struct resource *res) +{ +u32 address; +u64 base, msr; +unsigned segn_busn_bits; + +if (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) +return NULL ; + +/* assume all cpus from fam10h have mmconfig */ +if (boot_cpu_data.x86 <0x10 ) +return NULL ; + + address =MSR_FAM10H_MMIO_CONF_BASE ; +rdmsrl (address, msr); + +/* mmconfig is not enabled */ +if (!(msr &FAM10H_MMIO_CONF_ENABLE )) +return NULL ; + + base = msr & (FAM10H_MMIO_CONF_BASE_MASK <<FAM10H_MMIO_CONF_BASE_SHIFT ); + + segn_busn_bits = (msr >>FAM10H_MMIO_CONF_BUSRANGE_SHIFT ) & +FAM10H_MMIO_CONF_BUSRANGE_MASK ; + + res->flags =IORESOURCE_MEM ; + res->start = base; + res->end = base + (1ULL <<(segn_busn_bits +20 )) -1 ; +return res; +} +int amd_get_subcaches (int cpu) {struct pci_dev *link =node_to_amd_nb (amd_get_nb_id (cpu))->link;
arch/x86/kernel/apic/x2apic_uv_x.c +6 -1
@@ -769,7 +769,12 @@ void __init uv_system_init(void)for (i =0 ; i <UVH_NODE_PRESENT_TABLE_DEPTH ; i++) uv_possible_blades +=hweight64 (uv_read_local_mmr (UVH_NODE_PRESENT_TABLE + i *8 )); -printk (KERN_DEBUG "UV: Found %d blades\n" ,uv_num_possible_blades ()); + +/* uv_num_possible_blades() is really the hub count */ +printk (KERN_INFO "UV: Found %d blades, %d hubs\n" , +is_uv1_hub () ?uv_num_possible_blades () : + (uv_num_possible_blades () +1 ) /2 , +uv_num_possible_blades ()); bytes =sizeof (struct uv_blade_info ) *uv_num_possible_blades (); uv_blade_info =kzalloc (bytes,GFP_KERNEL );
arch/x86/mm/mmap.c +2 -2
@@ -75,9 +75,9 @@ static unsigned long mmap_rnd(void)*/ if (current->flags &PF_RANDOMIZE ) {if (mmap_is_ia32 ()) - rnd = (long )get_random_int () % (1 <<8 ); + rnd =get_random_int () % (1 <<8 );else - rnd = (long )(get_random_int () % (1 <<28 )); + rnd =get_random_int () % (1 <<28 ); }return rnd <<PAGE_SHIFT ; }
arch/x86/mm/srat.c +4 -0
@@ -104,6 +104,8 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)if ((pa->flags &ACPI_SRAT_CPU_ENABLED ) ==0 )return ; pxm = pa->proximity_domain_lo; +if (acpi_srat_revision >=2 ) + pxm |= *((unsigned int *)pa->proximity_domain_hi) <<8 ; node =setup_node (pxm);if (node <0 ) {printk (KERN_ERR "SRAT: Too many proximity domains %x\n" , pxm);
@@ -155,6 +157,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) start = ma->base_address; end = start + ma->length; pxm = ma->proximity_domain; +if (acpi_srat_revision <=1 ) + pxm &=0xff ; node =setup_node (pxm);if (node <0 ) {printk (KERN_ERR "SRAT: Too many proximity domains.\n" );
arch/x86/pci/Makefile +2 -1
@@ -18,8 +18,9 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o obj-$(CONFIG_X86_MRST) += mrst.o obj-y += common.o early.o -obj-y += amd_bus.o bus_numa.o +obj-y += bus_numa.o +obj-$(CONFIG_AMD_NB) += amd_bus.o obj-$(CONFIG_PCI_CNB20LE_QUIRK) += broadcom_bus.o ifeq ($(CONFIG_PCI_DEBUG),y)
arch/x86/pci/acpi.c +16 -2
@@ -149,7 +149,7 @@ setup_resource(struct acpi_resource *acpi_res, void *data)struct acpi_resource_address64 addr;acpi_status status;unsigned long flags; -u64 start, end; +u64 start, orig_end, end; status =resource_to_addr (acpi_res, &addr);if (!ACPI_SUCCESS (status))
@@ -165,7 +165,21 @@ setup_resource(struct acpi_resource *acpi_res, void *data)return AE_OK ; start = addr.minimum + addr.translation_offset; - end = addr.maximum + addr.translation_offset; + orig_end = end = addr.maximum + addr.translation_offset; + +/* Exclude non-addressable range or non-addressable portion of range */ + end =min (end, (u64 )iomem_resource.end); +if (end <= start) { +dev_info (&info->bridge->dev, +"host bridge window [%#llx-%#llx] " +"(ignored, not CPU addressable)\n" , start, orig_end); +return AE_OK ; + }else if (orig_end != end) { +dev_info (&info->bridge->dev, +"host bridge window [%#llx-%#llx] " +"([%#llx-%#llx] ignored, not CPU addressable)\n" , + start, orig_end, end +1 , orig_end); + } res = &info->res[info->res_num]; res->name = info->name;
arch/x86/pci/amd_bus.c +11 -31
63 lines not on this page · raw message
arch/x86/platform/uv/tlb_uv.c +308 -55
598 lines not on this page · raw message
block/scsi_ioctl.c +52 -0
64 lines not on this page · raw message
drivers/acpi/acpica/dsargs.c +24 -0
@@ -387,5 +387,29 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc) status =acpi_ds_execute_arguments (node, node->parent, extra_desc->extra.aml_length, extra_desc->extra.aml_start); +if (ACPI_FAILURE (status)) { +return_ACPI_STATUS (status); + } + +/* Validate the region address/length via the host OS */ + + status =acpi_os_validate_address (obj_desc->region.space_id, + obj_desc->region.address, + (acpi_size ) obj_desc->region.length, +acpi_ut_get_node_name (node)); + +if (ACPI_FAILURE (status)) { +/* +* Invalid address/length. We will emit an error message and mark +* the region as invalid, so that it will cause an additional error if +* it is ever used. Then return AE_OK. +*/ +ACPI_EXCEPTION ((AE_INFO , status, +"During address validation of OpRegion [%4.4s]" , + node->name.ascii)); + obj_desc->common.flags |=AOPOBJ_INVALID ; + status =AE_OK ; + } +return_ACPI_STATUS (status); }
drivers/acpi/numa.c +6 -0
@@ -45,6 +45,8 @@ static int pxm_to_node_map[MAX_PXM_DOMAINS]static int node_to_pxm_map[MAX_NUMNODES ] = { [0 ...MAX_NUMNODES -1 ] =PXM_INVAL }; +unsigned char acpi_srat_revision__initdata ; +int pxm_to_node (int pxm) {if (pxm <0 )
@@ -255,9 +257,13 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,static int __init acpi_parse_srat (struct acpi_table_header *table) { +struct acpi_table_srat *srat;if (!table)return -EINVAL ; + srat = (struct acpi_table_srat *)table; + acpi_srat_revision = srat->header.revision; +/* Real work done in acpi_table_parse_srat below. */ return 0 ;
drivers/acpi/processor_core.c +24 -2
@@ -173,8 +173,30 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) apic_id =map_mat_entry (handle, type, acpi_id);if (apic_id ==-1 ) apic_id =map_madt_entry (type, acpi_id); -if (apic_id ==-1 ) -return apic_id; +if (apic_id ==-1 ) { +/* +* On UP processor, there is no _MAT or MADT table. +* So above apic_id is always set to -1. +* +* BIOS may define multiple CPU handles even for UP processor. +* For example, +* +* Scope (_PR) +* { +* Processor (CPU0, 0x00, 0x00000410, 0x06) {} +* Processor (CPU1, 0x01, 0x00000410, 0x06) {} +* Processor (CPU2, 0x02, 0x00000410, 0x06) {} +* Processor (CPU3, 0x03, 0x00000410, 0x06) {} +* } +* +* Ignores apic_id and always return 0 for CPU0's handle. +* Return -1 for other CPU's handle. +*/ +if (acpi_id ==0 ) +return acpi_id; +else +return apic_id; + }#ifdef CONFIG_SMP for_each_possible_cpu (i) {
drivers/bcma/host_pci.c +3 -0
@@ -227,11 +227,14 @@ static void bcma_host_pci_remove(struct pci_dev *dev)#ifdef CONFIG_PM static int bcma_host_pci_suspend (struct pci_dev *dev,pm_message_t state) { +struct bcma_bus *bus =pci_get_drvdata (dev); +/* Host specific */ pci_save_state (dev);pci_disable_device (dev);pci_set_power_state (dev,pci_choose_state (dev, state)); + bus->mapped_core =NULL ;return 0 ; }
drivers/block/cciss.c +3 -3
@@ -1735,7 +1735,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,case CCISS_BIG_PASSTHRU :return cciss_bigpassthru (h, argp); -/* scsi_cmd_ioctl handles these, below, though some are not */ +/* scsi_cmd_blk_ioctl handles these, below, though some are not */ /* very meaningful for cciss. SG_IO is the main one people want. */ case SG_GET_VERSION_NUM :
@@ -1746,9 +1746,9 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,case SG_EMULATED_HOST :case SG_IO :case SCSI_IOCTL_SEND_COMMAND : -return scsi_cmd_ioctl (disk->queue, disk, mode, cmd, argp); +return scsi_cmd_blk_ioctl (bdev, mode, cmd, argp); -/* scsi_cmd_ioctl would normally handle these, below, but */ +/* scsi_cmd_blk_ioctl would normally handle these, below, but */ /* they aren't a good fit for cciss, as CD-ROMs are */ /* not supported, and we don't have any bus/target/lun */ /* which we present to the kernel. */
drivers/block/ub.c +1 -2
@@ -1744,12 +1744,11 @@ static int ub_bd_release(struct gendisk *disk, fmode_t mode)static int ub_bd_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg) { -struct gendisk *disk = bdev->bd_disk;void __user *usermem = (void __user *) arg;int ret;mutex_lock (&ub_mutex); - ret =scsi_cmd_ioctl (disk->queue, disk, mode, cmd, usermem); + ret =scsi_cmd_blk_ioctl (bdev, mode, cmd, usermem);mutex_unlock (&ub_mutex);return ret;
drivers/block/virtio_blk.c +2 -2
@@ -243,8 +243,8 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,if (!virtio_has_feature (vblk->vdev,VIRTIO_BLK_F_SCSI ))return -ENOTTY ; -return scsi_cmd_ioctl (disk->queue, disk, mode, cmd, - (void __user *)data); +return scsi_cmd_blk_ioctl (bdev, mode, cmd, + (void __user *)data); }/* We provide getgeo only to please some old bootloader/partitioning tools */
drivers/cdrom/cdrom.c +1 -2
@@ -2747,12 +2747,11 @@ int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, {void __user *argp = (void __user *)arg;int ret; -struct gendisk *disk = bdev->bd_disk;/* * Try the generic SCSI command ioctl's first. */ - ret =scsi_cmd_ioctl (disk->queue, disk, mode, cmd, argp); + ret =scsi_cmd_blk_ioctl (bdev, mode, cmd, argp);if (ret != -ENOTTY )return ret;
drivers/gpu/drm/radeon/r100.c +3 -2
@@ -2177,6 +2177,7 @@ bool r100_gpu_is_lockup(struct radeon_device *rdev)void r100_bm_disable (struct radeon_device *rdev) {u32 tmp; +u16 tmp16;/* disable bus mastering */ tmp =RREG32 (R_000030_BUS_CNTL );
@@ -2187,8 +2188,8 @@ void r100_bm_disable(struct radeon_device *rdev)WREG32 (R_000030_BUS_CNTL , (tmp &0xFFFFFFFF ) |0x00000040 ); tmp =RREG32 (RADEON_BUS_CNTL );mdelay (1 ); -pci_read_config_word (rdev->pdev,0x4 , (u16 *)&tmp); -pci_write_config_word (rdev->pdev,0x4 , tmp &0xFFFB ); +pci_read_config_word (rdev->pdev,0x4 , &tmp16); +pci_write_config_word (rdev->pdev,0x4 , tmp16 &0xFFFB );mdelay (1 ); }
drivers/gpu/drm/radeon/r600_hdmi.c +7 -0
@@ -196,6 +196,13 @@ static void r600_hdmi_videoinfoframe( frame[0xD ] = (right_bar >>8 );r600_hdmi_infoframe_checksum (0x82 ,0x02 ,0x0D , frame); +/* Our header values (type, version, length) should be alright, Intel +* is using the same. Checksum function also seems to be OK, it works +* fine for audio infoframe. However calculated value is always lower +* by 2 in comparison to fglrx. It breaks displaying anything in case +* of TVs that strictly check the checksum. Hack it manually here to +* workaround this issue. */ + frame[0x0 ] +=2 ;WREG32 (offset+R600_HDMI_VIDEOINFOFRAME_0 , frame[0x0 ] | (frame[0x1 ] <<8 ) | (frame[0x2 ] <<16 ) | (frame[0x3 ] <<24 ));
drivers/gpu/drm/radeon/radeon_device.c +4 -1
@@ -224,8 +224,11 @@ int radeon_wb_init(struct radeon_device *rdev)if (radeon_no_wb ==1 ) rdev->wb.enabled = false;else { -/* often unreliable on AGP */ if (rdev->flags &RADEON_IS_AGP ) { +/* often unreliable on AGP */ + rdev->wb.enabled = false; + }else if (rdev->family <CHIP_R300 ) { +/* often unreliable on pre-r300 */ rdev->wb.enabled = false; }else { rdev->wb.enabled = true;
drivers/gpu/drm/radeon/rs600.c +2 -2
@@ -324,10 +324,10 @@ void rs600_hpd_fini(struct radeon_device *rdev)void rs600_bm_disable (struct radeon_device *rdev) { -u32 tmp; +u16 tmp;/* disable bus mastering */ -pci_read_config_word (rdev->pdev,0x4 , (u16 *)&tmp); +pci_read_config_word (rdev->pdev,0x4 , &tmp);pci_write_config_word (rdev->pdev,0x4 , tmp &0xFFFB );mdelay (1 ); }
drivers/hid/Kconfig +3 -0
@@ -335,6 +335,7 @@ config HID_MULTITOUCH Say Y here if you have one of the following devices: - 3M PCT touch screens - ActionStar dual touch panels + - Atmel panels - Cando dual touch panels - Chunghwa panels - CVTouch panels
@@ -355,6 +356,7 @@ config HID_MULTITOUCH - Touch International Panels - Unitec Panels - XAT optical touch panels + - Xiroku optical touch panels If unsure, say N.
@@ -620,6 +622,7 @@ config HID_WIIMOTE depends on BT_HIDP depends on LEDS_CLASS select POWER_SUPPLY + select INPUT_FF_MEMLESS ---help--- Support for the Nintendo Wii Remote bluetooth device.
drivers/hid/hid-core.c +18 -6
@@ -362,7 +362,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)case HID_GLOBAL_ITEM_TAG_REPORT_SIZE : parser->global.report_size =item_udata (item); -if (parser->global.report_size >32 ) { +if (parser->global.report_size >96 ) {dbg_hid ("invalid report_size %d\n" , parser->global.report_size);return -1 ;
@@ -1404,11 +1404,13 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_TRUETOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) }, { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) }, - { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) }, - { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) }, - { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, - { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, - { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) }, { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
@@ -1423,6 +1425,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) }, + { HID_USB_DEVICE(USB_VENDOR_ID_HANVON_ALT, USB_DEVICE_ID_HANVON_ALT_MULTITOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6650) }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) }, { HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, USB_DEVICE_ID_ILITEK_MULTITOUCH) },
@@ -1549,6 +1552,15 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_XAT, USB_DEVICE_ID_XAT_CSR) }, + { HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_SPX) }, + { HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_MPX) }, + { HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR) }, + { HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_SPX1) }, + { HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_MPX1) }, + { HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR1) }, + { HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_SPX2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_MPX2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR2) }, { HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) }, { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) }, { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
drivers/hid/hid-ids.h +26 -5
@@ -21,6 +21,7 @@#define USB_VENDOR_ID_3M 0x0596#define USB_DEVICE_ID_3M1968 0x0500#define USB_DEVICE_ID_3M2256 0x0502 +#define USB_DEVICE_ID_3M3266 0x0506#define USB_VENDOR_ID_A4TECH 0x09da#define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006
@@ -145,6 +146,9 @@#define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205#define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208 +#define USB_VENDOR_ID_ATMEL 0x03eb +#define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c +#define USB_VENDOR_ID_AVERMEDIA 0x07ca#define USB_DEVICE_ID_AVER_FM_MR800 0xb800
@@ -230,11 +234,14 @@#define USB_VENDOR_ID_DWAV 0x0eef#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1 0x720c -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1 -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D 0x480d +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E 0x480e +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B 0x726b +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1 0x72a1 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA 0x72fa +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302 0x7302 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001#define USB_VENDOR_ID_ELECOM 0x056e#define USB_DEVICE_ID_ELECOM_BM084 0x0061
@@ -356,6 +363,9 @@#define USB_VENDOR_ID_HANVON 0x20b3#define USB_DEVICE_ID_HANVON_MULTITOUCH 0x0a18 +#define USB_VENDOR_ID_HANVON_ALT 0x22ed +#define USB_DEVICE_ID_HANVON_ALT_MULTITOUCH 0x1010 +#define USB_VENDOR_ID_HAPP 0x078b#define USB_DEVICE_ID_UGCI_DRIVING 0x0010#define USB_DEVICE_ID_UGCI_FLYING 0x0020
@@ -707,6 +717,17 @@#define USB_VENDOR_ID_XAT 0x2505#define USB_DEVICE_ID_XAT_CSR 0x0220 +#define USB_VENDOR_ID_XIROKU 0x1477 +#define USB_DEVICE_ID_XIROKU_SPX 0x1006 +#define USB_DEVICE_ID_XIROKU_MPX 0x1007 +#define USB_DEVICE_ID_XIROKU_CSR 0x100e +#define USB_DEVICE_ID_XIROKU_SPX1 0x1021 +#define USB_DEVICE_ID_XIROKU_CSR1 0x1022 +#define USB_DEVICE_ID_XIROKU_MPX1 0x1023 +#define USB_DEVICE_ID_XIROKU_SPX2 0x1024 +#define USB_DEVICE_ID_XIROKU_CSR2 0x1025 +#define USB_DEVICE_ID_XIROKU_MPX2 0x1026 +#define USB_VENDOR_ID_YEALINK 0x6993#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001
drivers/hid/hid-multitouch.c +61 -10
108 lines not on this page · raw message
drivers/i2c/busses/i2c-ali1535.c +7 -4
@@ -140,7 +140,7 @@ static unsigned short ali1535_smba;defined to make the transition easier. */ static int __devinit ali1535_setup (struct pci_dev *dev) { -int retval = -ENODEV ; +int retval;unsigned char temp;/* Check the following things:
@@ -155,6 +155,7 @@ static int __devinit ali1535_setup(struct pci_dev *dev)if (ali1535_smba ==0 ) {dev_warn (&dev->dev,"ALI1535_smb region uninitialized - upgrade BIOS?\n" ); + retval = -ENODEV ; goto exit; }
@@ -167,6 +168,7 @@ static int __devinit ali1535_setup(struct pci_dev *dev) ali1535_driver.name)) {dev_err (&dev->dev,"ALI1535_smb region 0x%x already in use!\n" , ali1535_smba); + retval = -EBUSY ; goto exit; }
@@ -174,6 +176,7 @@ static int __devinit ali1535_setup(struct pci_dev *dev)pci_read_config_byte (dev,SMBCFG , &temp);if ((temp &ALI1535_SMBIO_EN ) ==0 ) {dev_err (&dev->dev,"SMB device not enabled - upgrade BIOS?\n" ); + retval = -ENODEV ; goto exit_free; }
@@ -181,6 +184,7 @@ static int __devinit ali1535_setup(struct pci_dev *dev)pci_read_config_byte (dev,SMBHSTCFG , &temp);if ((temp &1 ) ==0 ) {dev_err (&dev->dev,"SMBus controller not enabled - upgrade BIOS?\n" ); + retval = -ENODEV ; goto exit_free; }
@@ -198,12 +202,11 @@ static int __devinit ali1535_setup(struct pci_dev *dev)dev_dbg (&dev->dev,"SMBREV = 0x%X\n" , temp);dev_dbg (&dev->dev,"ALI1535_smba = 0x%X\n" , ali1535_smba); - retval =0 ; -exit: -return retval; +return 0 ; exit_free:release_region (ali1535_smba,ALI1535_SMB_IOSIZE ); +exit:return retval; }
drivers/i2c/busses/i2c-eg20t.c +1 -1
@@ -243,7 +243,7 @@ static void pch_i2c_init(struct i2c_algo_pch_data *adap)if (pch_clk >PCH_MAX_CLK ) pch_clk =62500 ; - pch_i2cbc = (pch_clk + (pch_i2c_speed *4 )) / pch_i2c_speed *8 ; + pch_i2cbc = (pch_clk + (pch_i2c_speed *4 )) / (pch_i2c_speed *8 );/* Set transfer speed in I2CBC */ iowrite32 (pch_i2cbc, p +PCH_I2CBC );
drivers/i2c/busses/i2c-nforce2.c +1 -1
@@ -356,7 +356,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar, error =acpi_check_region (smbus->base, smbus->size, nforce2_driver.name);if (error) -return -1 ; +return error;if (!request_region (smbus->base, smbus->size, nforce2_driver.name)) { dev_err(&smbus->adapter.dev, "Error requesting region %02x .. %02X for %s\n",
drivers/i2c/busses/i2c-omap.c +1 -1
@@ -235,7 +235,7 @@ static const u8 reg_map_ip_v2[] = { [OMAP_I2C_BUF_REG] = 0x94, [OMAP_I2C_CNT_REG] = 0x98, [OMAP_I2C_DATA_REG] = 0x9c, - [OMAP_I2C_SYSC_REG] = 0x20, + [OMAP_I2C_SYSC_REG] = 0x10, [OMAP_I2C_CON_REG] = 0xa4, [OMAP_I2C_OA_REG] = 0xa8, [OMAP_I2C_SA_REG] = 0xac,
drivers/i2c/busses/i2c-sis5595.c +2 -2
@@ -147,7 +147,7 @@ static int __devinit sis5595_setup(struct pci_dev *SIS5595_dev)u16 a;u8 val;int *i; -int retval = -ENODEV ; +int retval;/* Look for imposters */ for (i = blacklist; *i !=0 ; i++) {
@@ -223,7 +223,7 @@ static int __devinit sis5595_setup(struct pci_dev *SIS5595_dev) error:release_region (sis5595_base +SMB_INDEX ,2 ); -return retval; +return -ENODEV ; }static int sis5595_transaction (struct i2c_adapter *adap)
drivers/i2c/busses/i2c-sis630.c +5 -1
@@ -393,7 +393,7 @@ static int __devinit sis630_setup(struct pci_dev *sis630_dev) {unsigned char b;struct pci_dev *dummy =NULL ; -int retval = -ENODEV , i; +int retval, i;/* check for supported SiS devices */ for (i=0 ; supported[i] >0 ; i++) {
@@ -418,18 +418,21 @@ static int __devinit sis630_setup(struct pci_dev *sis630_dev)*/ if (pci_read_config_byte (sis630_dev,SIS630_BIOS_CTL_REG ,&b)) {dev_err (&sis630_dev->dev,"Error: Can't read bios ctl reg\n" ); + retval = -ENODEV ; goto exit; }/* if ACPI already enabled , do nothing */ if (!(b &0x80 ) &&pci_write_config_byte (sis630_dev,SIS630_BIOS_CTL_REG , b |0x80 )) {dev_err (&sis630_dev->dev,"Error: Can't enable ACPI\n" ); + retval = -ENODEV ; goto exit; }/* Determine the ACPI base address */ if (pci_read_config_word (sis630_dev,SIS630_ACPI_BASE_REG ,&acpi_base)) {dev_err (&sis630_dev->dev,"Error: Can't determine ACPI base address\n" ); + retval = -ENODEV ; goto exit; }
@@ -445,6 +448,7 @@ static int __devinit sis630_setup(struct pci_dev *sis630_dev) sis630_driver.name)) {dev_err (&sis630_dev->dev,"SMBus registers 0x%04x-0x%04x already " "in use!\n" , acpi_base +SMB_STS , acpi_base +SMB_SAA ); + retval = -EBUSY ; goto exit; }
drivers/i2c/busses/i2c-viapro.c +5 -2
@@ -324,7 +324,7 @@ static int __devinit vt596_probe(struct pci_dev *pdev, const struct pci_device_id *id) {unsigned char temp; -int error = -ENODEV ; +int error;/* Determine the address of the SMBus areas */ if (force_addr) {
@@ -390,6 +390,7 @@ found:dev_err (&pdev->dev,"SMBUS: Error: Host SMBus " "controller not enabled! - upgrade BIOS or " "use force=1\n" ); + error = -ENODEV ; goto release_region; } }
@@ -422,9 +423,11 @@ found: "SMBus Via Pro adapter at %04x", vt596_smba); vt596_pdev =pci_dev_get (pdev); -if (i2c_add_adapter (&vt596_adapter)) { + error =i2c_add_adapter (&vt596_adapter); +if (error) {pci_dev_put (vt596_pdev); vt596_pdev =NULL ; + goto release_region; }/* Always return failure here. This is to allow other drivers to bind
drivers/ide/ide-floppy_ioctl.c +1 -2
@@ -292,8 +292,7 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct block_device *bdev,* and CDROM_SEND_PACKET (legacy) ioctls */ if (cmd !=CDROM_SEND_PACKET && cmd !=SCSI_IOCTL_SEND_COMMAND ) - err =scsi_cmd_ioctl (bdev->bd_disk->queue, bdev->bd_disk, - mode, cmd, argp); + err =scsi_cmd_blk_ioctl (bdev, mode, cmd, argp);if (err == -ENOTTY ) err =generic_ide_ioctl (drive, bdev, cmd, arg);
drivers/idle/intel_idle.c +5 -4
@@ -348,7 +348,8 @@ static int intel_idle_probe(void)cpuid (CPUID_MWAIT_LEAF , &eax, &ebx, &ecx, &mwait_substates);if (!(ecx &CPUID5_ECX_EXTENSIONS_SUPPORTED ) || - !(ecx &CPUID5_ECX_INTERRUPT_BREAK )) + !(ecx &CPUID5_ECX_INTERRUPT_BREAK ) || + !mwait_substates)return -ENODEV ;pr_debug (PREFIX "MWAIT substates: 0x%x\n" , mwait_substates);
@@ -394,7 +395,7 @@ static int intel_idle_probe(void)if (boot_cpu_has (X86_FEATURE_ARAT ))/* Always Reliable APIC Timer */ lapic_timer_reliable_states =LAPIC_TIMER_ALWAYS_RELIABLE ;else { -smp_call_function (__setup_broadcast_timer, (void *)true,1 ); +on_each_cpu (__setup_broadcast_timer, (void *)true,1 );register_cpu_notifier (&setup_broadcast_notifier); }
@@ -471,7 +472,7 @@ static int intel_idle_cpuidle_driver_init(void) }if (auto_demotion_disable_flags) -smp_call_function (auto_demotion_disable,NULL ,1 ); +on_each_cpu (auto_demotion_disable,NULL ,1 );return 0 ; }
@@ -568,7 +569,7 @@ static void __exit intel_idle_exit(void)cpuidle_unregister_driver (&intel_idle_driver);if (lapic_timer_reliable_states !=LAPIC_TIMER_ALWAYS_RELIABLE ) { -smp_call_function (__setup_broadcast_timer, (void *)false,1 ); +on_each_cpu (__setup_broadcast_timer, (void *)false,1 );unregister_cpu_notifier (&setup_broadcast_notifier); }
drivers/md/dm-flakey.c +10 -1
@@ -368,8 +368,17 @@ static int flakey_status(struct dm_target *ti, status_type_t type,static int flakey_ioctl (struct dm_target *ti,unsigned int cmd,unsigned long arg) {struct flakey_c *fc = ti->private; +struct dm_dev *dev = fc->dev; +int r =0 ; -return __blkdev_driver_ioctl (fc->dev->bdev, fc->dev->mode, cmd, arg); +/* +* Only pass ioctls through if the device sizes match exactly. +*/ +if (fc->start || + ti->len !=i_size_read (dev->bdev->bd_inode) >>SECTOR_SHIFT ) + r =scsi_verify_blk_ioctl (NULL , cmd); + +return r ? :__blkdev_driver_ioctl (dev->bdev, dev->mode, cmd, arg); } static int flakey_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
drivers/md/dm-linear.c +11 -1
@@ -116,7 +116,17 @@ static int linear_ioctl(struct dm_target *ti, unsigned int cmd, unsigned long arg) {struct linear_c *lc = (struct linear_c *) ti->private; -return __blkdev_driver_ioctl (lc->dev->bdev, lc->dev->mode, cmd, arg); +struct dm_dev *dev = lc->dev; +int r =0 ; + +/* +* Only pass ioctls through if the device sizes match exactly. +*/ +if (lc->start || + ti->len !=i_size_read (dev->bdev->bd_inode) >>SECTOR_SHIFT ) + r =scsi_verify_blk_ioctl (NULL , cmd); + +return r ? :__blkdev_driver_ioctl (dev->bdev, dev->mode, cmd, arg); } static int linear_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
drivers/md/dm-mpath.c +6 -0
@@ -1520,6 +1520,12 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,spin_unlock_irqrestore (&m->lock, flags); +/* +* Only pass ioctls through if the device sizes match exactly. +*/ +if (!r && ti->len !=i_size_read (bdev->bd_inode) >>SECTOR_SHIFT ) + r =scsi_verify_blk_ioctl (NULL , cmd); +return r ? :__blkdev_driver_ioctl (bdev, mode, cmd, arg); }
drivers/md/raid1.c +10 -1
@@ -525,8 +525,17 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sectif (test_bit (WriteMostly, &rdev->flags)) {/* Don't balance among write-mostly, just * use the first as a last resort */ -if (best_disk <0 ) +if (best_disk <0 ) { +if (is_badblock (rdev, this_sector, sectors, + &first_bad, &bad_sectors)) { +if (first_bad < this_sector) +/* Cannot use this */ +continue ; + best_good_sectors = first_bad - this_sector; + }else + best_good_sectors = sectors; best_disk = disk; + }continue ; }/* This is a reasonable device to use. It might
drivers/media/video/cx23885/cx23885-dvb.c +5 -0
@@ -940,6 +940,11 @@ static int dvb_register(struct cx23885_tsport *port) fe =dvb_attach (xc4000_attach, fe0->dvb.frontend, &dev->i2c_bus[1 ].i2c_adap, &cfg); +if (!fe) { +printk (KERN_ERR "%s/2: xc4000 attach failed\n" , + dev->name); + goto frontend_detach; + } }break ;case CX23885_BOARD_TBS_6920 :
drivers/media/video/cx88/cx88-cards.c +12 -12
@@ -1573,8 +1573,8 @@ static const struct cx88_board cx88_boards[] = { .name = "Pinnacle Hybrid PCTV", .tuner_type = TUNER_XC2028, .tuner_addr = 0x61, - .radio_type = TUNER_XC2028, - .radio_addr = 0x61, + .radio_type = UNSET, + .radio_addr = ADDR_UNSET, .input = { { .type = CX88_VMUX_TELEVISION, .vmux = 0,
@@ -1611,8 +1611,8 @@ static const struct cx88_board cx88_boards[] = { .name = "Leadtek TV2000 XP Global", .tuner_type = TUNER_XC2028, .tuner_addr = 0x61, - .radio_type = TUNER_XC2028, - .radio_addr = 0x61, + .radio_type = UNSET, + .radio_addr = ADDR_UNSET, .input = { { .type = CX88_VMUX_TELEVISION, .vmux = 0,
@@ -2043,8 +2043,8 @@ static const struct cx88_board cx88_boards[] = { .name = "Terratec Cinergy HT PCI MKII", .tuner_type = TUNER_XC2028, .tuner_addr = 0x61, - .radio_type = TUNER_XC2028, - .radio_addr = 0x61, + .radio_type = UNSET, + .radio_addr = ADDR_UNSET, .input = { { .type = CX88_VMUX_TELEVISION, .vmux = 0,
@@ -2082,9 +2082,9 @@ static const struct cx88_board cx88_boards[] = { [CX88_BOARD_WINFAST_DTV1800H] = { .name = "Leadtek WinFast DTV1800 Hybrid", .tuner_type = TUNER_XC2028, - .radio_type = TUNER_XC2028, + .radio_type = UNSET, .tuner_addr = 0x61, - .radio_addr = 0x61, + .radio_addr = ADDR_UNSET,/* * GPIO setting *
@@ -2123,9 +2123,9 @@ static const struct cx88_board cx88_boards[] = { [CX88_BOARD_WINFAST_DTV1800H_XC4000] = { .name = "Leadtek WinFast DTV1800 H (XC4000)", .tuner_type = TUNER_XC4000, - .radio_type = TUNER_XC4000, + .radio_type = UNSET, .tuner_addr = 0x61, - .radio_addr = 0x61, + .radio_addr = ADDR_UNSET,/* * GPIO setting *
@@ -2164,9 +2164,9 @@ static const struct cx88_board cx88_boards[] = { [CX88_BOARD_WINFAST_DTV2000H_PLUS] = { .name = "Leadtek WinFast DTV2000 H PLUS", .tuner_type = TUNER_XC4000, - .radio_type = TUNER_XC4000, + .radio_type = UNSET, .tuner_addr = 0x61, - .radio_addr = 0x61, + .radio_addr = ADDR_UNSET,/* * GPIO * 2: 1: mute audio
drivers/media/video/uvc/uvc_v4l2.c +9 -0
@@ -58,6 +58,15 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,break ;case V4L2_CTRL_TYPE_MENU : +/* Prevent excessive memory consumption, as well as integer +* overflows. +*/ +if (xmap->menu_count ==0 || + xmap->menu_count >UVC_MAX_CONTROL_MENU_ENTRIES ) { + ret = -EINVAL ; + goto done; + } + size = xmap->menu_count *sizeof (*map->menu_info); map->menu_info =kmalloc (size,GFP_KERNEL );if (map->menu_info ==NULL ) {
drivers/media/video/uvc/uvcvideo.h +1 -0
@@ -113,6 +113,7 @@/* Maximum allowed number of control mappings per device */ #define UVC_MAX_CONTROL_MAPPINGS 1024 +#define UVC_MAX_CONTROL_MENU_ENTRIES 32/* Devices quirks */ #define UVC_QUIRK_STATUS_INTERVAL 0x00000001
drivers/media/video/v4l2-ioctl.c +4 -0
@@ -2226,6 +2226,10 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,struct v4l2_ext_controls *ctrls = parg;if (ctrls->count !=0 ) { +if (ctrls->count >V4L2_CID_MAX_CTRLS ) { + ret = -EINVAL ; +break ; + } *user_ptr = (void __user *)ctrls->controls; *kernel_ptr = (void *)&ctrls->controls; *array_size =sizeof (struct v4l2_ext_control )
drivers/mmc/core/mmc.c +1 -1
@@ -1048,7 +1048,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,* * WARNING: eMMC rules are NOT the same as SD DDR */ -if (ddr ==EXT_CSD_CARD_TYPE_DDR_1_2V ) { +if (ddr ==MMC_1_2V_DDR_MODE ) { err =mmc_set_signal_voltage (host,MMC_SIGNAL_VOLTAGE_120 ,0 );if (err)
drivers/mmc/host/sdhci.c +2 -4
@@ -1364,8 +1364,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)if ((ios->timing ==MMC_TIMING_UHS_SDR50 ) || (ios->timing ==MMC_TIMING_UHS_SDR104 ) || (ios->timing ==MMC_TIMING_UHS_DDR50 ) || - (ios->timing ==MMC_TIMING_UHS_SDR25 ) || - (ios->timing ==MMC_TIMING_UHS_SDR12 )) + (ios->timing ==MMC_TIMING_UHS_SDR25 )) ctrl |=SDHCI_CTRL_HISPD ; ctrl_2 =sdhci_readw (host,SDHCI_HOST_CONTROL2 );
@@ -2336,9 +2335,8 @@ int sdhci_suspend_host(struct sdhci_host *host)/* Disable tuning since we are suspending */ if (host->version >=SDHCI_SPEC_300 && host->tuning_count && host->tuning_mode ==SDHCI_TUNING_MODE_1 ) { +del_timer_sync (&host->tuning_timer); host->flags &= ~SDHCI_NEEDS_RETUNING ; -mod_timer (&host->tuning_timer, jiffies + - host->tuning_count *HZ ); } ret =mmc_suspend_host (host->mmc);
drivers/mtd/mtd_blkdevs.c +2 -1
@@ -215,7 +215,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)mutex_lock (&dev->lock); -if (dev->open++) +if (dev->open) goto unlock;kref_get (&dev->ref);
@@ -235,6 +235,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) goto error_release; unlock: + dev->open++;mutex_unlock (&dev->lock);blktrans_dev_put (dev);return ret;
drivers/mtd/mtdoops.c +4 -1
@@ -253,6 +253,9 @@ static void find_next_position(struct mtdoops_context *cxt)size_t retlen;for (page =0 ; page < cxt->oops_pages; page++) { +if (mtd->block_isbad && + mtd->block_isbad (mtd, page * record_size)) +continue ;/* Assume the page is used */ mark_page_used (cxt, page); ret = mtd->read(mtd, page * record_size, MTDOOPS_HEADER_SIZE,
@@ -369,7 +372,7 @@ static void mtdoops_notify_add(struct mtd_info *mtd)/* oops_page_used is a bit field */ cxt->oops_page_used =vmalloc (DIV_ROUND_UP (mtdoops_pages, -BITS_PER_LONG )); +BITS_PER_LONG ) *sizeof (unsigned long ));if (!cxt->oops_page_used) {printk (KERN_ERR "mtdoops: could not allocate page array\n" );return ;
drivers/mtd/tests/mtd_stresstest.c +7 -0
@@ -284,6 +284,12 @@ static int __init mtd_stresstest_init(void) (unsigned long long )mtd->size, mtd->erasesize, pgsize, ebcnt, pgcnt, mtd->oobsize); +if (ebcnt <2 ) { +printk (PRINT_PREF "error: need at least 2 eraseblocks\n" ); + err = -ENOSPC ; + goto out_put_mtd; + } +/* Read or write up 2 eraseblocks at a time */ bufsize = mtd->erasesize *2 ;
@@ -322,6 +328,7 @@ out:kfree (bbt);vfree (writebuf);vfree (readbuf); +out_put_mtd:put_mtd_device (mtd);if (err)printk (PRINT_PREF "error %d occurred\n" , err);
drivers/mtd/ubi/cdev.c +3 -0
@@ -632,6 +632,9 @@ static int verify_mkvol_req(const struct ubi_device *ubi,if (req->alignment !=1 && n) goto bad; +if (!req->name[0 ] || !req->name_len) + goto bad; +if (req->name_len >UBI_VOL_NAME_MAX ) { err = -ENAMETOOLONG ; goto bad;
drivers/mtd/ubi/debug.h +4 -1
@@ -43,7 +43,10 @@ pr_debug("UBI DBG " type ": " fmt "\n", ##__VA_ARGS__) /* Just a debugging messages not related to any specific UBI subsystem */ -#define dbg_msg (fmt, ...) ubi_dbg_msg("msg", fmt, ##__VA_ARGS__) +#define dbg_msg (fmt, ...) \ + printk(KERN_DEBUG "UBI DBG (pid %d): %s: " fmt "\n", \ + current->pid, __func__, ##__VA_ARGS__) +/* General debugging messages */ #define dbg_gen (fmt, ...) ubi_dbg_msg("gen", fmt, ##__VA_ARGS__)/* Messages from the eraseblock association sub-system */
drivers/mtd/ubi/eba.c +4 -2
@@ -1028,12 +1028,14 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,* 'ubi_wl_put_peb()' function on the @ubi->move_mutex. In turn, we are * holding @ubi->move_mutex and go sleep on the LEB lock. So, if the * LEB is already locked, we just do not move it and return -* %MOVE_CANCEL_RACE, which means that UBI will re-try, but later. +* %MOVE_RETRY. Note, we do not return %MOVE_CANCEL_RACE here because +* we do not know the reasons of the contention - it may be just a +* normal I/O on this LEB, so we want to re-try. */ err =leb_write_trylock (ubi, vol_id, lnum);if (err) {dbg_wl ("contention on LEB %d:%d, cancel" , vol_id, lnum); -return MOVE_CANCEL_RACE ; +return MOVE_RETRY ; }/*
drivers/mtd/ubi/ubi.h +2 -0
@@ -120,6 +120,7 @@ enum {* PEB * MOVE_CANCEL_BITFLIPS: canceled because a bit-flip was detected in the * target PEB +* MOVE_RETRY: retry scrubbing the PEB */ enum {MOVE_CANCEL_RACE =1 ,
@@ -127,6 +128,7 @@ enum {MOVE_TARGET_RD_ERR ,MOVE_TARGET_WR_ERR ,MOVE_CANCEL_BITFLIPS , + MOVE_RETRY, };/**
drivers/mtd/ubi/vtbl.c +1 -1
@@ -306,7 +306,7 @@ static int create_vtbl(struct ubi_device *ubi, struct ubi_scan_info *si, int copy, void *vtbl) { int err, tries = 0; -static struct ubi_vid_hdr *vid_hdr; +struct ubi_vid_hdr *vid_hdr;struct ubi_scan_leb *new_seb;ubi_msg ("create volume table (copy #%d)" , copy +1 );
drivers/mtd/ubi/wl.c +8 -4
@@ -795,7 +795,10 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, protect =1 ; goto out_not_moved; } - +if (err ==MOVE_RETRY ) { + scrubbing =1 ; + goto out_not_moved; + }if (err ==MOVE_CANCEL_BITFLIPS || err ==MOVE_TARGET_WR_ERR || err ==MOVE_TARGET_RD_ERR ) {/*
@@ -1049,7 +1052,6 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,ubi_err ("failed to erase PEB %d, error %d" , pnum, err);kfree (wl_wrk); -kmem_cache_free (ubi_wl_entry_slab, e);if (err == -EINTR || err == -ENOMEM || err == -EAGAIN || err == -EBUSY ) {
@@ -1062,14 +1064,16 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk, goto out_ro; }return err; - }else if (err != -EIO ) { + } + +kmem_cache_free (ubi_wl_entry_slab, e); +if (err != -EIO )/* * If this is not %-EIO, we have no idea what to do. Scheduling * this physical eraseblock for erasure again would cause * errors again and again. Well, lets switch to R/O mode. */ goto out_ro; - }/* It is %-EIO, the PEB went bad */
drivers/net/usb/asix.c +15 -0
@@ -974,6 +974,7 @@ static int ax88772_link_reset(struct usbnet *dev)static int ax88772_reset (struct usbnet *dev) { +struct asix_data *data = (struct asix_data *)&dev->data;int ret, embd_phy;u16 rx_ctl;
@@ -1051,6 +1052,13 @@ static int ax88772_reset(struct usbnet *dev) goto out; } +/* Rewrite MAC address */ +memcpy (data->mac_addr, dev->net->dev_addr,ETH_ALEN ); + ret =asix_write_cmd (dev,AX_CMD_WRITE_NODE_ID ,0 ,0 ,ETH_ALEN , + data->mac_addr); +if (ret <0 ) + goto out; +/* Set RX_CTL to default values with 2k buffer, and enable cactus */ ret =asix_write_rx_ctl (dev,AX_DEFAULT_RX_CTL );if (ret <0 )
@@ -1316,6 +1324,13 @@ static int ax88178_reset(struct usbnet *dev)if (ret <0 )return ret; +/* Rewrite MAC address */ +memcpy (data->mac_addr, dev->net->dev_addr,ETH_ALEN ); + ret =asix_write_cmd (dev,AX_CMD_WRITE_NODE_ID ,0 ,0 ,ETH_ALEN , + data->mac_addr); +if (ret <0 ) +return ret; + ret =asix_write_rx_ctl (dev,AX_DEFAULT_RX_CTL );if (ret <0 )return ret;
drivers/net/wireless/ath/ath9k/ar9003_mac.c +3 -2
@@ -526,10 +526,11 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs, rxs->rs_status |=ATH9K_RXERR_DECRYPT ; else if (rxsp->status11 & AR_MichaelErr) rxs->rs_status |= ATH9K_RXERR_MIC; -if (rxsp->status11 & AR_KeyMiss) - rxs->rs_status |=ATH9K_RXERR_KEYMISS ; } +if (rxsp->status11 & AR_KeyMiss) + rxs->rs_status |=ATH9K_RXERR_KEYMISS ; +return 0 ; }EXPORT_SYMBOL (ath9k_hw_process_rxdesc_edma);
drivers/net/wireless/ath/ath9k/calib.c +1 -0
@@ -402,6 +402,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan) ah->noise =ath9k_hw_getchan_noise (ah, chan);return true; } +EXPORT_SYMBOL (ath9k_hw_getnf);void ath9k_init_nfcal_hist_buffer (struct ath_hw *ah,struct ath9k_channel *chan)
drivers/net/wireless/ath/ath9k/mac.c +3 -2
@@ -621,10 +621,11 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, rs->rs_status |=ATH9K_RXERR_DECRYPT ; else if (ads.ds_rxstatus8 & AR_MichaelErr) rs->rs_status |= ATH9K_RXERR_MIC; -if (ads.ds_rxstatus8 & AR_KeyMiss) - rs->rs_status |=ATH9K_RXERR_KEYMISS ; } +if (ads.ds_rxstatus8 & AR_KeyMiss) + rs->rs_status |=ATH9K_RXERR_KEYMISS ; +return 0 ; }EXPORT_SYMBOL (ath9k_hw_rxprocdesc);
drivers/net/wireless/ath/ath9k/main.c +2 -6
@@ -1667,7 +1667,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) {struct ieee80211_channel *curchan = hw->conf.channel; -struct ath9k_channel old_chan;int pos = curchan->hw_value;int old_pos =-1 ;unsigned long flags;
@@ -1693,11 +1692,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)* Preserve the current channel values, before updating * the same channel */ -if (old_pos == pos) { -memcpy (&old_chan, &sc->sc_ah->channels[pos], -sizeof (struct ath9k_channel )); - ah->curchan = &old_chan; - } +if (ah->curchan && (old_pos == pos)) +ath9k_hw_getnf (ah, ah->curchan);ath9k_cmn_update_ichannel (&sc->sc_ah->channels[pos], curchan, conf->channel_type);
drivers/net/wireless/iwlegacy/iwl3945-base.c +4 -5
@@ -2656,14 +2656,13 @@ int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)IWL_WARN (priv,"Invalid scan band\n" );return -EIO ; } -/* -* If active scaning is requested but a certain channel -* is marked passive, we can do active scanning if we -* detect transmissions. +* If active scaning is requested but a certain channel is marked +* passive, we can do active scanning if we detect transmissions. For +* passive only scanning disable switching to active on any channel. */ scan->good_CRC_th = is_active ?IWL_GOOD_CRC_TH_DEFAULT : -IWL_GOOD_CRC_TH_DISABLED ; +IWL_GOOD_CRC_TH_NEVER ; len = iwl_legacy_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data, vif->addr, priv->scan_request->ie,
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1 -0
@@ -827,6 +827,7 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)case IEEE80211_SMPS_STATIC :case IEEE80211_SMPS_DYNAMIC :return IWL_NUM_IDLE_CHAINS_SINGLE ; +case IEEE80211_SMPS_AUTOMATIC :case IEEE80211_SMPS_OFF :return active_cnt;default :
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +3 -0
@@ -559,6 +559,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)mutex_lock (&priv->shrd->mutex); +if (test_bit (STATUS_EXIT_PENDING , &priv->shrd->status)) + goto out; +if (unlikely (test_bit (STATUS_SCANNING , &priv->shrd->status))) {IWL_DEBUG_MAC80211 (priv,"leave - scanning\n" ); goto out;
drivers/net/wireless/rt2x00/rt2800pci.c +8 -20
@@ -422,7 +422,6 @@ static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev)static void rt2800pci_toggle_irq (struct rt2x00_dev *rt2x00dev,enum dev_state state) { -int mask = (state ==STATE_RADIO_IRQ_ON );u32 reg;unsigned long flags;
@@ -436,25 +435,14 @@ static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev, }spin_lock_irqsave (&rt2x00dev->irqmask_lock, flags); -rt2x00pci_register_read (rt2x00dev,INT_MASK_CSR , ®); -rt2x00_set_field32 (®,INT_MASK_CSR_RXDELAYINT ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_TXDELAYINT ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_RX_DONE , mask); -rt2x00_set_field32 (®,INT_MASK_CSR_AC0_DMA_DONE ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_AC1_DMA_DONE ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_AC2_DMA_DONE ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_AC3_DMA_DONE ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_HCCA_DMA_DONE ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_MGMT_DMA_DONE ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_MCU_COMMAND ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_RXTX_COHERENT ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_TBTT , mask); -rt2x00_set_field32 (®,INT_MASK_CSR_PRE_TBTT , mask); -rt2x00_set_field32 (®,INT_MASK_CSR_TX_FIFO_STATUS , mask); -rt2x00_set_field32 (®,INT_MASK_CSR_AUTO_WAKEUP , mask); -rt2x00_set_field32 (®,INT_MASK_CSR_GPTIMER ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_RX_COHERENT ,0 ); -rt2x00_set_field32 (®,INT_MASK_CSR_TX_COHERENT ,0 ); + reg =0 ; +if (state ==STATE_RADIO_IRQ_ON ) { +rt2x00_set_field32 (®,INT_MASK_CSR_RX_DONE ,1 ); +rt2x00_set_field32 (®,INT_MASK_CSR_TBTT ,1 ); +rt2x00_set_field32 (®,INT_MASK_CSR_PRE_TBTT ,1 ); +rt2x00_set_field32 (®,INT_MASK_CSR_TX_FIFO_STATUS ,1 ); +rt2x00_set_field32 (®,INT_MASK_CSR_AUTO_WAKEUP ,1 ); + }rt2x00pci_register_write (rt2x00dev,INT_MASK_CSR , reg);spin_unlock_irqrestore (&rt2x00dev->irqmask_lock, flags);
drivers/net/wireless/rtlwifi/rtl8192se/fw.c +4 -0
@@ -196,6 +196,8 @@ static bool _rtl92s_firmware_downloadcode(struct ieee80211_hw *hw,/* Allocate skb buffer to contain firmware */ /* info and tx descriptor info. */ skb =dev_alloc_skb (frag_length); +if (!skb) +return false;skb_reserve (skb, extra_descoffset); seg_ptr = (u8 *)skb_put (skb, (u32)(frag_length - extra_descoffset));
@@ -573,6 +575,8 @@ static bool _rtl92s_firmware_set_h2c_cmd(struct ieee80211_hw *hw, u8 h2c_cmd, len =_rtl92s_get_h2c_cmdlen (MAX_TRANSMIT_BUFFER_SIZE ,1 , &cmd_len); skb =dev_alloc_skb (len); +if (!skb) +return false; cb_desc = (struct rtl_tcb_desc *)(skb->cb); cb_desc->queue_index =TXCMD_QUEUE ; cb_desc->cmd_or_init =DESC_PACKET_TYPE_NORMAL ;
drivers/pci/msi.c +10 -0
@@ -870,5 +870,15 @@ EXPORT_SYMBOL(pci_msi_enabled);void pci_msi_init_pci_dev (struct pci_dev *dev) { +int pos;INIT_LIST_HEAD (&dev->msi_list); + +/* Disable the msi hardware to avoid screaming interrupts +* during boot. This is the power on reset default so +* usually this should be a noop. +*/ + pos =pci_find_capability (dev,PCI_CAP_ID_MSI ); +if (pos) +msi_set_enable (dev, pos,0 ); +msix_set_enable (dev,0 ); }
drivers/pnp/quirks.c +42 -0
54 lines not on this page · raw message
drivers/rtc/interface.c +2 -2
@@ -228,11 +228,11 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) alarm->time.tm_hour = now.tm_hour;/* For simplicity, only support date rollover for now */ -if (alarm->time.tm_mday ==-1 ) { +if (alarm->time.tm_mday <1 || alarm->time.tm_mday >31 ) { alarm->time.tm_mday = now.tm_mday; missing = day; } -if (alarm->time.tm_mon ==-1 ) { +if ((unsigned )alarm->time.tm_mon >=12 ) { alarm->time.tm_mon = now.tm_mon;if (missing == none) missing = month;
drivers/scsi/mpt2sas/mpt2sas_base.c +27 -56
122 lines not on this page · raw message
drivers/scsi/mpt2sas/mpt2sas_scsih.c +6 -5
@@ -1007,8 +1007,8 @@ _scsih_get_chain_buffer_tracker(struct MPT2SAS_ADAPTER *ioc, u16 smid)spin_lock_irqsave (&ioc->scsi_lookup_lock, flags);if (list_empty (&ioc->free_chain_list)) {spin_unlock_irqrestore (&ioc->scsi_lookup_lock, flags); -printk (MPT2SAS_WARN_FMT "chain buffers not available\n" , - ioc->name); +dfailprintk (ioc,printk (MPT2SAS_WARN_FMT "chain buffers not " +"available\n" , ioc->name));return NULL ; } chain_req = list_entry(ioc->free_chain_list.next,
@@ -6714,6 +6714,7 @@ _scsih_mark_responding_raid_device(struct MPT2SAS_ADAPTER *ioc, u64 wwid, }else sas_target_priv_data =NULL ; raid_device->responding =1 ; +spin_unlock_irqrestore (&ioc->raid_device_lock, flags);starget_printk (KERN_INFO , raid_device->starget,"handle(0x%04x), wwid(0x%016llx)\n" , handle, (unsigned long long )raid_device->wwid);
@@ -6724,16 +6725,16 @@ _scsih_mark_responding_raid_device(struct MPT2SAS_ADAPTER *ioc, u64 wwid,*/ _scsih_init_warpdrive_properties (ioc, raid_device);if (raid_device->handle == handle) - goto out; +return ;printk (KERN_INFO "\thandle changed from(0x%04x)!!!\n" , raid_device->handle); raid_device->handle = handle;if (sas_target_priv_data) sas_target_priv_data->handle = handle; - goto out; +return ; } } - out: +spin_unlock_irqrestore (&ioc->raid_device_lock, flags); }
drivers/scsi/sd.c +10 -3
@@ -1074,6 +1074,10 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,SCSI_LOG_IOCTL (1 ,sd_printk (KERN_INFO , sdkp,"sd_ioctl: disk=%s, " "cmd=0x%x\n" , disk->disk_name, cmd)); + error =scsi_verify_blk_ioctl (bdev, cmd); +if (error <0 ) +return error; +/* * If we are in the middle of error recovery, don't let anyone * else try and use this device. Also, if error recovery fails, it
@@ -1096,7 +1100,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, error =scsi_ioctl (sdp, cmd, p);break ;default : - error =scsi_cmd_ioctl (disk->queue, disk, mode, cmd, p); + error =scsi_cmd_blk_ioctl (bdev, mode, cmd, p);if (error != -ENOTTY )break ; error =scsi_ioctl (sdp, cmd, p);
@@ -1266,6 +1270,11 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) {struct scsi_device *sdev =scsi_disk (bdev->bd_disk)->device; +int ret; + + ret =scsi_verify_blk_ioctl (bdev, cmd); +if (ret <0 ) +return -ENOIOCTLCMD ;/* * If we are in the middle of error recovery, don't let anyone
@@ -1277,8 +1286,6 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,return -ENODEV ;if (sdev->host->hostt->compat_ioctl) { -int ret; - ret = sdev->host->hostt->compat_ioctl (sdev, cmd, (void __user *)arg);return ret;
drivers/scsi/sym53c8xx_2/sym_glue.c +4 -0
@@ -839,6 +839,10 @@ static void sym53c8xx_slave_destroy(struct scsi_device *sdev)struct sym_lcb *lp =sym_lp (tp, sdev->lun);unsigned long flags; +/* if slave_alloc returned before allocating a sym_lcb, return */ +if (!lp) +return ; +spin_lock_irqsave (np->s.host->host_lock, flags);if (lp->busy_itlq || lp->busy_itl) {
drivers/target/target_core_cdb.c +12 -0
@@ -94,6 +94,18 @@ target_emulate_inquiry_std(struct se_cmd *cmd) buf[2 ] = dev->transport->get_device_rev (dev);/* +* NORMACA and HISUP = 0, RESPONSE DATA FORMAT = 2 +* +* SPC4 says: +* A RESPONSE DATA FORMAT field set to 2h indicates that the +* standard INQUIRY data is in the format defined in this +* standard. Response data format values less than 2h are +* obsolete. Response data format values greater than 2h are +* reserved. +*/ + buf[3 ] =2 ; + +/* * Enable SCCS and TPGS fields for Emulated ALUA */ if (dev->se_sub_dev->t10_alua.alua_type ==SPC3_ALUA_EMULATED )
drivers/target/target_core_transport.c +14 -0
@@ -4353,6 +4353,7 @@ int transport_send_check_condition_and_sense(case TCM_NON_EXISTENT_LUN :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ILLEGAL REQUEST */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ;/* LOGICAL UNIT NOT SUPPORTED */
@@ -4362,6 +4363,7 @@ int transport_send_check_condition_and_sense(case TCM_SECTOR_COUNT_TOO_MANY :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ILLEGAL REQUEST */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ;/* INVALID COMMAND OPERATION CODE */
@@ -4370,6 +4372,7 @@ int transport_send_check_condition_and_sense(case TCM_UNKNOWN_MODE_PAGE :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ILLEGAL REQUEST */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ;/* INVALID FIELD IN CDB */
@@ -4378,6 +4381,7 @@ int transport_send_check_condition_and_sense(case TCM_CHECK_CONDITION_ABORT_CMD :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ABORTED COMMAND */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ABORTED_COMMAND ;/* BUS DEVICE RESET FUNCTION OCCURRED */
@@ -4387,6 +4391,7 @@ int transport_send_check_condition_and_sense(case TCM_INCORRECT_AMOUNT_OF_DATA :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ABORTED COMMAND */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ABORTED_COMMAND ;/* WRITE ERROR */
@@ -4397,6 +4402,7 @@ int transport_send_check_condition_and_sense(case TCM_INVALID_CDB_FIELD :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ABORTED COMMAND */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ABORTED_COMMAND ;/* INVALID FIELD IN CDB */
@@ -4405,6 +4411,7 @@ int transport_send_check_condition_and_sense(case TCM_INVALID_PARAMETER_LIST :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ABORTED COMMAND */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ABORTED_COMMAND ;/* INVALID FIELD IN PARAMETER LIST */
@@ -4413,6 +4420,7 @@ int transport_send_check_condition_and_sense(case TCM_UNEXPECTED_UNSOLICITED_DATA :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ABORTED COMMAND */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ABORTED_COMMAND ;/* WRITE ERROR */
@@ -4423,6 +4431,7 @@ int transport_send_check_condition_and_sense(case TCM_SERVICE_CRC_ERROR :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ABORTED COMMAND */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ABORTED_COMMAND ;/* PROTOCOL SERVICE CRC ERROR */
@@ -4433,6 +4442,7 @@ int transport_send_check_condition_and_sense(case TCM_SNACK_REJECTED :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ABORTED COMMAND */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ABORTED_COMMAND ;/* READ ERROR */
@@ -4443,6 +4453,7 @@ int transport_send_check_condition_and_sense(case TCM_WRITE_PROTECTED :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* DATA PROTECT */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =DATA_PROTECT ;/* WRITE PROTECTED */
@@ -4451,6 +4462,7 @@ int transport_send_check_condition_and_sense(case TCM_CHECK_CONDITION_UNIT_ATTENTION :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* UNIT ATTENTION */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =UNIT_ATTENTION ;core_scsi3_ua_for_check_condition (cmd, &asc, &ascq);
@@ -4460,6 +4472,7 @@ int transport_send_check_condition_and_sense(case TCM_CHECK_CONDITION_NOT_READY :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* Not Ready */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =NOT_READY ;transport_get_sense_codes (cmd, &asc, &ascq);
@@ -4470,6 +4483,7 @@ int transport_send_check_condition_and_sense(default :/* CURRENT ERROR */ buffer[offset] =0x70 ; + buffer[offset+SPC_ADD_SENSE_LEN_OFFSET ] =10 ;/* ILLEGAL REQUEST */ buffer[offset+SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ;/* LOGICAL UNIT COMMUNICATION FAILURE */
drivers/xen/xenbus/xenbus_xs.c +6 -0
@@ -801,6 +801,12 @@ static int process_msg(void) goto out; } +if (msg->hdr.len >XENSTORE_PAYLOAD_MAX ) { +kfree (msg); + err = -EINVAL ; + goto out; + } + body =kmalloc (msg->hdr.len +1 ,GFP_NOIO | __GFP_HIGH);if (body ==NULL ) {kfree (msg);
fs/aio.c +9 -2
@@ -476,14 +476,21 @@ static void kiocb_batch_init(struct kiocb_batch *batch, long total) batch->count = total; } -static void kiocb_batch_free (struct kiocb_batch *batch) +static void kiocb_batch_free (struct kioctx *ctx,struct kiocb_batch *batch) {struct kiocb *req, *n; +if (list_empty (&batch->head)) +return ; + +spin_lock_irq (&ctx->ctx_lock);list_for_each_entry_safe (req, n, &batch->head, ki_batch) {list_del (&req->ki_batch); +list_del (&req->ki_list);kmem_cache_free (kiocb_cachep, req); + ctx->reqs_active--; } +spin_unlock_irq (&ctx->ctx_lock); }/*
@@ -1742,7 +1749,7 @@ long do_io_submit(aio_context_t ctx_id, long nr, }blk_finish_plug (&plug); -kiocb_batch_free (&batch); +kiocb_batch_free (ctx, &batch);put_ioctx (ctx);return i ? i : ret; }
fs/cifs/connect.c +19 -4
@@ -2914,18 +2914,33 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,#define CIFS_DEFAULT_IOSIZE (1024 * 1024)/* -* Windows only supports a max of 60k reads. Default to that when posix -* extensions aren't in force. +* Windows only supports a max of 60kb reads and 65535 byte writes. Default to +* those values when posix extensions aren't in force. In actuality here, we +* use 65536 to allow for a write that is a multiple of 4k. Most servers seem +* to be ok with the extra byte even though Windows doesn't send writes that +* are that large. +* +* Citation: +* +* http://blogs.msdn.com/b/openspecification/archive/2009/04/10/smb-maximum-transmit-buffer-size-and-performance-tuning.aspx */ #define CIFS_DEFAULT_NON_POSIX_RSIZE (60 * 1024) +#define CIFS_DEFAULT_NON_POSIX_WSIZE (65536)static unsigned int cifs_negotiate_wsize (struct cifs_tcon *tcon,struct smb_vol *pvolume_info) {__u64 unix_cap =le64_to_cpu (tcon->fsUnixInfo.Capability);struct TCP_Server_Info *server = tcon->ses->server; -unsigned int wsize = pvolume_info->wsize ? pvolume_info->wsize : -CIFS_DEFAULT_IOSIZE ; +unsigned int wsize; + +/* start with specified wsize, or default */ +if (pvolume_info->wsize) + wsize = pvolume_info->wsize; +else if (tcon->unix_ext && (unix_cap &CIFS_UNIX_LARGE_WRITE_CAP )) + wsize =CIFS_DEFAULT_IOSIZE ; +else + wsize =CIFS_DEFAULT_NON_POSIX_WSIZE ;/* can server support 24-bit write sizes? (via UNIX extensions) */ if (!tcon->unix_ext || !(unix_cap &CIFS_UNIX_LARGE_WRITE_CAP ))
fs/dcache.c +32 -46
146 lines not on this page · raw message
fs/ext4/ioctl.c +18 -10
@@ -182,19 +182,22 @@ setversion_out:if (err)return err; -if (get_user (n_blocks_count, (__u32 __user *)arg)) -return -EFAULT ; +if (get_user (n_blocks_count, (__u32 __user *)arg)) { + err = -EFAULT ; + goto group_extend_out; + }if (EXT4_HAS_RO_COMPAT_FEATURE (sb,EXT4_FEATURE_RO_COMPAT_BIGALLOC )) {ext4_msg (sb,KERN_ERR ,"Online resizing not supported with bigalloc" ); -return -EOPNOTSUPP ; + err = -EOPNOTSUPP ; + goto group_extend_out; } err =mnt_want_write (filp->f_path.mnt);if (err) -return err; + goto group_extend_out; err =ext4_group_extend (sb,EXT4_SB (sb)->s_es, n_blocks_count);if (EXT4_SB (sb)->s_journal) {
@@ -204,9 +207,10 @@ setversion_out: }if (err ==0 ) err = err2; +mnt_drop_write (filp->f_path.mnt); +group_extend_out:ext4_resize_end (sb); -return err; }
@@ -267,19 +271,22 @@ mext_out:return err;if (copy_from_user (&input, (struct ext4_new_group_input __user *)arg, -sizeof (input))) -return -EFAULT ; +sizeof (input))) { + err = -EFAULT ; + goto group_add_out; + }if (EXT4_HAS_RO_COMPAT_FEATURE (sb,EXT4_FEATURE_RO_COMPAT_BIGALLOC )) {ext4_msg (sb,KERN_ERR ,"Online resizing not supported with bigalloc" ); -return -EOPNOTSUPP ; + err = -EOPNOTSUPP ; + goto group_add_out; } err =mnt_want_write (filp->f_path.mnt);if (err) -return err; + goto group_add_out; err =ext4_group_add (sb, &input);if (EXT4_SB (sb)->s_journal) {
@@ -289,9 +296,10 @@ mext_out: }if (err ==0 ) err = err2; +mnt_drop_write (filp->f_path.mnt); +group_add_out:ext4_resize_end (sb); -return err; }
fs/ext4/super.c +3 -4
@@ -2006,17 +2006,16 @@ static int ext4_fill_flex_info(struct super_block *sb)struct ext4_group_desc *gdp =NULL ;ext4_group_t flex_group_count;ext4_group_t flex_group; -int groups_per_flex =0 ; +unsigned int groups_per_flex =0 ;size_t size;int i; sbi->s_log_groups_per_flex = sbi->s_es->s_log_groups_per_flex; - groups_per_flex =1 << sbi->s_log_groups_per_flex; - -if (groups_per_flex <2 ) { +if (sbi->s_log_groups_per_flex <1 || sbi->s_log_groups_per_flex >31 ) { sbi->s_log_groups_per_flex =0 ;return 1 ; } + groups_per_flex =1 << sbi->s_log_groups_per_flex;/* We allocate both existing and potentially added groups */ flex_group_count = ((sbi->s_groups_count + groups_per_flex - 1) +
fs/nfs/blocklayout/blocklayout.c +15 -13
@@ -146,14 +146,19 @@ static struct bio *bl_alloc_init_bio(int npg, sector_t isect, {struct bio *bio; + npg =min (npg,BIO_MAX_PAGES ); bio =bio_alloc (GFP_NOIO , npg); -if (!bio) -return NULL ; +if (!bio && (current->flags &PF_MEMALLOC )) { +while (!bio && (npg /=2 )) + bio =bio_alloc (GFP_NOIO , npg); + } - bio->bi_sector = isect - be->be_f_offset + be->be_v_offset; - bio->bi_bdev = be->be_mdev; - bio->bi_end_io = end_io; - bio->bi_private = par; +if (bio) { + bio->bi_sector = isect - be->be_f_offset + be->be_v_offset; + bio->bi_bdev = be->be_mdev; + bio->bi_end_io = end_io; + bio->bi_private = par; + }return bio; }
@@ -779,16 +784,13 @@ bl_cleanup_layoutcommit(struct nfs4_layoutcommit_data *lcdata)static void free_blk_mountid (struct block_mount_id *mid) {if (mid) { -struct pnfs_block_dev *dev; -spin_lock (&mid->bm_lock); -while (!list_empty (&mid->bm_devlist)) { - dev =list_first_entry (&mid->bm_devlist, - struct pnfs_block_dev, - bm_node); +struct pnfs_block_dev *dev, *tmp; + +/* No need to take bm_lock as we are last user freeing bm_devlist */ +list_for_each_entry_safe (dev, tmp, &mid->bm_devlist, bm_node) {list_del (&dev->bm_node);bl_free_block_dev (dev); }
Lines of this file are not shown. View the raw message.
fs/nfs/nfs4proc.c +57 -39
96 lines not on this page · raw message
fs/nfs/super.c +19 -24
43 lines not on this page · raw message
fs/proc/base.c +39 -106
145 lines not on this page · raw message
mm/memcontrol.c +44 -0
44 lines not on this page · raw message
mm/shmem.c +41 -12
53 lines not on this page · raw message
mm/vmscan.c +40 -78
118 lines not on this page · raw message
net/mac80211/main.c +6 -52
58 lines not on this page · raw message
net/mac80211/offchannel.c +31 -37
68 lines not on this page · raw message
net/mac80211/scan.c +22 -55
77 lines not on this page · raw message
net/mac80211/work.c +11 -66
77 lines not on this page · raw message
net/sunrpc/svc_xprt.c +36 -17
53 lines not on this page · raw message
scripts/kconfig/streamline_config.pl +40 -12
52 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.