Linux 3.6.9
Greg KH
maintainerI'm announcing the release of the 3.6.9 kernel.
All users of the 3.6 kernel series must upgrade.
The updated 3.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.6.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
------------
Documentation/dvb/get_dvb_firmware | 2 Makefile | 2 arch/parisc/kernel/signal32.c | 6 - arch/parisc/kernel/sys_parisc.c | 2 arch/powerpc/platforms/pseries/eeh_driver.c | 95 +++++++++++++++----- arch/sparc/kernel/signal_64.c | 4 arch/x86/boot/compressed/eboot.c | 2 arch/x86/include/asm/ptrace.h | 15 --- arch/x86/kernel/microcode_amd.c | 4 arch/x86/kernel/ptrace.c | 30 ++++++ arch/x86/kvm/cpuid.h | 3 arch/x86/kvm/x86.c | 3 block/blk-exec.c | 8 + drivers/ata/sata_svw.c | 35 +++++++ drivers/base/power/qos.c | 2 drivers/gpu/drm/radeon/radeon_agp.c | 5 - drivers/hid/hid-ids.h | 3 drivers/hid/usbhid/hid-quirks.c | 1 drivers/isdn/gigaset/bas-gigaset.c | 19 +++- drivers/md/dm.c | 8 + drivers/md/md.c | 11 +- drivers/md/raid10.c | 112 ++++++++++++------------ drivers/mmc/host/sdhci-s3c.c | 2 drivers/mtd/devices/slram.c | 2 drivers/mtd/ofpart.c | 2 drivers/net/can/usb/peak_usb/pcan_usb.c | 8 + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 8 + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 1 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 drivers/net/wireless/iwlwifi/dvm/mac80211.c | 14 +++ drivers/net/wireless/iwlwifi/pcie/tx.c | 8 - drivers/net/wireless/mwifiex/cmdevt.c | 11 +- drivers/net/wireless/mwifiex/sdio.c | 11 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 drivers/nfc/pn533.c | 22 ++-- drivers/scsi/isci/request.c | 2 fs/ext4/resize.c | 2 fs/fs-writeback.c | 2 fs/inode.c | 16 +++ fs/internal.h | 1 fs/jbd/transaction.c | 2 fs/jffs2/file.c | 39 ++++---- fs/pstore/ram.c | 2 include/drm/drm_pciids.h | 1 kernel/futex.c | 18 +++ kernel/watchdog.c | 4 lib/mpi/longlong.h | 19 +++- mm/vmscan.c | 37 +++++-- net/can/bcm.c | 3 net/core/net-sysfs.c | 20 ++++ net/mac80211/ibss.c | 8 - net/nfc/llcp/llcp.c | 2 sound/pci/hda/patch_cirrus.c | 1 sound/pci/hda/patch_realtek.c | 4 sound/usb/midi.c | 8 + 56 files changed, 472 insertions(+), 184 deletions(-)
Al Viro (2):
PARISC: fix user-triggerable panic on parisc
sparc64: not any error from do_sigaltstack() should fail rt_sigreturn()
Albert Pool (1):
rtlwifi: rtl8192cu: Add new USB ID
Alex Deucher (1):
drm/radeon: add new SI pci id
Bing Zhao (2):
mwifiex: report error to MMC core if we cannot suspend
mwifiex: fix system hang issue in cmd timeout error case
Boris Ostrovsky (1):
x86, microcode, AMD: Add support for family 16h processors
Chuansheng Liu (1):
watchdog: using u64 in get_sample_period()
Clemens Ladisch (1):
ALSA: ua101, usx2y: fix broken MIDI output
Darren Hart (1):
futex: avoid wake_futex() for a PI futex_q
David Henningsson (2):
ALSA: hda - Cirrus: Correctly clear line_out_pins when moving to speaker
ALSA: hda - Add support for Realtek ALC292
David Milburn (1):
sata_svw: check DMA start bit before reset
Duncan Roe (1):
ALSA: hda - Fix missing beep on ASUS X43U notebook
Emmanuel Grumbach (1):
iwlwifi: don't WARN when a non empty queue is disabled
Gavin Shan (1):
powerpc/eeh: Lock module while handling EEH event
Greg Kroah-Hartman (1):
Linux 3.6.9
Guennadi Liakhovetski (1):
PM / QoS: fix wrong error-checking condition
H. Peter Anvin (1):
x86-32: Export kernel_stack_pointer() for modules
Jaehoon Chung (1):
mmc: sdhci-s3c: fix the wrong number of max bus clocks
James Bottomley (1):
PARISC: fix virtual aliasing issue in get_shared_area()
Jan Kara (2):
jbd: Fix lock ordering bug in journal_unmap_buffer()
writeback: put unused inodes to LRU after writeback completion
Jens Axboe (1):
dm: fix deadlock with request based dm and queue request_fn recursion
Jiri Engelthaler (1):
mtd: slram: invalid checking of absolute end address
Johannes Berg (2):
wireless: add back sysfs directory
iwlwifi: fix monitor mode FCS flag
Kailang Yang (1):
ALSA: hda - Add new codec ALC283 ALC290 support
Maciej Patelczyk (1):
SCSI: isci: copy fis 0x34 response into proper buffer
Manuel Lauss (1):
MPI: Fix compilation on MIPS with GCC 4.4 and newer
Marek Vasut (1):
HID: add quirk for Freescale i.MX28 ROM recovery
Matt Fleming (1):
x86, efi: Fix processor-specific memcpy() build error
Mauro Carvalho Chehab (1):
get_dvb_firmware: fix download site for tda10046 firmware
Mel Gorman (1):
mm: vmscan: check for fatal signals iff the process was throttled
NeilBrown (2):
md/raid10: decrement correct pending counter when writing to replacement. md/raid10: close race that lose writes lost when replacement completes.
Oliver Hartkopp (2):
can: peak_usb: fix hwtstamp assignment
can: bcm: initialize ifindex for timeouts without previous frame reception
Paul Bolle (1):
radeon: add AGPMode 1 quirk for RV250
Petr Matousek (1):
KVM: x86: invalid opcode oops on SET_SREGS with OSXSAVE bit set (CVE-2012-4461)
Randy Dunlap (1):
pstore/ram: Fix printk format warning
Robert Richter (1):
x86-32: Fix invalid stack address while in softirq
Roland Dreier (1):
block: Don't access request after it might be freed
Sachin Kamat (1):
mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
Simon Wunderlich (1):
mac80211: deinitialize ibss-internals after emptiness check
Szymon Janc (1):
NFC: pn533: Fix use after free
Tao Ma (1):
ext4: remove erroneous ext4_superblock_csum_set() in update_backups()
Thierry Escande (2):
NFC: Fix pn533 target mode memory leak
NFC: Fix nfc_llcp_local chained list insertion
Thomas Betker (1):
jffs2: Fix lock acquisition order bug in jffs2_write_begin
Tilman Schmidt (1):
bas_gigaset: fix pre_reset handling
Waldemar Rymarkiewicz (1):
NFC: pn533: Fix mem leak in pn533_in_dep_link_up
[email protected] (1):
ixgbe: add support for X540-AT1
majianpeng (2):
md: Reassigned the parameters if read_seqretry returned true in func md_is_badblock.
md: Avoid write invalid address if read_seqretry returned true.
Greg KH
maintainerDocumentation/dvb/get_dvb_firmware +1 -1
@@ -116,7 +116,7 @@ sub tda10045 { sub tda10046 { my $sourcefile = "TT_PCI_2.19h_28_11_2006.zip"; - my $url = "http://www.tt-download.com/download/updates/219/$sourcefile"; + my $url = "http://technotrend.com.ua/download/software/219/$sourcefile"; my $hash = "6a7e1e2f2644b162ff0502367553c72d"; my $outfile = "dvb-fe-tda10046.fw"; my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 6 -SUBLEVEL = 8 +SUBLEVEL = 9 EXTRAVERSION = NAME = Terrified Chipmunk
arch/parisc/kernel/signal32.c +4 -2
@@ -65,7 +65,8 @@ put_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz) {compat_sigset_t s; -if (sz !=sizeof *set)panic ("put_sigset32()" ); +if (sz !=sizeof *set) +return -EINVAL ;sigset_64to32 (&s, set);return copy_to_user (up, &s,sizeof s);
@@ -77,7 +78,8 @@ get_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz)compat_sigset_t s;int r; -if (sz !=sizeof *set)panic ("put_sigset32()" ); +if (sz !=sizeof *set) +return -EINVAL ;if ((r =copy_from_user (&s, up, sz)) ==0 ) {sigset_32to64 (set, &s);
arch/parisc/kernel/sys_parisc.c +2 -0
@@ -73,6 +73,8 @@ static unsigned long get_shared_area(struct address_space *mapping,struct vm_area_struct *vma;int offset = mapping ?get_offset (mapping) :0 ; + offset = (offset + (pgoff <<PAGE_SHIFT )) &0x3FF000 ; + addr =DCACHE_ALIGN (addr - offset) + offset;for (vma =find_vma (current->mm, addr); ; vma = vma->vm_next) {
arch/powerpc/platforms/pseries/eeh_driver.c +74 -21
194 lines not on this page · raw message
arch/sparc/kernel/signal_64.c +1 -3
@@ -295,9 +295,7 @@ void do_rt_sigreturn(struct pt_regs *regs) err |=restore_fpu_state (regs, fpu_save); err |=__copy_from_user (&set, &sf->mask,sizeof (sigset_t)); - err |=do_sigaltstack (&sf->stack,NULL , (unsigned long )sf); - -if (err) +if (err ||do_sigaltstack (&sf->stack,NULL , (unsigned long )sf) == -EFAULT ) goto segv; err |=__get_user (rwin_save, &sf->rwin_save);
arch/x86/boot/compressed/eboot.c +2 -0
@@ -12,6 +12,8 @@#include <asm/setup.h> #include <asm/desc.h> +#undef memcpy/* Use memcpy from misc.c */ +#include "eboot.h" static efi_system_table_t *sys_table;
arch/x86/include/asm/ptrace.h +4 -11
@@ -205,21 +205,14 @@ static inline bool user_64bit_mode(struct pt_regs *regs) }#endif -/* -* X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode -* when it traps. The previous stack will be directly underneath the saved -* registers, and 'sp/ss' won't even have been saved. Thus the '®s->sp'. -* -* This is valid only for kernel mode traps. -*/ -static inline unsigned long kernel_stack_pointer (struct pt_regs *regs) -{#ifdef CONFIG_X86_32 -return (unsigned long )(®s->sp); +extern unsigned long kernel_stack_pointer (struct pt_regs *regs);#else +static inline unsigned long kernel_stack_pointer (struct pt_regs *regs) +{return regs->sp; -#endif } +#endif #define GET_IP (regs) ((regs)->ip)#define GET_FP (regs) ((regs)->bp)
arch/x86/kernel/microcode_amd.c +4 -0
@@ -97,6 +97,7 @@ static unsigned int verify_ucode_size(int cpu, u32 patch_size,#define F1XH_MPB_MAX_SIZE 2048#define F14H_MPB_MAX_SIZE 1824#define F15H_MPB_MAX_SIZE 4096 +#define F16H_MPB_MAX_SIZE 3458switch (c->x86) {case 0x14 :
@@ -105,6 +106,9 @@ static unsigned int verify_ucode_size(int cpu, u32 patch_size,case 0x15 : max_size =F15H_MPB_MAX_SIZE ;break ; +case 0x16 : + max_size =F16H_MPB_MAX_SIZE ; +break ;default : max_size =F1XH_MPB_MAX_SIZE ;break ;
arch/x86/kernel/ptrace.c +30 -0
@@ -21,6 +21,7 @@#include <linux/signal.h> #include <linux/perf_event.h> #include <linux/hw_breakpoint.h> +#include <linux/module.h> #include <asm/uaccess.h> #include <asm/pgtable.h>
@@ -165,6 +166,35 @@ static inline bool invalid_selector(u16 value)#define FLAG_MASK FLAG_MASK_32 +/* +* X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode +* when it traps. The previous stack will be directly underneath the saved +* registers, and 'sp/ss' won't even have been saved. Thus the '®s->sp'. +* +* Now, if the stack is empty, '®s->sp' is out of range. In this +* case we try to take the previous stack. To always return a non-null +* stack pointer we fall back to regs as stack if no previous stack +* exists. +* +* This is valid only for kernel mode traps. +*/ +unsigned long kernel_stack_pointer (struct pt_regs *regs) +{ +unsigned long context = (unsigned long )regs & ~(THREAD_SIZE -1 ); +unsigned long sp = (unsigned long )®s->sp; +struct thread_info *tinfo; + +if (context == (sp & ~(THREAD_SIZE -1 ))) +return sp; + + tinfo = (struct thread_info *)context; +if (tinfo->previous_esp) +return tinfo->previous_esp; + +return (unsigned long )regs; +} +EXPORT_SYMBOL_GPL (kernel_stack_pointer); +static unsigned long *pt_regs_access (struct pt_regs *regs,unsigned long regno) {BUILD_BUG_ON (offsetof(struct pt_regs , bx) !=0 );
arch/x86/kvm/cpuid.h +3 -0
@@ -24,6 +24,9 @@ static inline bool guest_cpuid_has_xsave(struct kvm_vcpu *vcpu) {struct kvm_cpuid_entry2 *best; +if (!static_cpu_has (X86_FEATURE_XSAVE )) +return 0 ; + best =kvm_find_cpuid_entry (vcpu,1 ,0 );return best && (best->ecx &bit (X86_FEATURE_XSAVE )); }
arch/x86/kvm/x86.c +3 -0
@@ -5762,6 +5762,9 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,int pending_vec, max_bits, idx;struct desc_ptr dt; +if (!guest_cpuid_has_xsave (vcpu) && (sregs->cr4 &X86_CR4_OSXSAVE )) +return -EINVAL ; + dt.size = sregs->idt.limit; dt.address = sregs->idt.base; kvm_x86_ops->set_idt (vcpu, &dt);
block/blk-exec.c +7 -1
@@ -52,11 +52,17 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, rq_end_io_fn *done) {int where = at_head ?ELEVATOR_INSERT_FRONT :ELEVATOR_INSERT_BACK ; +bool is_pm_resume;WARN_ON (irqs_disabled ()); rq->rq_disk = bd_disk; rq->end_io = done; +/* +* need to check this before __blk_run_queue(), because rq can +* be freed before that returns. +*/ + is_pm_resume = rq->cmd_type ==REQ_TYPE_PM_RESUME ;spin_lock_irq (q->queue_lock);
@@ -71,7 +77,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,__elv_add_request (q, rq, where);__blk_run_queue (q);/* the queue is stopped so it won't be run */ -if (rq->cmd_type ==REQ_TYPE_PM_RESUME ) +if (is_pm_resume) q->request_fn (q);spin_unlock_irq (q->queue_lock); }
drivers/ata/sata_svw.c +35 -0
@@ -142,6 +142,39 @@ static int k2_sata_scr_write(struct ata_link *link,return 0 ; } +static int k2_sata_softreset (struct ata_link *link, +unsigned int *class,unsigned long deadline) +{ +u8 dmactl; +void __iomem *mmio = link->ap->ioaddr.bmdma_addr; + + dmactl =readb (mmio +ATA_DMA_CMD ); + +/* Clear the start bit */ +if (dmactl &ATA_DMA_START ) { + dmactl &= ~ATA_DMA_START ; +writeb (dmactl, mmio +ATA_DMA_CMD ); + } + +return ata_sff_softreset (link, class, deadline); +} + +static int k2_sata_hardreset (struct ata_link *link, +unsigned int *class,unsigned long deadline) +{ +u8 dmactl; +void __iomem *mmio = link->ap->ioaddr.bmdma_addr; + + dmactl =readb (mmio +ATA_DMA_CMD ); + +/* Clear the start bit */ +if (dmactl &ATA_DMA_START ) { + dmactl &= ~ATA_DMA_START ; +writeb (dmactl, mmio +ATA_DMA_CMD ); + } + +return sata_sff_hardreset (link, class, deadline); +}static void k2_sata_tf_load (struct ata_port *ap,const struct ata_taskfile *tf) {
@@ -346,6 +379,8 @@ static struct scsi_host_template k2_sata_sht = {static struct ata_port_operations k2_sata_ops = { .inherits = &ata_bmdma_port_ops, + .softreset = k2_sata_softreset, + .hardreset = k2_sata_hardreset, .sff_tf_load = k2_sata_tf_load, .sff_tf_read = k2_sata_tf_read, .sff_check_status = k2_stat_check_status,
drivers/base/power/qos.c +1 -1
@@ -451,7 +451,7 @@ int dev_pm_qos_add_ancestor_request(struct device *dev,if (ancestor) error =dev_pm_qos_add_request (ancestor, req, value); -if (error) +if (error <0 ) req->dev =NULL ;return error;
drivers/gpu/drm/radeon/radeon_agp.c +4 -1
@@ -70,9 +70,12 @@ static struct radeon_agpmode_quirk radeon_agpmode_quirk_list[] = {/* Intel 82830 830 Chipset Host Bridge / Mobility M6 LY Needs AGPMode 2 (fdo #17360)*/ {PCI_VENDOR_ID_INTEL ,0x3575 ,PCI_VENDOR_ID_ATI ,0x4c59 , PCI_VENDOR_ID_DELL, 0x00e3, 2}, -/* Intel 82852/82855 host bridge / Mobility FireGL 9000 R250 Needs AGPMode 1 (lp #296617) */ +/* Intel 82852/82855 host bridge / Mobility FireGL 9000 RV250 Needs AGPMode 1 (lp #296617) */ { PCI_VENDOR_ID_INTEL, 0x3580, PCI_VENDOR_ID_ATI, 0x4c66, PCI_VENDOR_ID_DELL, 0x0149, 1}, +/* Intel 82855PM host bridge / Mobility FireGL 9000 RV250 Needs AGPMode 1 for suspend/resume */ + { PCI_VENDOR_ID_INTEL, 0x3340, PCI_VENDOR_ID_ATI, 0x4c66, + PCI_VENDOR_ID_IBM, 0x0531, 1},/* Intel 82852/82855 host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (deb #467460) */ { PCI_VENDOR_ID_INTEL, 0x3580, PCI_VENDOR_ID_ATI, 0x4e50, 0x1025, 0x0061, 1},
drivers/hid/hid-ids.h +3 -0
@@ -296,6 +296,9 @@#define USB_VENDOR_ID_EZKEY 0x0518#define USB_DEVICE_ID_BTC_8193 0x0002 +#define USB_VENDOR_ID_FREESCALE 0x15A2 +#define USB_DEVICE_ID_FREESCALE_MX28 0x004F +#define USB_VENDOR_ID_FRUCTEL 0x25B6#define USB_DEVICE_ID_GAMETEL_MT_MODE 0x0002
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -70,6 +70,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
drivers/isdn/gigaset/bas-gigaset.c +16 -3
@@ -617,7 +617,13 @@ static void int_in_work(struct work_struct *work)if (rc ==0 )/* success, resubmit interrupt read URB */ rc =usb_submit_urb (urb,GFP_ATOMIC ); -if (rc !=0 && rc != -ENODEV ) { + +switch (rc) { +case 0 :/* success */ +case -ENODEV :/* device gone */ +case -EINVAL :/* URB already resubmitted, or terminal badness */ +break ; +default :/* failure: try to recover by resetting the device */ dev_err (cs->dev,"clear halt failed: %s\n" ,get_usb_rcmsg (rc)); rc =usb_lock_device_for_reset (ucs->udev, ucs->interface);if (rc ==0 ) {
@@ -2442,7 +2448,9 @@ static void gigaset_disconnect(struct usb_interface *interface) }/* gigaset_suspend -* This function is called before the USB connection is suspended. +* This function is called before the USB connection is suspended +* or before the USB device is reset. +* In the latter case, message == PMSG_ON. */ static int gigaset_suspend (struct usb_interface *intf,pm_message_t message) {
@@ -2498,7 +2506,12 @@ static int gigaset_suspend(struct usb_interface *intf, pm_message_t message)del_timer_sync (&ucs->timer_atrdy);del_timer_sync (&ucs->timer_cmd_in);del_timer_sync (&ucs->timer_int_in); -cancel_work_sync (&ucs->int_in_wq); + +/* don't try to cancel int_in_wq from within reset as it +* might be the one requesting the reset +*/ +if (message.event !=PM_EVENT_ON ) +cancel_work_sync (&ucs->int_in_wq);gig_dbg (DEBUG_SUSPEND ,"suspend complete" );return 0 ;
drivers/md/dm.c +7 -1
@@ -754,8 +754,14 @@ static void rq_completed(struct mapped_device *md, int rw, int run_queue)if (!md_in_flight (md))wake_up (&md->wait); +/* +* Run this off this callpath, as drivers could invoke end_io while +* inside their request_fn (and holding the queue lock). Calling +* back into ->request_fn() could deadlock attempting to grab the +* queue lock again. +*/ if (run_queue) -blk_run_queue (md->queue); +blk_run_queue_async (md->queue);/* * dm_put() must be at the end of this function. See the comment above
drivers/md/md.c +6 -5
@@ -1832,10 +1832,10 @@ retry:memset (bbp,0xff ,PAGE_SIZE );for (i =0 ; i < bb->count ; i++) { -u64 internal_bb = *p++; +u64 internal_bb = p[i];u64 store_bb = ((BB_OFFSET (internal_bb) <<10 ) |BB_LEN (internal_bb)); - *bbp++ =cpu_to_le64 (store_bb); + bbp[i] =cpu_to_le64 (store_bb); } bb->changed =0 ;if (read_seqretry (&bb->lock, seq))
@@ -7907,9 +7907,9 @@ int md_is_badblock(struct badblocks *bb, sector_t s, int sectors, sector_t *first_bad, int *bad_sectors) {int hi; -int lo =0 ; +int lo;u64 *p = bb->page; -int rv =0 ; +int rv;sector_t target = s + sectors;unsigned seq;
@@ -7924,7 +7924,8 @@ int md_is_badblock(struct badblocks *bb, sector_t s, int sectors, retry: seq =read_seqbegin (&bb->lock); - + lo =0 ; + rv =0 ; hi = bb->count;/* Binary search between lo and hi for 'target'
drivers/md/raid10.c +58 -54
149 lines not on this page · raw message
drivers/mmc/host/sdhci-s3c.c +1 -1
@@ -656,7 +656,7 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev); -for (ptr =0 ; ptr <3 ; ptr++) { +for (ptr =0 ; ptr <MAX_BUS_CLK ; ptr++) {if (sc->clk_bus[ptr]) {clk_disable (sc->clk_bus[ptr]);clk_put (sc->clk_bus[ptr]);
drivers/mtd/devices/slram.c +1 -1
@@ -240,7 +240,7 @@ static int parse_cmdline(char *devname, char *szstart, char *szlength)if (*(szlength) !='+' ) { devlength =simple_strtoul (szlength, &buffer,0 ); - devlength =handle_unit (devlength, buffer) - devstart; + devlength =handle_unit (devlength, buffer);if (devlength < devstart) goto err_out;
drivers/mtd/ofpart.c +1 -1
@@ -121,7 +121,7 @@ static int parse_ofoldpart_partitions(struct mtd_info *master, nr_parts = plen /sizeof (part[0 ]); *pparts =kzalloc (nr_parts *sizeof (*(*pparts)),GFP_KERNEL ); -if (!pparts) +if (!*pparts)return -ENOMEM ; names =of_get_property (dp,"partition-names" , &plen);
drivers/net/can/usb/peak_usb/pcan_usb.c +6 -2
@@ -519,8 +519,10 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n, mc->pdev->dev.can.state = new_state;if (status_len &PCAN_USB_STATUSLEN_TIMESTAMP ) { +struct skb_shared_hwtstamps *hwts =skb_hwtstamps (skb); +peak_usb_get_ts_tv (&mc->pdev->time_ref, mc->ts16, &tv); - skb->tstamp =timeval_to_ktime (tv); + hwts->hwtstamp =timeval_to_ktime (tv); }netif_rx (skb);
@@ -605,6 +607,7 @@ static int pcan_usb_decode_data(struct pcan_usb_msg_context *mc, u8 status_len)struct sk_buff *skb;struct can_frame *cf;struct timeval tv; +struct skb_shared_hwtstamps *hwts; skb =alloc_can_skb (mc->netdev, &cf);if (!skb)
@@ -652,7 +655,8 @@ static int pcan_usb_decode_data(struct pcan_usb_msg_context *mc, u8 status_len)/* convert timestamp into kernel time */ peak_usb_get_ts_tv (&mc->pdev->time_ref, mc->ts16, &tv); - skb->tstamp =timeval_to_ktime (tv); + hwts =skb_hwtstamps (skb); + hwts->hwtstamp =timeval_to_ktime (tv);/* push the skb */ netif_rx (skb);
drivers/net/can/usb/peak_usb/pcan_usb_pro.c +6 -2
@@ -532,6 +532,7 @@ static int pcan_usb_pro_handle_canmsg(struct pcan_usb_pro_interface *usb_if,struct can_frame *can_frame;struct sk_buff *skb;struct timeval tv; +struct skb_shared_hwtstamps *hwts; skb =alloc_can_skb (netdev, &can_frame);if (!skb)
@@ -549,7 +550,8 @@ static int pcan_usb_pro_handle_canmsg(struct pcan_usb_pro_interface *usb_if,memcpy (can_frame->data, rx->data, can_frame->can_dlc);peak_usb_get_ts_tv (&usb_if->time_ref,le32_to_cpu (rx->ts32), &tv); - skb->tstamp =timeval_to_ktime (tv); + hwts =skb_hwtstamps (skb); + hwts->hwtstamp =timeval_to_ktime (tv);netif_rx (skb); netdev->stats.rx_packets++;
@@ -570,6 +572,7 @@ static int pcan_usb_pro_handle_error(struct pcan_usb_pro_interface *usb_if,u8 err_mask =0 ;struct sk_buff *skb;struct timeval tv; +struct skb_shared_hwtstamps *hwts;/* nothing should be sent while in BUS_OFF state */ if (dev->can.state ==CAN_STATE_BUS_OFF )
@@ -664,7 +667,8 @@ static int pcan_usb_pro_handle_error(struct pcan_usb_pro_interface *usb_if, dev->can.state = new_state;peak_usb_get_ts_tv (&usb_if->time_ref,le32_to_cpu (er->ts32), &tv); - skb->tstamp =timeval_to_ktime (tv); + hwts =skb_hwtstamps (skb); + hwts->hwtstamp =timeval_to_ktime (tv);netif_rx (skb); netdev->stats.rx_packets++; netdev->stats.rx_bytes += can_frame->can_dlc;
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +1 -0
@@ -70,6 +70,7 @@ static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)switch (hw->device_id) {case IXGBE_DEV_ID_X540T : +case IXGBE_DEV_ID_X540T1 :return 0 ;case IXGBE_DEV_ID_82599_T3_LOM :return 0 ;
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -0
@@ -114,6 +114,7 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), board_82599 }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), board_82599 }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 }, + {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), board_X540 },/* required last entry */ {0, } };
@@ -7010,6 +7011,7 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id, is_wol_supported =1 ;break ;case IXGBE_DEV_ID_X540T : +case IXGBE_DEV_ID_X540T1 :/* check eeprom to see if enabled wol */ if ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0_1) || ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0) &&
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +1 -0
@@ -65,6 +65,7 @@#define IXGBE_DEV_ID_82599_LS 0x154F#define IXGBE_DEV_ID_X540T 0x1528#define IXGBE_DEV_ID_82599_SFP_SF_QP 0x154A +#define IXGBE_DEV_ID_X540T1 0x1560/* VF Device IDs */ #define IXGBE_DEV_ID_82599_VF 0x10ED
drivers/net/wireless/iwlwifi/dvm/mac80211.c +14 -0
@@ -1352,6 +1352,20 @@ static int iwlagn_mac_add_interface(struct ieee80211_hw *hw, vif_priv->ctx = ctx; ctx->vif = vif; +/* +* In SNIFFER device type, the firmware reports the FCS to +* the host, rather than snipping it off. Unfortunately, +* mac80211 doesn't (yet) provide a per-packet flag for +* this, so that we have to set the hardware flag based +* on the interfaces added. As the monitor interface can +* only be present by itself, and will be removed before +* other interfaces are added, this is safe. +*/ +if (vif->type ==NL80211_IFTYPE_MONITOR ) + priv->hw->flags |=IEEE80211_HW_RX_INCLUDES_FCS ; +else + priv->hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS ; + err =iwl_setup_interface (priv, ctx);if (!err || reset) goto out;
drivers/net/wireless/iwlwifi/pcie/tx.c +0 -8
@@ -480,20 +480,12 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,void iwl_trans_pcie_txq_disable (struct iwl_trans *trans,int txq_id) {struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans); -u16 rd_ptr, wr_ptr; -int n_bd = trans_pcie->txq[txq_id].q.n_bd;if (!test_and_clear_bit (txq_id, trans_pcie->queue_used)) {WARN_ONCE (1 ,"queue %d not used" , txq_id);return ; } - rd_ptr =iwl_read_prph (trans,SCD_QUEUE_RDPTR (txq_id)) & (n_bd -1 ); - wr_ptr =iwl_read_prph (trans,SCD_QUEUE_WRPTR (txq_id)); - -WARN_ONCE (rd_ptr != wr_ptr,"queue %d isn't empty: [%d,%d]" , - txq_id, rd_ptr, wr_ptr); -iwl_txq_set_inactive (trans, txq_id);IWL_DEBUG_TX_QUEUES (trans,"Deactivate queue %d\n" , txq_id); }
drivers/net/wireless/mwifiex/cmdevt.c +8 -3
@@ -887,9 +887,6 @@ mwifiex_cmd_timeout_func(unsigned long function_context)return ; } cmd_node = adapter->curr_cmd; -if (cmd_node->wait_q_enabled) - adapter->cmd_wait_q.status = -ETIMEDOUT ; -if (cmd_node) { adapter->dbg.timeout_cmd_id = adapter->dbg.last_cmd_id[adapter->dbg.last_cmd_index];
@@ -935,6 +932,14 @@ mwifiex_cmd_timeout_func(unsigned long function_context)dev_err (adapter->dev,"ps_mode=%d ps_state=%d\n" , adapter->ps_mode, adapter->ps_state); + +if (cmd_node->wait_q_enabled) { + adapter->cmd_wait_q.status = -ETIMEDOUT ; +wake_up_interruptible (&adapter->cmd_wait_q.wait); +mwifiex_cancel_pending_ioctl (adapter); +/* reset cmd_sent flag to unblock new commands */ + adapter->cmd_sent = false; + } }if (adapter->hw_status ==MWIFIEX_HW_STATUS_INITIALIZING )mwifiex_init_fw_complete (adapter);
drivers/net/wireless/mwifiex/sdio.c +6 -5
@@ -161,7 +161,6 @@ static int mwifiex_sdio_suspend(struct device *dev)struct sdio_mmc_card *card;struct mwifiex_adapter *adapter;mmc_pm_flag_t pm_flag =0 ; -int hs_actived =0 ;int i;int ret =0 ;
@@ -188,12 +187,14 @@ static int mwifiex_sdio_suspend(struct device *dev) adapter = card->adapter;/* Enable the Host Sleep */ - hs_actived =mwifiex_enable_hs (adapter); -if (hs_actived) { -pr_debug ("cmd: suspend with MMC_PM_KEEP_POWER\n" ); - ret =sdio_set_host_pm_flags (func,MMC_PM_KEEP_POWER ); +if (!mwifiex_enable_hs (adapter)) { +dev_err (adapter->dev,"cmd: failed to suspend\n" ); +return -EFAULT ; } +dev_dbg (adapter->dev,"cmd: suspend with MMC_PM_KEEP_POWER\n" ); + ret =sdio_set_host_pm_flags (func,MMC_PM_KEEP_POWER ); +/* Indicate device suspended */ adapter->is_suspended = true;
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 -0
@@ -297,6 +297,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {/*=== Customer ID ===*/ /****** 8188CU ********/ {RTL_USB_DEVICE(0x050d, 0x1102, rtl92cu_hal_cfg)}, /*Belkin - Edimax*/ + {RTL_USB_DEVICE(0x050d, 0x11f2, rtl92cu_hal_cfg)}, /*Belkin - ISY*/ {RTL_USB_DEVICE(0x06f8, 0xe033, rtl92cu_hal_cfg)}, /*Hercules - Edimax*/ {RTL_USB_DEVICE(0x07b8, 0x8188, rtl92cu_hal_cfg)}, /*Abocom - Abocom*/ {RTL_USB_DEVICE(0x07b8, 0x8189, rtl92cu_hal_cfg)}, /*Funai - Abocom*/
drivers/nfc/pn533.c +12 -10
@@ -1618,11 +1618,14 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev,static int pn533_in_dep_link_up_complete (struct pn533 *dev,void *arg,u8 *params,int params_len) { -struct pn533_cmd_jump_dep *cmd;struct pn533_cmd_jump_dep_response *resp;struct nfc_target nfc_target;u8 target_gt_len;int rc; +struct pn533_cmd_jump_dep *cmd = (struct pn533_cmd_jump_dep *)arg; +u8 active = cmd->active; + +kfree (arg);if (params_len == -ENOENT ) {nfc_dev_dbg (&dev->interface->dev,"" );
@@ -1644,7 +1647,6 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg, } resp = (struct pn533_cmd_jump_dep_response *) params; - cmd = (struct pn533_cmd_jump_dep *) arg; rc = resp->status &PN533_CMD_RET_MASK ;if (rc !=PN533_CMD_RET_SUCCESS ) { nfc_dev_err(&dev->interface->dev,
@@ -1674,7 +1676,7 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,if (rc ==0 ) rc =nfc_dep_link_is_up (dev->nfc_dev, dev->nfc_dev->targets[0 ].idx, - !cmd->active,NFC_RF_INITIATOR ); + !active,NFC_RF_INITIATOR );return 0 ; }
@@ -1759,12 +1761,8 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target, rc =pn533_send_cmd_frame_async (dev, dev->out_frame, dev->in_frame, dev->in_maxlen, pn533_in_dep_link_up_complete, cmd,GFP_KERNEL ); -if (rc) - goto out; - - -out: -kfree (cmd); +if (rc <0 ) +kfree (cmd);return rc; }
@@ -2018,8 +2016,12 @@ error:static int pn533_tm_send_complete (struct pn533 *dev,void *arg,u8 *params,int params_len) { +struct sk_buff *skb_out = arg; +nfc_dev_dbg (&dev->interface->dev,"%s" , __func__); +dev_kfree_skb (skb_out); +if (params_len <0 ) { nfc_dev_err(&dev->interface->dev, "Error %d when sending data",
@@ -2057,7 +2059,7 @@ static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb) rc =pn533_send_cmd_frame_async (dev, out_frame, dev->in_frame, dev->in_maxlen, pn533_tm_send_complete, -NULL ,GFP_KERNEL ); + skb,GFP_KERNEL );if (rc) {nfc_dev_err (&dev->interface->dev,"Error %d when trying to send data" , rc);
drivers/scsi/isci/request.c +1 -1
@@ -1972,7 +1972,7 @@ sci_io_request_frame_handler(struct isci_request *ireq, frame_index, (void **)&frame_buffer); -sci_controller_copy_sata_response (&ireq->stp.req, +sci_controller_copy_sata_response (&ireq->stp.rsp, frame_header, frame_buffer);
fs/ext4/resize.c +0 -2
@@ -979,8 +979,6 @@ static void update_backups(struct super_block *sb, goto exit_err; } -ext4_superblock_csum_set (sb); -while ((group =ext4_list_backups (sb, &three, &five, &seven)) < last) {struct buffer_head *bh;
fs/fs-writeback.c +2 -0
@@ -228,6 +228,8 @@ static void requeue_io(struct inode *inode, struct bdi_writeback *wb)static void inode_sync_complete (struct inode *inode) { inode->i_state &= ~I_SYNC ; +/* If inode is clean an unused, put it into LRU now... */ +inode_add_lru (inode);/* Waiters must see I_SYNC cleared before being woken up */ smp_mb ();wake_up_bit (&inode->i_state, __I_SYNC);
fs/inode.c +14 -2
@@ -408,6 +408,19 @@ static void inode_lru_list_add(struct inode *inode)spin_unlock (&inode->i_sb->s_inode_lru_lock); } +/* +* Add inode to LRU if needed (inode is unused and clean). +* +* Needs inode->i_lock held. +*/ +void inode_add_lru (struct inode *inode) +{ +if (!(inode->i_state & (I_DIRTY |I_SYNC |I_FREEING |I_WILL_FREE )) && + !atomic_read (&inode->i_count) && inode->i_sb->s_flags &MS_ACTIVE ) +inode_lru_list_add (inode); +} + +static void inode_lru_list_del (struct inode *inode) {spin_lock (&inode->i_sb->s_inode_lru_lock);
@@ -1390,8 +1403,7 @@ static void iput_final(struct inode *inode)if (!drop && (sb->s_flags &MS_ACTIVE )) { inode->i_state |=I_REFERENCED ; -if (!(inode->i_state & (I_DIRTY |I_SYNC ))) -inode_lru_list_add (inode); +inode_add_lru (inode);spin_unlock (&inode->i_lock);return ; }
fs/internal.h +1 -0
@@ -110,6 +110,7 @@ extern int open_check_o_direct(struct file *f);* inode.c */ extern spinlock_t inode_sb_list_lock; +extern void inode_add_lru (struct inode *inode);/* * fs-writeback.c
fs/jbd/transaction.c +2 -0
@@ -1961,7 +1961,9 @@ retry:spin_unlock (&journal->j_list_lock);jbd_unlock_bh_state (bh);spin_unlock (&journal->j_state_lock); +unlock_buffer (bh);log_wait_commit (journal, tid); +lock_buffer (bh); goto retry; }/*
fs/jffs2/file.c +21 -18
@@ -138,33 +138,39 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,struct page *pg;struct inode *inode = mapping->host;struct jffs2_inode_info *f =JFFS2_INODE_INFO (inode); +struct jffs2_sb_info *c =JFFS2_SB_INFO (inode->i_sb); +struct jffs2_raw_inode ri; +uint32_t alloc_len =0 ;pgoff_t index = pos >>PAGE_CACHE_SHIFT ;uint32_t pageofs = index <<PAGE_CACHE_SHIFT ;int ret =0 ; +jffs2_dbg (1 ,"%s()\n" , __func__); + +if (pageofs > inode->i_size) { + ret =jffs2_reserve_space (c,sizeof (ri), &alloc_len, +ALLOC_NORMAL ,JFFS2_SUMMARY_INODE_SIZE ); +if (ret) +return ret; + } + +mutex_lock (&f->sem); pg =grab_cache_page_write_begin (mapping, index, flags); -if (!pg) +if (!pg) { +if (alloc_len) +jffs2_complete_reservation (c); +mutex_unlock (&f->sem);return -ENOMEM ; + } *pagep = pg; -jffs2_dbg (1 ,"%s()\n" , __func__); - -if (pageofs > inode->i_size) { +if (alloc_len) {/* Make new hole frag from old EOF to new page */ -struct jffs2_sb_info *c =JFFS2_SB_INFO (inode->i_sb); -struct jffs2_raw_inode ri;struct jffs2_full_dnode *fn; -uint32_t alloc_len;jffs2_dbg (1 ,"Writing new hole frag 0x%x-0x%x between current EOF and new page\n" , (unsigned int )inode->i_size, pageofs); - ret =jffs2_reserve_space (c,sizeof (ri), &alloc_len, -ALLOC_NORMAL ,JFFS2_SUMMARY_INODE_SIZE ); -if (ret) - goto out_page; - -mutex_lock (&f->sem);memset (&ri,0 ,sizeof (ri)); ri.magic =cpu_to_je16 (JFFS2_MAGIC_BITMASK );
@@ -191,7 +197,6 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,if (IS_ERR (fn)) { ret =PTR_ERR (fn);jffs2_complete_reservation (c); -mutex_unlock (&f->sem); goto out_page; } ret =jffs2_add_full_dnode_to_inode (c, f, fn);
@@ -206,12 +211,10 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,jffs2_mark_node_obsolete (c, fn->raw);jffs2_free_full_dnode (fn);jffs2_complete_reservation (c); -mutex_unlock (&f->sem); goto out_page; }jffs2_complete_reservation (c); inode->i_size = pageofs; -mutex_unlock (&f->sem); }/*
@@ -220,18 +223,18 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,* case of a short-copy. */ if (!PageUptodate (pg)) { -mutex_lock (&f->sem); ret =jffs2_do_readpage_nolock (inode, pg); -mutex_unlock (&f->sem);if (ret) goto out_page; } +mutex_unlock (&f->sem);jffs2_dbg (1 ,"end write_begin(). pg->flags %lx\n" , pg->flags);return ret; out_page:unlock_page (pg);page_cache_release (pg); +mutex_unlock (&f->sem);return ret; }
fs/pstore/ram.c +1 -1
@@ -406,7 +406,7 @@ static int __devinit ramoops_probe(struct platform_device *pdev) goto fail_init_fprz;if (!cxt->przs && !cxt->cprz && !cxt->fprz) { -pr_err ("memory size too small, minimum is %lu\n" , +pr_err ("memory size too small, minimum is %zu\n" , cxt->console_size + cxt->record_size + cxt->ftrace_size); goto fail_cnt;
include/drm/drm_pciids.h +1 -0
@@ -210,6 +210,7 @@ {0x1002, 0x6798, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6799, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x679A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x679B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x679E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x679F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
kernel/futex.c +17 -1
@@ -843,6 +843,9 @@ static void wake_futex(struct futex_q *q) {struct task_struct *p = q->task; +if (WARN (q->pi_state || q->rt_waiter,"refusing to wake PI futex\n" )) +return ; +/* * We set q->lock_ptr = NULL _before_ we wake up the task. If * a non-futex wake up happens on another CPU then the task
@@ -1078,6 +1081,10 @@ retry_private:plist_for_each_entry_safe (this, next, head, list) {if (match_futex (&this->key, &key1)) { +if (this->pi_state || this->rt_waiter) { + ret = -EINVAL ; + goto out_unlock; + }wake_futex (this);if (++ret >= nr_wake)break ;
@@ -1090,6 +1097,10 @@ retry_private: op_ret =0 ;plist_for_each_entry_safe (this, next, head, list) {if (match_futex (&this->key, &key2)) { +if (this->pi_state || this->rt_waiter) { + ret = -EINVAL ; + goto out_unlock; + }wake_futex (this);if (++op_ret >= nr_wake2)break ;
@@ -1098,6 +1109,7 @@ retry_private: ret += op_ret; } +out_unlock:double_unlock_hb (hb1, hb2); out_put_keys:put_futex_key (&key2);
@@ -1387,9 +1399,13 @@ retry_private:/* * FUTEX_WAIT_REQEUE_PI and FUTEX_CMP_REQUEUE_PI should always * be paired with each other and no other futex ops. +* +* We should never be requeueing a futex_q with a pi_state, +* which is awaiting a futex_unlock_pi(). */ if ((requeue_pi && !this->rt_waiter) || - (!requeue_pi && this->rt_waiter)) { + (!requeue_pi && this->rt_waiter) || + this->pi_state) { ret = -EINVAL ;break ; }
kernel/watchdog.c +2 -2
@@ -113,7 +113,7 @@ static unsigned long get_timestamp(int this_cpu)return cpu_clock (this_cpu) >>30LL ;/* 2^30 ~= 10^9 */ } -static unsigned long get_sample_period (void ) +static u64 get_sample_period (void ) {/* * convert watchdog_thresh from seconds to ns
@@ -122,7 +122,7 @@ static unsigned long get_sample_period(void)* and hard thresholds) to increment before the * hardlockup detector generates a warning */ -return get_softlockup_thresh () * (NSEC_PER_SEC /5 ); +return get_softlockup_thresh () * ((u64 )NSEC_PER_SEC /5 ); }/* Commands for resetting the watchdog */
lib/mpi/longlong.h +17 -2
@@ -703,7 +703,14 @@ do { \************** MIPS ***************** ***************************************/ #if defined(__mips__) &&W_TYPE_SIZE ==32 -#if __GNUC__ >2 || __GNUC_MINOR__ >=7 +#if __GNUC__ >=4 && __GNUC_MINOR__ >=4 +#define umul_ppmm (w1, w0, u, v) \ +do { \ + UDItype __ll = (UDItype)(u) * (v); \ + w1 = __ll >> 32; \ + w0 = __ll; \ +} while (0) +#elif __GNUC__ >2 || __GNUC_MINOR__ >=7 #define umul_ppmm (w1, w0, u, v) \ __asm__ ("multu %2,%3" \ : "=l" ((USItype)(w0)), \
@@ -728,7 +735,15 @@ do { \************** MIPS/64 ************** ***************************************/ #if (defined(__mips) && __mips >=3 ) &&W_TYPE_SIZE ==64 -#if __GNUC__ >2 || __GNUC_MINOR__ >=7 +#if __GNUC__ >=4 && __GNUC_MINOR__ >=4 +#define umul_ppmm (w1, w0, u, v) \ +do { \ + typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ + __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ + w1 = __ll >> 64; \ + w0 = __ll; \ +} while (0) +#elif __GNUC__ >2 || __GNUC_MINOR__ >=7 #define umul_ppmm (w1, w0, u, v) \ __asm__ ("dmultu %2,%3" \ : "=l" ((UDItype)(w0)), \
mm/vmscan.c +27 -10
@@ -2176,9 +2176,12 @@ static bool pfmemalloc_watermark_ok(pg_data_t *pgdat)* Throttle direct reclaimers if backing storage is backed by the network * and the PFMEMALLOC reserve for the preferred node is getting dangerously * depleted. kswapd will continue to make progress and wake the processes -* when the low watermark is reached +* when the low watermark is reached. +* +* Returns true if a fatal signal was delivered during throttling. If this +* happens, the page allocator should not consider triggering the OOM killer. */ -static void throttle_direct_reclaim (gfp_t gfp_mask,struct zonelist *zonelist, +static bool throttle_direct_reclaim (gfp_t gfp_mask,struct zonelist *zonelist,nodemask_t *nodemask) {struct zone *zone;
@@ -2193,13 +2196,20 @@ static void throttle_direct_reclaim(gfp_t gfp_mask, struct zonelist *zonelist,* processes to block on log_wait_commit(). */ if (current->flags &PF_KTHREAD ) -return ; + goto out; + +/* +* If a fatal signal is pending, this process should not throttle. +* It should return quickly so it can exit and free its memory +*/ +if (fatal_signal_pending (current)) + goto out;/* Check if the pfmemalloc reserves are ok */ first_zones_zonelist (zonelist, high_zoneidx,NULL , &zone); pgdat = zone->zone_pgdat;if (pfmemalloc_watermark_ok (pgdat)) -return ; + goto out;/* Account for the throttling */ count_vm_event (PGSCAN_DIRECT_THROTTLE );
@@ -2215,12 +2225,20 @@ static void throttle_direct_reclaim(gfp_t gfp_mask, struct zonelist *zonelist,if (!(gfp_mask & __GFP_FS)) {wait_event_interruptible_timeout (pgdat->pfmemalloc_wait,pfmemalloc_watermark_ok (pgdat),HZ ); -return ; + + goto check_pending; }/* Throttle until kswapd wakes the process */ wait_event_killable (zone->zone_pgdat->pfmemalloc_wait,pfmemalloc_watermark_ok (pgdat)); + +check_pending: +if (fatal_signal_pending (current)) +return true; + +out: +return false; } unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
@@ -2242,13 +2260,12 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order, .gfp_mask = sc.gfp_mask, }; -throttle_direct_reclaim (gfp_mask, zonelist, nodemask); -/* -* Do not enter reclaim if fatal signal is pending. 1 is returned so -* that the page allocator does not consider triggering OOM +* Do not enter reclaim if fatal signal was delivered while throttled. +* 1 is returned so that the page allocator does not OOM kill at this +* point. */ -if (fatal_signal_pending (current)) +if (throttle_direct_reclaim (gfp_mask, zonelist, nodemask))return 1 ; trace_mm_vmscan_direct_reclaim_begin(order,
net/can/bcm.c +3 -0
@@ -1084,6 +1084,9 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, op->sk = sk; op->ifindex = ifindex; +/* ifindex for timeout events w/o previous frame reception */ + op->rx_ifindex = ifindex; +/* initialize uninitialized (kzalloc) structure */ hrtimer_init (&op->timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); op->timer.function = bcm_rx_timeout_handler;
net/core/net-sysfs.c +20 -0
@@ -417,6 +417,17 @@ static struct attribute_group netstat_group = { .name = "statistics", .attrs = netstat_attrs, }; + +#if IS_ENABLED (CONFIG_WIRELESS_EXT ) ||IS_ENABLED (CONFIG_CFG80211 ) +static struct attribute *wireless_attrs[] = { +NULL +}; + +static struct attribute_group wireless_group = { + .name ="wireless" , + .attrs = wireless_attrs, +}; +#endif #endif /* CONFIG_SYSFS */ #ifdef CONFIG_RPS
@@ -1397,6 +1408,15 @@ int netdev_register_kobject(struct net_device *net) groups++; *groups++ = &netstat_group; + +#if IS_ENABLED (CONFIG_WIRELESS_EXT ) ||IS_ENABLED (CONFIG_CFG80211 ) +if (net->ieee80211_ptr) + *groups++ = &wireless_group; +#if IS_ENABLED (CONFIG_WIRELESS_EXT ) + else if (net->wireless_handlers) + *groups++ = &wireless_group; +#endif +#endif #endif /* CONFIG_SYSFS */ error =device_add (dev);
net/mac80211/ibss.c +4 -4
@@ -1117,10 +1117,6 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)mutex_lock (&sdata->u.ibss.mtx); - sdata->u.ibss.state =IEEE80211_IBSS_MLME_SEARCH ; -memset (sdata->u.ibss.bssid,0 ,ETH_ALEN ); - sdata->u.ibss.ssid_len =0 ; - active_ibss =ieee80211_sta_active_ibss (sdata);if (!active_ibss && !is_zero_ether_addr (ifibss->bssid)) {
@@ -1141,6 +1137,10 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) } } + ifibss->state =IEEE80211_IBSS_MLME_SEARCH ; +memset (ifibss->bssid,0 ,ETH_ALEN ); + ifibss->ssid_len =0 ; +sta_info_flush (sdata->local, sdata);spin_lock_bh (&ifibss->incomplete_lock);
net/nfc/llcp/llcp.c +1 -1
@@ -1190,7 +1190,7 @@ int nfc_llcp_register_device(struct nfc_dev *ndev) local->remote_miu =LLCP_DEFAULT_MIU ; local->remote_lto =LLCP_DEFAULT_LTO ; -list_add (&llcp_devices, &local->list); +list_add (&local->list, &llcp_devices);return 0 ;
sound/pci/hda/patch_cirrus.c +1 -0
@@ -461,6 +461,7 @@ static int parse_output(struct hda_codec *codec)memcpy (cfg->speaker_pins, cfg->line_out_pins,sizeof (cfg->speaker_pins)); cfg->line_outs =0 ; +memset (cfg->line_out_pins,0 ,sizeof (cfg->line_out_pins)); }return 0 ;
sound/pci/hda/patch_realtek.c +4 -0
@@ -4280,6 +4280,7 @@ static void alc_auto_init_std(struct hda_codec *codec) ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 3, idx, dir))static const struct snd_pci_quirk beep_white_list[] = { +SND_PCI_QUIRK (0x1043 ,0x103c ,"ASUS" ,1 ),SND_PCI_QUIRK (0x1043 ,0x829f ,"ASUS" ,1 ),SND_PCI_QUIRK (0x1043 ,0x83ce ,"EeePC" ,1 ),SND_PCI_QUIRK (0x1043 ,0x831a ,"EeePC" ,1 ),
@@ -7089,6 +7090,9 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = { { .id = 0x10ec0276, .name = "ALC276", .patch = patch_alc269 }, { .id = 0x10ec0280, .name = "ALC280", .patch = patch_alc269 }, { .id = 0x10ec0282, .name = "ALC282", .patch = patch_alc269 }, + { .id = 0x10ec0283, .name = "ALC283", .patch = patch_alc269 }, + { .id = 0x10ec0290, .name = "ALC290", .patch = patch_alc269 }, + { .id = 0x10ec0292, .name = "ALC292", .patch = patch_alc269 }, { .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660", .patch = patch_alc861 }, { .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },
sound/usb/midi.c +6 -2
@@ -148,6 +148,7 @@ struct snd_usb_midi_out_endpoint {struct snd_usb_midi_out_endpoint * ep;struct snd_rawmidi_substream *substream;int active; +bool autopm_reference;uint8_t cable;/* cable number << 4 */ uint8_t state;#define STATE_UNKNOWN 0
@@ -1076,7 +1077,8 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)return -ENXIO ; } err =usb_autopm_get_interface (umidi->iface); -if (err <0 ) + port->autopm_reference = err >=0 ; +if (err <0 && err != -EACCES )return -EIO ; substream->runtime->private_data = port; port->state =STATE_UNKNOWN ;
@@ -1087,9 +1089,11 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)static int snd_usbmidi_output_close (struct snd_rawmidi_substream *substream) {struct snd_usb_midi * umidi = substream->rmidi->private_data; +struct usbmidi_out_port *port = substream->runtime->private_data;substream_open (substream,0 ); -usb_autopm_put_interface (umidi->iface); +if (port->autopm_reference) +usb_autopm_put_interface (umidi->iface);return 0 ; }