Linux 3.10.2
Greg KH
maintainerI'm announcing the release of the 3.10.2 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.10.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/parisc/registers | 8 ++ Makefile | 2 arch/arm/boot/dts/imx23.dtsi | 8 +- arch/arm/boot/dts/imx28.dtsi | 8 +- arch/arm/boot/dts/imx6dl.dtsi | 2 arch/arm/boot/dts/imx6q.dtsi | 4 + arch/arm/include/asm/mmu_context.h | 10 ++- arch/arm/kernel/perf_event.c | 1 arch/arm/kernel/smp_tlb.c | 18 ----- arch/arm/kernel/smp_twd.c | 2 arch/arm/mach-shmobile/setup-emev2.c | 8 +- arch/arm/mach-shmobile/setup-r8a73a4.c | 2 arch/arm/mm/context.c | 55 +++++++++++++--- arch/arm/mm/init.c | 2 arch/c6x/mm/init.c | 1 arch/parisc/include/asm/special_insns.h | 9 +- arch/parisc/include/asm/tlbflush.h | 5 - arch/parisc/kernel/cache.c | 2 arch/parisc/lib/memcpy.c | 79 +++++++++++++++--------- arch/x86/boot/compressed/eboot.c | 20 +++++- arch/x86/xen/time.c | 17 ----- drivers/acpi/Makefile | 1 drivers/acpi/acpi_cmos_rtc.c | 92 ++++++++++++++++++++++++++++ drivers/acpi/acpica/hwxfsleep.c | 8 +- drivers/acpi/device_pm.c | 23 +++++-- drivers/acpi/ec.c | 4 + drivers/acpi/internal.h | 5 + drivers/acpi/scan.c | 1 drivers/ata/ahci.c | 2 drivers/ata/libahci.c | 3 drivers/block/nbd.c | 7 +- drivers/dma/pl330.c | 4 - drivers/hid/hid-apple.c | 6 + drivers/hid/hid-core.c | 6 + drivers/hid/hid-ids.h | 3 drivers/hv/ring_buffer.c | 10 +-- drivers/hv/vmbus_drv.c | 2 drivers/input/mouse/bcm5974.c | 36 ++++++++++ drivers/net/wireless/iwlwifi/pcie/tx.c | 13 +++ drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 6 - drivers/parisc/lba_pci.c | 56 +++++++++++++++++ drivers/pci/iov.c | 5 - drivers/pci/probe.c | 14 ++-- drivers/pci/quirks.c | 2 drivers/pci/xen-pcifront.c | 7 -- drivers/pcmcia/at91_cf.c | 4 - drivers/rtc/rtc-rv3029c2.c | 2 drivers/tty/serial/pch_uart.c | 5 + drivers/usb/gadget/f_mass_storage.c | 2 drivers/usb/host/ehci-omap.c | 11 ++- drivers/usb/host/xhci-mem.c | 4 + drivers/usb/host/xhci-plat.c | 1 drivers/usb/serial/option.c | 4 - drivers/usb/serial/qcserial.c | 8 ++ fs/btrfs/ctree.c | 13 ++- fs/btrfs/send.c | 35 ++++++++++ fs/cifs/cifs_unicode.h | 8 +- fs/cifs/cifsencrypt.c | 6 - fs/cifs/file.c | 9 +- fs/cifs/inode.c | 5 + fs/ext3/namei.c | 7 -- fs/ext4/balloc.c | 4 - fs/ext4/extents.c | 4 - fs/ext4/file.c | 14 ++-- fs/ext4/inline.c | 2 fs/ext4/inode.c | 15 ++-- fs/ext4/mballoc.c | 11 ++- fs/ext4/namei.c | 7 -- fs/ext4/resize.c | 4 - fs/ext4/super.c | 14 +--- fs/jbd2/journal.c | 3 fs/jbd2/transaction.c | 2 fs/ocfs2/xattr.c | 10 +++ fs/ubifs/super.c | 2 include/linux/cgroup.h | 58 ++++++++++++++--- include/linux/nbd.h | 1 kernel/cgroup.c | 25 +++++-- kernel/irq/manage.c | 6 - kernel/timer.c | 8 +- mm/memcontrol.c | 8 -- mm/page_alloc.c | 4 + mm/slab.c | 2 84 files changed, 675 insertions(+), 235 deletions(-)
Al Viro (1):
ext3,ext4: don't mess with dir_file->f_pos in htree_dirblock_to_tree()
Axel Lin (1):
drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq
Bart Van Assche (1):
timer: Fix jiffies wrap behavior of round_jiffies_common()
Bartlomiej Zolnierkiewicz (1):
drivers/dma/pl330.c: fix locking in pl330_free_chan_resources()
Ben Hutchings (1):
genirq: Fix can_request_irq() for IRQs without an action
Chen Gang (1):
arch: c6x: mm: include "asm/uaccess.h" to pass compiling
Christoph Lameter (1):
slab: fix init_lock_keys
Dan Williams (1):
USB: option,qcserial: move Novatel Gobi1K IDs to qcserial
Darren Hart (1):
pch_uart: Add uart_clk selection for the MinnowBoard
Dmitry Torokhov (2):
HID: apple: Add support for the 2013 Macbook Air
Input: bcm5974 - add support for the 2013 MacBook Air
Emmanuel Grumbach (2):
iwlwifi: pcie: fix race in queue unmapping
iwlwifi: pcie: wake the queue if stopped when being unmapped
George Cherian (1):
usb: host: xhci-plat: release mem region while removing module
Greg Kroah-Hartman (1):
Linux 3.10.2
Helge Deller (4):
parisc: document the shadow registers
parisc: Fix gcc miscompilation in pa_memcpy()
parisc: fix LMMIO mismatch between PAT length and MASK register
parisc: optimize mtsp(0,sr) inline assembly
Jan Kara (4):
ext4: fix data offset overflow on 32-bit archs in ext4_inline_data_fiemap()
ext4: fix overflows in SEEK_HOLE, SEEK_DATA implementations
ext4: fix data offset overflow in ext4_xattr_fiemap() on 32-bit archs
ext4: fix overflow when counting used blocks on 32-bit architectures
Jason Liu (1):
ARM: 7778/1: smp_twd: twd_update_frequency need be run on all online CPUs
Jason Wang (1):
drivers: hv: switch to use mb() instead of smp_mb()
Jed Davis (1):
ARM: 7765/1: perf: Record the user-mode PC in the call chain.
Jiang Liu (1):
PCI: Fix refcount issue in pci_create_root_bus() error recovery path
Joachim Eastwood (1):
pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status
John David Anglin (1):
parisc: Ensure volatile space register %sr1 is not clobbered
Josef Bacik (3):
Btrfs: fix estale with btrfs send
Btrfs: hold the tree mod lock in __tree_mod_log_rewind
Btrfs: only do the tree_mod_log_free_eb if this is our last ref
Junxiao Bi (1):
ocfs2: xattr: fix inlined xattr reflink
Konrad Rzeszutek Wilk (1):
xen/pcifront: Deal with toolstack missing 'XenbusStateClosing' state.
Lan Tianyu (2):
ACPI: Add CMOS RTC Operation Region handler support
ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan
Larry Finger (3):
rtlwifi: rtl8192cu: Add new USB ID for TP-Link TL-WN8200ND
rtlwifi: rtl8723ae: Fix typo in firmware names
rtlwifi: rtl8192cu: Fix duplicate if test
Laszlo Ersek (1):
xen/time: remove blocked time accounting from xen "clockchip"
Li Zefan (1):
cgroup: fix umount vs cgroup_event_remove() race
Lorenzo Pieralisi (1):
ARM: dts: imx: cpus/cpu nodes dts updates
Lv Zheng (1):
ACPICA: Do not use extended sleep registers unless HW-reduced bit is set
Maarten ter Huurne (1):
ext4: fix corruption when online resizing a fs with 1K block size
Magnus Damm (1):
ARM: shmobile: emev2 GIO3 resource fix
Marc Zyngier (3):
ARM: 7767/1: let the ASID allocator handle suspended animation
ARM: 7768/1: prevent risks of out-of-bound access in ASID allocator
ARM: 7769/1: Cortex-A15: fix erratum 798181 implementation
Mathias Nyman (1):
xhci: check for failed dma pool allocation
Michal Hocko (1):
memcg, kmem: fix reference count handling on the error path
Paul Clements (1):
nbd: correct disconnect behavior
Pavel Shilovsky (1):
CIFS: Fix a deadlock when a file is reopened
Rafael J. Wysocki (1):
ACPI / PM: Fix corner case in acpi_bus_update_power()
Richard Genoud (1):
UBIFS: correct mount message
Roger Quadros (1):
USB: ehci-omap: Tweak PHY initialization sequence
Russell King (1):
ARM: mm: fix boot on SA1110 Assabet
Seth Heasley (1):
ahci: AHCI-mode SATA patch for Intel Coleto Creek DeviceIDs
Shane Huang (2):
ahci: Add AMD CZ SATA device ID
ahci: remove pmp link online check in FBS EH
Steve French (2):
CIFS use sensible file nlink values if unprovided Handle big endianness in NTLM (ntlmv2) authentication
Takanari Hayama (1):
ARM: shmobile: r8a73a4: Fix resources for SCIFB0
Tejun Heo (1):
cgroup: fix RCU accesses to task->cgroups
Theodore Ts'o (6):
jbd2: move superblock checksum calculation to jbd2_write_superblock()
jbd2: fix theoretical race in jbd2__journal_restart
ext4: check error return from ext4_write_inline_data_end()
ext4: fix ext4_get_group_number()
ext4: don't show usrquota/grpquota twice in /proc/mounts
ext4: don't allow ext4_free_blocks() to fail due to ENOMEM
UCHINO Satoshi (1):
usb: gadget: f_mass_storage: add missing memory barrier for thread_wakeup_needed
Wanpeng Li (1):
mm/memory-hotplug: fix lowmem count overflow when offline pages
Xudong Hao (1):
PCI: Finish SR-IOV VF setup before adding the device
Zach Bobroff (1):
x86, efi: retry ExitBootServices() on failure
Greg KH
maintainerDocumentation/parisc/registers +8 -0
@@ -78,6 +78,14 @@ Shadow Registers used by interruption handler code TOC enable bit 1 ========================================================================= + +The PA-RISC architecture defines 7 registers as "shadow registers". +Those are used in RETURN FROM INTERRUPTION AND RESTORE instruction to reduce +the state save and restore time by eliminating the need for general register +(GR) saves and restores in interruption handlers. +Shadow registers are the GRs 1, 8, 9, 16, 17, 24, and 25. + +========================================================================= Register usage notes, originally from John Marvin, with some additional notes from Randolph Chung.
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = NAME = Unicycling Gorilla
arch/arm/boot/dts/imx23.dtsi +6 -2
@@ -23,8 +23,12 @@ }; cpus { - cpu@0 { - compatible = "arm,arm926ejs"; + #address-cells = <0>; + #size-cells = <0>; + + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; }; };
arch/arm/boot/dts/imx28.dtsi +6 -2
@@ -32,8 +32,12 @@ }; cpus { - cpu@0 { - compatible = "arm,arm926ejs"; + #address-cells = <0>; + #size-cells = <0>; + + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; }; };
arch/arm/boot/dts/imx6dl.dtsi +2 -0
@@ -18,12 +18,14 @@ cpu@0 { compatible = "arm,cortex-a9"; + device_type = "cpu"; reg = <0>; next-level-cache = <&L2>; }; cpu@1 { compatible = "arm,cortex-a9"; + device_type = "cpu"; reg = <1>; next-level-cache = <&L2>; };
arch/arm/boot/dts/imx6q.dtsi +4 -0
@@ -18,6 +18,7 @@ cpu@0 { compatible = "arm,cortex-a9"; + device_type = "cpu"; reg = <0>; next-level-cache = <&L2>; operating-points = <
@@ -39,18 +40,21 @@ cpu@1 { compatible = "arm,cortex-a9"; + device_type = "cpu"; reg = <1>; next-level-cache = <&L2>; }; cpu@2 { compatible = "arm,cortex-a9"; + device_type = "cpu"; reg = <2>; next-level-cache = <&L2>; }; cpu@3 { compatible = "arm,cortex-a9"; + device_type = "cpu"; reg = <3>; next-level-cache = <&L2>; };
arch/arm/include/asm/mmu_context.h +9 -1
@@ -27,7 +27,15 @@ void __check_vmalloc_seq(struct mm_struct *mm);void check_and_switch_context (struct mm_struct *mm,struct task_struct *tsk);#define init_new_context (tsk,mm) ({ atomic64_set(&mm->context.id, 0); 0; }) -DECLARE_PER_CPU (atomic64_t, active_asids); +#ifdef CONFIG_ARM_ERRATA_798181 +void a15_erratum_get_cpumask (int this_cpu,struct mm_struct *mm, +cpumask_t *mask); +#else /* !CONFIG_ARM_ERRATA_798181 */ +static inline void a15_erratum_get_cpumask (int this_cpu,struct mm_struct *mm, +cpumask_t *mask) +{ +} +#endif /* CONFIG_ARM_ERRATA_798181 */ #else /* !CONFIG_CPU_HAS_ASID */
arch/arm/kernel/perf_event.c +1 -0
@@ -569,6 +569,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)return ; } +perf_callchain_store (entry, regs->ARM_pc); tail = (struct frame_tail __user *)regs->ARM_fp -1 ; while ((entry->nr < PERF_MAX_STACK_DEPTH) &&
arch/arm/kernel/smp_tlb.c +2 -16
@@ -103,7 +103,7 @@ static void broadcast_tlb_a15_erratum(void)static void broadcast_tlb_mm_a15_erratum (struct mm_struct *mm) { -int cpu, this_cpu; +int this_cpu;cpumask_t mask = {CPU_BITS_NONE };if (!erratum_a15_798181 ())
@@ -111,21 +111,7 @@ static void broadcast_tlb_mm_a15_erratum(struct mm_struct *mm)dummy_flush_tlb_a15_erratum (); this_cpu =get_cpu (); -for_each_online_cpu (cpu) { -if (cpu == this_cpu) -continue ; -/* -* We only need to send an IPI if the other CPUs are running -* the same ASID as the one being invalidated. There is no -* need for locking around the active_asids check since the -* switch_mm() function has at least one dmb() (as required by -* this workaround) in case a context switch happens on -* another CPU after the condition below. -*/ -if (atomic64_read (&mm->context.id) == -atomic64_read (&per_cpu (active_asids, cpu))) -cpumask_set_cpu (cpu, &mask); - } +a15_erratum_get_cpumask (this_cpu, mm, &mask);smp_call_function_many (&mask, ipi_flush_tlb_a15_erratum,NULL ,1 );put_cpu (); }
arch/arm/kernel/smp_twd.c +1 -1
@@ -120,7 +120,7 @@ static int twd_rate_change(struct notifier_block *nb,* changing cpu. */ if (flags ==POST_RATE_CHANGE ) -smp_call_function (twd_update_frequency, +on_each_cpu (twd_update_frequency, (void *)&cnd->new_rate,1 );return NOTIFY_OK ;
arch/arm/mach-shmobile/setup-emev2.c +4 -4
@@ -287,14 +287,14 @@ static struct gpio_em_config gio3_config = {static struct resource gio3_resources[] = { [0 ] = { .name ="GIO_096" , - .start =0xe0050100 , - .end =0xe005012b , + .start =0xe0050180 , + .end =0xe00501ab , .flags =IORESOURCE_MEM , }, [1 ] = { .name ="GIO_096" , - .start =0xe0050140 , - .end =0xe005015f , + .start =0xe00501c0 , + .end =0xe00501df , .flags =IORESOURCE_MEM , }, [2 ] = {
arch/arm/mach-shmobile/setup-r8a73a4.c +1 -1
@@ -62,7 +62,7 @@ enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFB3 };static const struct plat_sci_port scif[] = {SCIFA_DATA (SCIFA0 ,0xe6c40000 ,gic_spi (144 )),/* SCIFA0 */ SCIFA_DATA (SCIFA1 ,0xe6c50000 ,gic_spi (145 )),/* SCIFA1 */ -SCIFB_DATA (SCIFB0 ,0xe6c50000 ,gic_spi (145 )),/* SCIFB0 */ +SCIFB_DATA (SCIFB0 ,0xe6c20000 ,gic_spi (148 )),/* SCIFB0 */ SCIFB_DATA (SCIFB1 ,0xe6c30000 ,gic_spi (149 )),/* SCIFB1 */ SCIFB_DATA (SCIFB2 ,0xe6ce0000 ,gic_spi (150 )),/* SCIFB2 */ SCIFB_DATA (SCIFB3 ,0xe6cf0000 ,gic_spi (151 )),/* SCIFB3 */
arch/arm/mm/context.c +45 -10
88 lines not on this page · raw message
arch/arm/mm/init.c +1 -1
@@ -600,7 +600,7 @@ void __init mem_init(void)#ifdef CONFIG_SA1111 /* now that our DMA memory is actually so designated, we can free it */ -free_reserved_area (__va (PHYS_PFN_OFFSET ), swapper_pg_dir,0 ,NULL ); +free_reserved_area (__va (PHYS_OFFSET ), swapper_pg_dir,0 ,NULL );#endif free_highpages ();
arch/c6x/mm/init.c +1 -0
@@ -18,6 +18,7 @@#include <linux/initrd.h> #include <asm/sections.h> +#include <asm/uaccess.h> /* * ZERO_PAGE is a special page that is used for zero-initialized
arch/parisc/include/asm/special_insns.h +6 -3
@@ -32,9 +32,12 @@ static inline void set_eiem(unsigned long val) cr; \ }) -#define mtsp(gr, cr) \ - __asm__ __volatile__("mtsp %0,%1" \ +#define mtsp(val, cr) \ + { if (__builtin_constant_p(val) && ((val) == 0)) \ + __asm__ __volatile__("mtsp %%r0,%0" : : "i" (cr) : "memory"); \ + else \ + __asm__ __volatile__("mtsp %0,%1" \ : /* no outputs */ \ - : "r" (gr), "i" (cr) : "memory") + : "r" (val), "i" (cr) : "memory"); }#endif /* __PARISC_SPECIAL_INSNS_H */
arch/parisc/include/asm/tlbflush.h +3 -2
@@ -63,13 +63,14 @@ static inline void flush_tlb_mm(struct mm_struct *mm)static inline void flush_tlb_page (struct vm_area_struct *vma,unsigned long addr) { -unsigned long flags; +unsigned long flags, sid;/* For one page, it's not worth testing the split_tlb variable */ mb (); -mtsp (vma->vm_mm->context,1 ); + sid = vma->vm_mm->context;purge_tlb_start (flags); +mtsp (sid,1 );pdtlb (addr);pitlb (addr);purge_tlb_end (flags);
arch/parisc/kernel/cache.c +1 -1
@@ -440,8 +440,8 @@ void __flush_tlb_range(unsigned long sid, unsigned long start,else {unsigned long flags; -mtsp (sid,1 );purge_tlb_start (flags); +mtsp (sid,1 );if (split_tlb) {while (npages--) {pdtlb (start);
arch/parisc/lib/memcpy.c +50 -29
154 lines not on this page · raw message
arch/x86/boot/compressed/eboot.c +17 -3
@@ -992,18 +992,20 @@ static efi_status_t exit_boot(struct boot_params *boot_params,efi_memory_desc_t *mem_map;efi_status_t status;__u32 desc_version; +bool called_exit = false;u8 nr_entries;int i; size =sizeof (*mem_map) *32 ; again: - size +=sizeof (*mem_map); + size +=sizeof (*mem_map) *2 ; _size = size; status =low_alloc (size,1 , (unsigned long *)&mem_map);if (status !=EFI_SUCCESS )return status; +get_map: status =efi_call_phys5 (sys_table->boottime->get_memory_map, &size, mem_map, &key, &desc_size, &desc_version);if (status ==EFI_BUFFER_TOO_SMALL ) {
@@ -1029,8 +1031,20 @@ again:/* Might as well exit boot services now */ status =efi_call_phys2 (sys_table->boottime->exit_boot_services, handle, key); -if (status !=EFI_SUCCESS ) - goto free_mem_map; +if (status !=EFI_SUCCESS ) { +/* +* ExitBootServices() will fail if any of the event +* handlers change the memory map. In which case, we +* must be prepared to retry, but only once so that +* we're guaranteed to exit on repeated failures instead +* of spinning forever. +*/ +if (called_exit) + goto free_mem_map; + + called_exit = true; + goto get_map; + }/* Historic? */ boot_params->alt_mem_k =32 *1024 ;
arch/x86/xen/time.c +2 -15
@@ -36,9 +36,8 @@ static DEFINE_PER_CPU(struct vcpu_runstate_info, xen_runstate);/* snapshots of runstate info */ static DEFINE_PER_CPU(struct vcpu_runstate_info, xen_runstate_snapshot); -/* unused ns of stolen and blocked time */ +/* unused ns of stolen time */ static DEFINE_PER_CPU(u64, xen_residual_stolen); -static DEFINE_PER_CPU(u64, xen_residual_blocked);/* return an consistent snapshot of 64-bit time/counter value */ static u64 get64 (const u64 *p)
@@ -115,7 +114,7 @@ static void do_stolen_accounting(void) {struct vcpu_runstate_info state;struct vcpu_runstate_info *snap; -s64 blocked, runnable, offline, stolen; +s64 runnable, offline, stolen;cputime_t ticks;get_runstate_snapshot (&state);
@@ -125,7 +124,6 @@ static void do_stolen_accounting(void) snap = &__get_cpu_var (xen_runstate_snapshot);/* work out how much time the VCPU has not been runn*ing* */ - blocked = state.time[RUNSTATE_blocked] - snap->time[RUNSTATE_blocked]; runnable = state.time[RUNSTATE_runnable] - snap->time[RUNSTATE_runnable]; offline = state.time[RUNSTATE_offline] - snap->time[RUNSTATE_offline];
@@ -141,17 +139,6 @@ static void do_stolen_accounting(void) ticks =iter_div_u64_rem (stolen,NS_PER_TICK , &stolen);__this_cpu_write (xen_residual_stolen, stolen);account_steal_ticks (ticks); - -/* Add the appropriate number of ticks of blocked time, -including any left-overs from last time. */ - blocked +=__this_cpu_read (xen_residual_blocked); - -if (blocked <0 ) - blocked =0 ; - - ticks =iter_div_u64_rem (blocked,NS_PER_TICK , &blocked); -__this_cpu_write (xen_residual_blocked, blocked); -account_idle_ticks (ticks); }/* Get the TSC speed from Xen */
drivers/acpi/Makefile +1 -0
@@ -43,6 +43,7 @@ acpi-y += acpi_platform.o acpi-y += power.o acpi-y += event.o acpi-y += sysfs.o +acpi-$(CONFIG_X86) += acpi_cmos_rtc.o acpi-$(CONFIG_DEBUG_FS) += debugfs.o acpi-$(CONFIG_ACPI_NUMA) += numa.o acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
drivers/acpi/acpi_cmos_rtc.c new file +92 -0
92 lines not on this page · raw message
drivers/acpi/acpica/hwxfsleep.c +5 -3
@@ -240,12 +240,14 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id) &acpi_sleep_dispatch[function_id];#if (!ACPI_REDUCED_HARDWARE ) -/* * If the Hardware Reduced flag is set (from the FADT), we must -* use the extended sleep registers +* use the extended sleep registers (FADT). Note: As per the ACPI +* specification, these extended registers are to be used for HW-reduced +* platforms only. They are not general-purpose replacements for the +* legacy PM register sleep support. */ -if (acpi_gbl_reduced_hardware || acpi_gbl_FADT.sleep_control.address) { +if (acpi_gbl_reduced_hardware) { status = sleep_functions->extended_function (sleep_state); }else {/* Legacy sleep */
drivers/acpi/device_pm.c +18 -5
@@ -324,14 +324,27 @@ int acpi_bus_update_power(acpi_handle handle, int *state_p)if (result)return result; -if (state ==ACPI_STATE_UNKNOWN ) +if (state ==ACPI_STATE_UNKNOWN ) { state =ACPI_STATE_D0 ; - - result =acpi_device_set_power (device, state); -if (!result && state_p) + result =acpi_device_set_power (device, state); +if (result) +return result; + }else { +if (device->power.flags.power_resources) { +/* +* We don't need to really switch the state, bu we need +* to update the power resources' reference counters. +*/ + result =acpi_power_transition (device, state); +if (result) +return result; + } + device->power.state = state; + } +if (state_p) *state_p = state; -return result; +return 0 ; }EXPORT_SYMBOL_GPL (acpi_bus_update_power);
drivers/acpi/ec.c +4 -0
@@ -983,6 +983,10 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { ec_enlarge_storm_threshold, "CLEVO hardware", {DMI_MATCH (DMI_SYS_VENDOR ,"CLEVO Co." ), DMI_MATCH(DMI_PRODUCT_NAME, "M720T/M730T"),}, NULL}, + { + ec_skip_dsdt_scan, "HP Folio 13", { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13"),}, NULL}, {}, };
drivers/acpi/internal.h +5 -0
@@ -50,6 +50,11 @@ void acpi_memory_hotplug_init(void);#else static inline void acpi_memory_hotplug_init (void ) {}#endif +#ifdef CONFIG_X86 +void acpi_cmos_rtc_init (void ); +#else +static inline void acpi_cmos_rtc_init (void ) {} +#endif void acpi_sysfs_add_hotplug_profile (struct acpi_hotplug_profile *hotplug,const char *name);
drivers/acpi/scan.c +1 -0
@@ -2040,6 +2040,7 @@ int __init acpi_scan_init(void)acpi_pci_link_init ();acpi_platform_init ();acpi_lpss_init (); +acpi_cmos_rtc_init ();acpi_container_init ();acpi_memory_hotplug_init ();acpi_dock_init ();
drivers/ata/ahci.c +2 -0
@@ -291,6 +291,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x8d64), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x8d66), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x8d6e), board_ahci }, /* Wellsburg RAID */ + { PCI_VDEVICE(INTEL, 0x23a3), board_ahci }, /* Coleto Creek AHCI *//* JMicron 360/1/3/5/6, match class to avoid IDE function */ { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -310,6 +311,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {/* AMD */ { PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */ + { PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ *//* AMD is using RAID class only for ahci controllers */ { PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci },
drivers/ata/libahci.c +1 -2
@@ -1560,8 +1560,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)u32 fbs =readl (port_mmio +PORT_FBS );int pmp = fbs >>PORT_FBS_DWE_OFFSET ; -if ((fbs &PORT_FBS_SDE ) && (pmp < ap->nr_pmp_links) && -ata_link_online (&ap->pmp_link[pmp])) { +if ((fbs &PORT_FBS_SDE ) && (pmp < ap->nr_pmp_links)) { link = &ap->pmp_link[pmp]; fbs_need_dec = true; }
drivers/block/nbd.c +6 -1
@@ -623,8 +623,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,if (!nbd->sock)return -EINVAL ; + nbd->disconnect =1 ; +nbd_send_req (nbd, &sreq); -return 0 ; +return 0 ; }case NBD_CLEAR_SOCK : {
@@ -654,6 +656,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, nbd->sock =SOCKET_I (inode);if (max_part >0 ) bdev->bd_invalidated =1 ; + nbd->disconnect =0 ;/* we're connected now */ return 0 ; }else {fput (file);
@@ -743,6 +746,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,set_capacity (nbd->disk,0 );if (max_part >0 )ioctl_by_bdev (bdev,BLKRRPART ,0 ); +if (nbd->disconnect)/* user requested, ignore socket errors */ +return 0 ;return nbd->harderror; }
drivers/dma/pl330.c +2 -2
@@ -2485,10 +2485,10 @@ static void pl330_free_chan_resources(struct dma_chan *chan)struct dma_pl330_chan *pch =to_pchan (chan);unsigned long flags; -spin_lock_irqsave (&pch->lock, flags); -tasklet_kill (&pch->task); +spin_lock_irqsave (&pch->lock, flags); +pl330_release_channel (pch->pl330_chid); pch->pl330_chid =NULL ;
drivers/hid/hid-apple.c +6 -0
@@ -524,6 +524,12 @@ static const struct hid_device_id apple_devices[] = { .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS), .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI), + .driver_data = APPLE_HAS_FN }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ISO), + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS), + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
drivers/hid/hid-core.c +6 -0
@@ -1547,6 +1547,9 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
@@ -2179,6 +2182,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { }
drivers/hid/hid-ids.h +3 -0
@@ -135,6 +135,9 @@#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI 0x0255#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0291 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0292 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0293#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b#define USB_DEVICE_ID_APPLE_IRCONTROL 0x8240
drivers/hv/ring_buffer.c +5 -5
@@ -32,7 +32,7 @@void hv_begin_read (struct hv_ring_buffer_info *rbi) { rbi->ring_buffer->interrupt_mask =1 ; -smp_mb (); +mb (); }u32 hv_end_read (struct hv_ring_buffer_info *rbi)
@@ -41,7 +41,7 @@ u32 hv_end_read(struct hv_ring_buffer_info *rbi)u32 write; rbi->ring_buffer->interrupt_mask =0 ; -smp_mb (); +mb ();/* * Now check to see if the ring buffer is still empty.
@@ -71,7 +71,7 @@ u32 hv_end_read(struct hv_ring_buffer_info *rbi)static bool hv_need_to_signal (u32 old_write,struct hv_ring_buffer_info *rbi) { -smp_mb (); +mb ();if (rbi->ring_buffer->interrupt_mask)return false;
@@ -442,7 +442,7 @@ int hv_ringbuffer_write(struct hv_ring_buffer_info *outring_info, sizeof(u64));/* Issue a full memory barrier before updating the write index */ -smp_mb (); +mb ();/* Now, update the write location */ hv_set_next_write_location (outring_info, next_write_location);
@@ -549,7 +549,7 @@ int hv_ringbuffer_read(struct hv_ring_buffer_info *inring_info, void *buffer,/* Make sure all reads are done before we update the read index since */ /* the writer may start writing to the read area once the read index */ /*is updated */ -smp_mb (); +mb ();/* Update the read index */ hv_set_next_read_location (inring_info, next_read_location);
drivers/hv/vmbus_drv.c +1 -1
@@ -434,7 +434,7 @@ static void vmbus_on_msg_dpc(unsigned long data)* will not deliver any more messages since there is * no empty slot */ -smp_mb (); +mb ();if (msg->header.message_flags.msg_pending) {/*
drivers/input/mouse/bcm5974.c +34 -2
@@ -88,6 +88,10 @@#define USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI 0x0259#define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a#define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b +/* MacbookAir6,2 (unibody, June 2013) */ +#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0291 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0292 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0293#define BCM5974_DEVICE (prod) { \ .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
@@ -145,6 +149,10 @@ static const struct usb_device_id bcm5974_table[] = {BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI ),BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO ),BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS ), +/* MacbookAir6,2 */ +BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI ), +BCM5974_DEVICE (USB_DEVICE_ID_APPLE_WELLSPRING8_ISO ), + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_JIS), /* Terminating entry */ {} };
@@ -172,15 +180,18 @@ struct bt_data {/* trackpad header types */ enum tp_type {TYPE1 ,/* plain trackpad */ -TYPE2 /* button integrated in trackpad */ +TYPE2 ,/* button integrated in trackpad */ +TYPE3 /* additional header fields since June 2013 */ };/* trackpad finger data offsets, le16-aligned */ #define FINGER_TYPE1 (13 * sizeof(__le16))#define FINGER_TYPE2 (15 * sizeof(__le16)) +#define FINGER_TYPE3 (19 * sizeof(__le16))/* trackpad button data offsets */ #define BUTTON_TYPE2 15 +#define BUTTON_TYPE3 23/* list of device capability bits */ #define HAS_INTEGRATED_BUTTON 1
@@ -400,6 +411,19 @@ static const struct bcm5974_config bcm5974_config_table[] = { { SN_COORD, -150, 6730 }, { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION } }, + { +USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI , +USB_DEVICE_ID_APPLE_WELLSPRING8_ISO , +USB_DEVICE_ID_APPLE_WELLSPRING8_JIS , +HAS_INTEGRATED_BUTTON , +0 ,sizeof (struct bt_data ), +0x83 ,TYPE3 ,FINGER_TYPE3 ,FINGER_TYPE3 +SIZEOF_ALL_FINGERS , + { SN_PRESSURE, 0, 300 }, + { SN_WIDTH, 0, 2048 }, + { SN_COORD, -4620, 5140 }, + { SN_COORD, -150, 6600 }, + { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION } + }, {} };
@@ -557,6 +581,9 @@ static int report_tp_state(struct bcm5974 *dev, int size)input_report_key (input,BTN_LEFT , ibt); } +if (c->tp_type ==TYPE3 ) +input_report_key (input,BTN_LEFT , dev->tp_data[BUTTON_TYPE3 ]); +input_sync (input);return 0 ;
@@ -572,9 +599,14 @@ static int report_tp_state(struct bcm5974 *dev, int size)static int bcm5974_wellspring_mode (struct bcm5974 *dev,bool on) { -char *data =kmalloc (8 ,GFP_KERNEL );int retval =0 , size; +char *data; + +/* Type 3 does not require a mode switch */ +if (dev->cfg.tp_type ==TYPE3 ) +return 0 ; + data =kmalloc (8 ,GFP_KERNEL );if (!data) {dev_err (&dev->intf->dev,"out of memory\n" ); retval = -ENOMEM ;
drivers/net/wireless/iwlwifi/pcie/tx.c +13 -0
@@ -576,10 +576,16 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id)spin_lock_bh (&txq->lock);while (q->write_ptr != q->read_ptr) { +IWL_DEBUG_TX_REPLY (trans,"Q %d Free %d\n" , + txq_id, q->read_ptr);iwl_pcie_txq_free_tfd (trans, txq); q->read_ptr =iwl_queue_inc_wrap (q->read_ptr, q->n_bd); } + txq->active = false;spin_unlock_bh (&txq->lock); + +/* just in case - this queue may have been stopped */ +iwl_wake_queue (trans, txq); }/*
@@ -927,6 +933,12 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,spin_lock_bh (&txq->lock); +if (!txq->active) { +IWL_DEBUG_TX_QUEUES (trans,"Q %d inactive - ignoring idx %d\n" , + txq_id, ssn); + goto out; + } +if (txq->q.read_ptr == tfd_num) goto out;
@@ -1103,6 +1115,7 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo, (fifo <<SCD_QUEUE_STTS_REG_POS_TXF ) | (1 <<SCD_QUEUE_STTS_REG_POS_WSL ) | SCD_QUEUE_STTS_REG_MSK); + trans_pcie->txq[txq_id].active = true;IWL_DEBUG_TX_QUEUES (trans,"Activate queue %d on FIFO %d WrPtr: %d\n" , txq_id, fifo, ssn &0xff ); }
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c +1 -1
@@ -104,7 +104,7 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw, tx_agc[RF90_PATH_A ] =0x10101010 ; tx_agc[RF90_PATH_B ] =0x10101010 ; }else if (rtlpriv->dm.dynamic_txhighpower_lvl == -TXHIGHPWRLEVEL_LEVEL1 ) { +TXHIGHPWRLEVEL_LEVEL2 ) { tx_agc[RF90_PATH_A ] =0x00000000 ; tx_agc[RF90_PATH_B ] =0x00000000 ; }else {
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 -0
@@ -359,6 +359,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = { {RTL_USB_DEVICE(0x2001, 0x330a, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/ {RTL_USB_DEVICE(0x2019, 0xab2b, rtl92cu_hal_cfg)}, /*Planex -Abocom*/ {RTL_USB_DEVICE(0x20f4, 0x624d, rtl92cu_hal_cfg)}, /*TRENDNet*/ + {RTL_USB_DEVICE(0x2357, 0x0100, rtl92cu_hal_cfg)}, /*TP-Link WN8200ND*/ {RTL_USB_DEVICE(0x7392, 0x7822, rtl92cu_hal_cfg)}, /*Edimax -Edimax*/ {} };
drivers/net/wireless/rtlwifi/rtl8723ae/sw.c +3 -3
@@ -251,7 +251,7 @@ static struct rtl_hal_cfg rtl8723ae_hal_cfg = { .bar_id = 2, .write_readback = true, .name = "rtl8723ae_pci", - .fw_name = "rtlwifi/rtl8723aefw.bin", + .fw_name = "rtlwifi/rtl8723fw.bin", .ops = &rtl8723ae_hal_ops, .mod_params = &rtl8723ae_mod_params, .maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
@@ -353,8 +353,8 @@ MODULE_AUTHOR("Realtek WlanFAE <[email protected]>");MODULE_AUTHOR ("Larry Finger <[email protected]>" );MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Realtek 8723E 802.11n PCI wireless" ); -MODULE_FIRMWARE ("rtlwifi/rtl8723aefw.bin" ); -MODULE_FIRMWARE ("rtlwifi/rtl8723aefw_B.bin" ); +MODULE_FIRMWARE ("rtlwifi/rtl8723fw.bin" ); +MODULE_FIRMWARE ("rtlwifi/rtl8723fw_B.bin" );module_param_named (swenc, rtl8723ae_mod_params.sw_crypto, bool,0444 );module_param_named (debug, rtl8723ae_mod_params.debug, int,0444 );
drivers/parisc/lba_pci.c +56 -0
68 lines not on this page · raw message
drivers/pci/iov.c +2 -3
@@ -92,6 +92,8 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset)pci_read_config_word (dev, iov->pos +PCI_SRIOV_VF_DID , &virtfn->device);pci_setup_device (virtfn); virtfn->dev.parent = dev->dev.parent; + virtfn->physfn =pci_dev_get (dev); + virtfn->is_virtfn =1 ;for (i =0 ; i <PCI_SRIOV_NUM_BARS ; i++) { res = dev->resource +PCI_IOV_RESOURCES + i;
@@ -113,9 +115,6 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset)pci_device_add (virtfn, virtfn->bus);mutex_unlock (&iov->dev->sriov->lock); - virtfn->physfn =pci_dev_get (dev); - virtfn->is_virtfn =1 ; - rc =pci_bus_add_device (virtfn);sprintf (buf,"virtfn%u" , id); rc =sysfs_create_link (&dev->dev.kobj, &virtfn->dev.kobj, buf);
drivers/pci/probe.c +8 -6
@@ -1703,12 +1703,16 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, bridge->dev.release = pci_release_bus_bridge_dev;dev_set_name (&bridge->dev,"pci%04x:%02x" ,pci_domain_nr (b), bus); error =pcibios_root_bridge_prepare (bridge); -if (error) - goto bridge_dev_reg_err; +if (error) { +kfree (bridge); + goto err_out; + } error =device_register (&bridge->dev); -if (error) - goto bridge_dev_reg_err; +if (error) { +put_device (&bridge->dev); + goto err_out; + } b->bridge =get_device (&bridge->dev);device_enable_async_suspend (b->bridge);pci_set_bus_of_node (b);
@@ -1764,8 +1768,6 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, class_dev_reg_err:put_device (&bridge->dev);device_unregister (&bridge->dev); -bridge_dev_reg_err: -kfree (bridge); err_out:kfree (b);return NULL ;
drivers/pci/quirks.c +2 -0
@@ -1022,6 +1022,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirkDECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_IXP700_SATA , quirk_amd_ide_mode);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE , quirk_amd_ide_mode);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE , quirk_amd_ide_mode); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AMD ,0x7900 , quirk_amd_ide_mode); +DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_AMD ,0x7900 , quirk_amd_ide_mode);/* * Serverworks CSB5 IDE does not fully support native mode
drivers/pci/xen-pcifront.c +3 -4
@@ -678,10 +678,9 @@ static int pcifront_connect_and_init_dma(struct pcifront_device *pdev)if (!pcifront_dev) {dev_info (&pdev->xdev->dev,"Installing PCI frontend\n" ); pcifront_dev = pdev; - }else { -dev_err (&pdev->xdev->dev,"PCI frontend already installed!\n" ); + }else err = -EEXIST ; - } +spin_unlock (&pcifront_dev_lock);if (!err && !swiotlb_nr_tbl ()) {
@@ -848,7 +847,7 @@ static int pcifront_try_connect(struct pcifront_device *pdev) goto out; err =pcifront_connect_and_init_dma (pdev); -if (err) { +if (err && err != -EEXIST ) {xenbus_dev_fatal (pdev->xdev, err,"Error setting up PCI Frontend" ); goto out;
drivers/pcmcia/at91_cf.c +2 -2
@@ -100,9 +100,9 @@ static int at91_cf_get_status(struct pcmcia_socket *s, u_int *sp)int vcc =gpio_is_valid (cf->board->vcc_pin); *sp =SS_DETECT |SS_3VCARD ; -if (!rdy ||gpio_get_value (rdy)) +if (!rdy ||gpio_get_value (cf->board->irq_pin)) *sp |=SS_READY ; -if (!vcc ||gpio_get_value (vcc)) +if (!vcc ||gpio_get_value (cf->board->vcc_pin)) *sp |=SS_POWERON ; }else *sp =0 ;
drivers/rtc/rtc-rv3029c2.c +1 -1
@@ -310,7 +310,7 @@ static int rv3029c2_rtc_i2c_set_alarm(struct i2c_client *client,dev_dbg (&client->dev,"alarm IRQ armed\n" ); }else {/* disable AIE irq */ - ret =rv3029c2_rtc_i2c_alarm_set_irq (client,1 ); + ret =rv3029c2_rtc_i2c_alarm_set_irq (client,0 );if (ret)return ret;
drivers/tty/serial/pch_uart.c +5 -0
@@ -217,6 +217,7 @@ enum {#define FRI2_64_UARTCLK 64000000/* 64.0000 MHz */ #define FRI2_48_UARTCLK 48000000/* 48.0000 MHz */ #define NTC1_UARTCLK 64000000/* 64.0000 MHz */ +#define MINNOW_UARTCLK 50000000/* 50.0000 MHz */ struct pch_uart_buffer {unsigned char *buf;
@@ -398,6 +399,10 @@ static int pch_uart_get_uartclk(void) strstr(cmp, "nanoETXexpress-TT")))return NTC1_UARTCLK ; + cmp =dmi_get_system_info (DMI_BOARD_NAME ); +if (cmp &&strstr (cmp,"MinnowBoard" )) +return MINNOW_UARTCLK ; +return DEFAULT_UARTCLK ; }
drivers/usb/gadget/f_mass_storage.c +2 -0
@@ -413,6 +413,7 @@ static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)/* Caller must hold fsg->lock */ static void wakeup_thread (struct fsg_common *common) { +smp_wmb ();/* ensure the write of bh->state is complete */ /* Tell the main thread that something has happened */ common->thread_wakeup_needed =1 ;if (common->thread_task)
@@ -632,6 +633,7 @@ static int sleep_thread(struct fsg_common *common) }__set_current_state (TASK_RUNNING ); common->thread_wakeup_needed =0 ; +smp_rmb ();/* ensure the latest bh->state is visible */ return rc; }
drivers/usb/host/ehci-omap.c +9 -2
@@ -187,6 +187,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) } omap->phy[i] = phy; + +if (pdata->port_mode[i] ==OMAP_EHCI_PORT_MODE_PHY ) { +usb_phy_init (omap->phy[i]); +/* bring PHY out of suspend */ +usb_phy_set_suspend (omap->phy[i],0 ); + } }pm_runtime_enable (dev);
@@ -211,13 +217,14 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) }/* -* Bring PHYs out of reset. +* Bring PHYs out of reset for non PHY modes. * Even though HSIC mode is a PHY-less mode, the reset * line exists between the chips and can be modelled * as a PHY device for reset control. */ for (i =0 ; i < omap->nports; i++) { -if (!omap->phy[i]) +if (!omap->phy[i] || + pdata->port_mode[i] ==OMAP_EHCI_PORT_MODE_PHY )continue ;usb_phy_init (omap->phy[i]);
drivers/usb/host/xhci-mem.c +4 -0
@@ -369,6 +369,10 @@ static struct xhci_container_ctx *xhci_alloc_container_ctx(struct xhci_hcd *xhci ctx->size +=CTX_SIZE (xhci->hcc_params); ctx->bytes =dma_pool_alloc (xhci->device_pool, flags, &ctx->dma); +if (!ctx->bytes) { +kfree (ctx); +return NULL ; + }memset (ctx->bytes,0 , ctx->size);return ctx; }
drivers/usb/host/xhci-plat.c +1 -0
@@ -179,6 +179,7 @@ static int xhci_plat_remove(struct platform_device *dev)usb_remove_hcd (hcd);iounmap (hcd->regs); +release_mem_region (hcd->rsrc_start, hcd->rsrc_len);usb_put_hcd (hcd);kfree (xhci);
drivers/usb/serial/option.c +0 -4
@@ -159,8 +159,6 @@ static void option_instat_callback(struct urb *urb);#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0x9000#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0x9001#define NOVATELWIRELESS_PRODUCT_E362 0x9010 -#define NOVATELWIRELESS_PRODUCT_G1 0xA001 -#define NOVATELWIRELESS_PRODUCT_G1_M 0xA002#define NOVATELWIRELESS_PRODUCT_G2 0xA010#define NOVATELWIRELESS_PRODUCT_MC551 0xB001
@@ -730,8 +728,6 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC547) }, { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, - { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1) }, - { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1_M) }, { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) },/* Novatel Ovation MC551 a.k.a. Verizon USB551L */ { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC551, 0xff, 0xff, 0xff) },
drivers/usb/serial/qcserial.c +7 -1
@@ -35,7 +35,13 @@ static const struct usb_device_id id_table[] = { {DEVICE_G1K(0x04da, 0x250c)}, /* Panasonic Gobi QDL device */ {DEVICE_G1K(0x413c, 0x8172)}, /* Dell Gobi Modem device */ {DEVICE_G1K(0x413c, 0x8171)}, /* Dell Gobi QDL device */ - {DEVICE_G1K(0x1410, 0xa001)}, /* Novatel Gobi Modem device */ + {DEVICE_G1K(0x1410, 0xa001)}, /* Novatel/Verizon USB-1000 */ + {DEVICE_G1K(0x1410, 0xa002)}, /* Novatel Gobi Modem device */ + {DEVICE_G1K(0x1410, 0xa003)}, /* Novatel Gobi Modem device */ + {DEVICE_G1K(0x1410, 0xa004)}, /* Novatel Gobi Modem device */ + {DEVICE_G1K(0x1410, 0xa005)}, /* Novatel Gobi Modem device */ + {DEVICE_G1K(0x1410, 0xa006)}, /* Novatel Gobi Modem device */ + {DEVICE_G1K(0x1410, 0xa007)}, /* Novatel Gobi Modem device */ {DEVICE_G1K(0x1410, 0xa008)}, /* Novatel Gobi QDL device */ {DEVICE_G1K(0x0b05, 0x1776)}, /* Asus Gobi Modem device */ {DEVICE_G1K(0x0b05, 0x1774)}, /* Asus Gobi QDL device */
fs/btrfs/ctree.c +8 -5
@@ -1089,7 +1089,8 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,btrfs_set_node_ptr_generation (parent, parent_slot, trans->transid);btrfs_mark_buffer_dirty (parent); -tree_mod_log_free_eb (root->fs_info, buf); +if (last_ref) +tree_mod_log_free_eb (root->fs_info, buf);btrfs_free_tree_block (trans, root, buf, parent_start, last_ref); }
@@ -1161,8 +1162,8 @@ __tree_mod_log_oldest_root(struct btrfs_fs_info *fs_info,* time_seq). */ static void -__tree_mod_log_rewind (struct extent_buffer *eb,u64 time_seq, -struct tree_mod_elem *first_tm) +__tree_mod_log_rewind (struct btrfs_fs_info *fs_info,struct extent_buffer *eb, +u64 time_seq,struct tree_mod_elem *first_tm) {u32 n;struct rb_node *next;
@@ -1172,6 +1173,7 @@ __tree_mod_log_rewind(struct extent_buffer *eb, u64 time_seq,unsigned long p_size =sizeof (struct btrfs_key_ptr ); n =btrfs_header_nritems (eb); +tree_mod_log_read_lock (fs_info);while (tm && tm->seq >= time_seq) {/* * all the operations are recorded with the operator used for
@@ -1226,6 +1228,7 @@ __tree_mod_log_rewind(struct extent_buffer *eb, u64 time_seq,if (tm->index != first_tm->index)break ; } +tree_mod_log_read_unlock (fs_info);btrfs_set_header_nritems (eb, n); }
@@ -1274,7 +1277,7 @@ tree_mod_log_rewind(struct btrfs_fs_info *fs_info, struct extent_buffer *eb,extent_buffer_get (eb_rewin);btrfs_tree_read_lock (eb_rewin); -__tree_mod_log_rewind (eb_rewin, time_seq, tm); +__tree_mod_log_rewind (fs_info, eb_rewin, time_seq, tm);WARN_ON (btrfs_header_nritems (eb_rewin) >BTRFS_NODEPTRS_PER_BLOCK (fs_info->tree_root));
@@ -1350,7 +1353,7 @@ get_old_root(struct btrfs_root *root, u64 time_seq)btrfs_set_header_generation (eb, old_generation); }if (tm) -__tree_mod_log_rewind (eb, time_seq, tm); +__tree_mod_log_rewind (root->fs_info, eb, time_seq, tm);else WARN_ON (btrfs_header_level (eb) !=0 );WARN_ON (btrfs_header_nritems (eb) >BTRFS_NODEPTRS_PER_BLOCK (root));
fs/btrfs/send.c +35 -0
@@ -4579,6 +4579,41 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) send_root =BTRFS_I (file_inode (mnt_file))->root; fs_info = send_root->fs_info; +/* +* This is done when we lookup the root, it should already be complete +* by the time we get here. +*/ +WARN_ON (send_root->orphan_cleanup_state !=ORPHAN_CLEANUP_DONE ); + +/* +* If we just created this root we need to make sure that the orphan +* cleanup has been done and committed since we search the commit root, +* so check its commit root transid with our otransid and if they match +* commit the transaction to make sure everything is updated. +*/ +down_read (&send_root->fs_info->extent_commit_sem); +if (btrfs_header_generation (send_root->commit_root) == +btrfs_root_otransid (&send_root->root_item)) { +struct btrfs_trans_handle *trans; + +up_read (&send_root->fs_info->extent_commit_sem); + + trans =btrfs_attach_transaction_barrier (send_root); +if (IS_ERR (trans)) { +if (PTR_ERR (trans) != -ENOENT ) { + ret =PTR_ERR (trans); + goto out; + } +/* ENOENT means theres no transaction */ + }else { + ret =btrfs_commit_transaction (trans, send_root); +if (ret) + goto out; + } + }else { +up_read (&send_root->fs_info->extent_commit_sem); + } + arg =memdup_user (arg_,sizeof (*arg));if (IS_ERR (arg)) { ret =PTR_ERR (arg);
fs/cifs/cifs_unicode.h +4 -4
@@ -327,14 +327,14 @@ UniToupper(register wchar_t uc)/* * UniStrupr: Upper case a unicode string */ -static inline wchar_t * -UniStrupr (registerwchar_t *upin) +static inline __le16 * +UniStrupr (register__le16 *upin) { - registerwchar_t *up; + register__le16 *up; up = upin;while (*up) {/* For all characters */ - *up =UniToupper (*up); + *up =cpu_to_le16 (UniToupper (le16_to_cpu (*up))); up++; }return upin;/* Return input pointer */
fs/cifs/cifsencrypt.c +3 -3
@@ -414,7 +414,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,int rc =0 ;int len;char nt_hash[CIFS_NTHASH_SIZE ]; -wchar_t *user; +__le16 *user;wchar_t *domain;wchar_t *server;
@@ -439,7 +439,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,return rc; } -/* convert ses->user_name to unicode and uppercase */ +/* convert ses->user_name to unicode */ len = ses->user_name ?strlen (ses->user_name) :0 ; user =kmalloc (2 + (len *2 ),GFP_KERNEL );if (user ==NULL ) {
@@ -448,7 +448,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, }if (len) { - len =cifs_strtoUTF16 ((__le16 *)user, ses->user_name, len, nls_cp); + len =cifs_strtoUTF16 (user, ses->user_name, len, nls_cp);UniStrupr (user); }else {memset (user,'\0' ,2 );
fs/cifs/file.c +4 -5
@@ -553,11 +553,10 @@ cifs_relock_file(struct cifsFileInfo *cfile)struct cifs_tcon *tcon =tlink_tcon (cfile->tlink);int rc =0 ; -/* we are going to update can_cache_brlcks here - need a write access */ -down_write (&cinode->lock_sem); +down_read (&cinode->lock_sem);if (cinode->can_cache_brlcks) { -/* can cache locks - no need to push them */ -up_write (&cinode->lock_sem); +/* can cache locks - no need to relock */ +up_read (&cinode->lock_sem);return rc; }
@@ -568,7 +567,7 @@ cifs_relock_file(struct cifsFileInfo *cfile)else rc = tcon->ses->server->ops->push_mand_locks (cfile); -up_write (&cinode->lock_sem); +up_read (&cinode->lock_sem);return rc; }
fs/cifs/inode.c +5 -0
@@ -558,6 +558,11 @@ cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info, fattr->cf_mode &= ~(S_IWUGO ); fattr->cf_nlink =le32_to_cpu (info->NumberOfLinks); +if (fattr->cf_nlink <1 ) { +cifs_dbg (1 ,"replacing bogus file nlink value %u\n" , + fattr->cf_nlink); + fattr->cf_nlink =1 ; + } } fattr->cf_uid = cifs_sb->mnt_uid;
fs/ext3/namei.c +2 -5
@@ -576,11 +576,8 @@ static int htree_dirblock_to_tree(struct file *dir_file,if (!ext3_check_dir_entry ("htree_dirblock_to_tree" , dir, de, bh, (block<<EXT3_BLOCK_SIZE_BITS (dir->i_sb)) +((char *)de - bh->b_data))) { -/* On error, skip the f_pos to the next block. */ - dir_file->f_pos = (dir_file->f_pos | - (dir->i_sb->s_blocksize -1 )) +1 ; -brelse (bh); -return count; +/* silently ignore the rest of the block */ +break ; }ext3fs_dirhash (de->name, de->name_len, hinfo); if ((hinfo->hash < start_hash) ||
fs/ext4/balloc.c +2 -2
@@ -38,8 +38,8 @@ ext4_group_t ext4_get_group_number(struct super_block *sb,ext4_group_t group;if (test_opt2 (sb,STD_GROUP_SIZE )) - group = (le32_to_cpu (EXT4_SB (sb)->s_es->s_first_data_block) + - block) >> + group = (block - +le32_to_cpu (EXT4_SB (sb)->s_es->s_first_data_block)) >> (EXT4_BLOCK_SIZE_BITS (sb) +EXT4_CLUSTER_BITS (sb) +3 );else ext4_get_group_no_and_offset (sb, block, &group,NULL );
fs/ext4/extents.c +2 -2
@@ -4659,7 +4659,7 @@ static int ext4_xattr_fiemap(struct inode *inode, error =ext4_get_inode_loc (inode, &iloc);if (error)return error; - physical = iloc.bh->b_blocknr << blockbits; + physical = (__u64 )iloc.bh->b_blocknr << blockbits; offset =EXT4_GOOD_OLD_INODE_SIZE +EXT4_I (inode)->i_extra_isize; physical += offset;
@@ -4667,7 +4667,7 @@ static int ext4_xattr_fiemap(struct inode *inode, flags |=FIEMAP_EXTENT_DATA_INLINE ;brelse (iloc.bh); }else {/* external block */ - physical =EXT4_I (inode)->i_file_acl << blockbits; + physical = (__u64 )EXT4_I (inode)->i_file_acl << blockbits; length = inode->i_sb->s_blocksize; }
fs/ext4/file.c +7 -7
@@ -312,7 +312,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, blkbits = inode->i_sb->s_blocksize_bits; startoff = *offset; lastoff = startoff; - endoff = (map->m_lblk + map->m_len) << blkbits; + endoff = (loff_t)(map->m_lblk + map->m_len) << blkbits; index = startoff >>PAGE_CACHE_SHIFT ; end = endoff >>PAGE_CACHE_SHIFT ;
@@ -457,7 +457,7 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize) ret =ext4_map_blocks (NULL , inode, &map,0 );if (ret >0 && !(map.m_flags &EXT4_MAP_UNWRITTEN )) {if (last != start) - dataoff = last << blkbits; + dataoff = (loff_t )last << blkbits;break ; }
@@ -468,7 +468,7 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize)ext4_es_find_delayed_extent_range (inode, last, last, &es);if (es.es_len !=0 &&in_range (last, es.es_lblk, es.es_len)) {if (last != start) - dataoff = last << blkbits; + dataoff = (loff_t )last << blkbits;break ; }
@@ -486,7 +486,7 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize) } last++; - dataoff = last << blkbits; + dataoff = (loff_t )last << blkbits; }while (last <= end);mutex_unlock (&inode->i_mutex);
@@ -540,7 +540,7 @@ static loff_t ext4_seek_hole(struct file *file, loff_t offset, loff_t maxsize) ret =ext4_map_blocks (NULL , inode, &map,0 );if (ret >0 && !(map.m_flags &EXT4_MAP_UNWRITTEN )) { last += ret; - holeoff = last << blkbits; + holeoff = (loff_t )last << blkbits;continue ; }
@@ -551,7 +551,7 @@ static loff_t ext4_seek_hole(struct file *file, loff_t offset, loff_t maxsize)ext4_es_find_delayed_extent_range (inode, last, last, &es);if (es.es_len !=0 &&in_range (last, es.es_lblk, es.es_len)) { last = es.es_lblk + es.es_len; - holeoff = last << blkbits; + holeoff = (loff_t )last << blkbits;continue ; }
@@ -566,7 +566,7 @@ static loff_t ext4_seek_hole(struct file *file, loff_t offset, loff_t maxsize) &map, &holeoff);if (!unwritten) { last += ret; - holeoff = last << blkbits; + holeoff = (loff_t )last << blkbits;continue ; } }
fs/ext4/inline.c +1 -1
@@ -1842,7 +1842,7 @@ int ext4_inline_data_fiemap(struct inode *inode,if (error) goto out; - physical = iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits; + physical = (__u64 )iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits; physical += (char *)ext4_raw_inode (&iloc) - iloc.bh->b_data; physical += offsetof(struct ext4_inode , i_block); length =i_size_read (inode);
fs/ext4/inode.c +9 -6
@@ -1118,10 +1118,13 @@ static int ext4_write_end(struct file *file, } } -if (ext4_has_inline_data (inode)) - copied =ext4_write_inline_data_end (inode, pos, len, - copied, page); -else +if (ext4_has_inline_data (inode)) { + ret =ext4_write_inline_data_end (inode, pos, len, + copied, page); +if (ret <0 ) + goto errout; + copied = ret; + }else copied =block_write_end (file, mapping, pos, len, copied, page, fsdata);
@@ -4805,7 +4808,7 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) {struct inode *inode; -unsigned long delalloc_blocks; +unsigned long long delalloc_blocks; inode = dentry->d_inode;generic_fillattr (inode, stat);
@@ -4823,7 +4826,7 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, delalloc_blocks =EXT4_C2B (EXT4_SB (inode->i_sb),EXT4_I (inode)->i_reserved_data_blocks); - stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9 ; + stat->blocks += delalloc_blocks << (inode->i_sb->s_blocksize_bits-9 );return 0 ; }
fs/ext4/mballoc.c +8 -3
@@ -4735,11 +4735,16 @@ do_more:* blocks being freed are metadata. these blocks shouldn't * be used until this transaction is committed */ + retry: new_entry =kmem_cache_alloc (ext4_free_data_cachep,GFP_NOFS );if (!new_entry) { -ext4_mb_unload_buddy (&e4b); - err = -ENOMEM ; - goto error_return; +/* +* We use a retry loop because +* ext4_free_blocks() is not allowed to fail. +*/ +cond_resched (); +congestion_wait (BLK_RW_ASYNC ,HZ /50 ); + goto retry; } new_entry->efd_start_cluster = bit; new_entry->efd_group = block_group;
fs/ext4/namei.c +2 -5
@@ -918,11 +918,8 @@ static int htree_dirblock_to_tree(struct file *dir_file, bh->b_data, bh->b_size, (block<<EXT4_BLOCK_SIZE_BITS(dir->i_sb)) + ((char *)de - bh->b_data))) { -/* On error, skip the f_pos to the next block. */ - dir_file->f_pos = (dir_file->f_pos | - (dir->i_sb->s_blocksize -1 )) +1 ; -brelse (bh); -return count; +/* silently ignore the rest of the block */ +break ; }ext4fs_dirhash (de->name, de->name_len, hinfo); if ((hinfo->hash < start_hash) ||
fs/ext4/resize.c +1 -3
@@ -1656,12 +1656,10 @@ errout: err = err2;if (!err) { -ext4_fsblk_t first_block; - first_block =ext4_group_first_block_no (sb,0 );if (test_opt (sb,DEBUG ))printk (KERN_DEBUG "EXT4-fs: extended group to %llu " "blocks\n" ,ext4_blocks_count (es)); -update_backups (sb,EXT4_SB (sb)->s_sbh->b_blocknr - first_block, +update_backups (sb,EXT4_SB (sb)->s_sbh->b_blocknr, (char *)es,sizeof (struct ext4_super_block ),0 ); }return err;
fs/ext4/super.c +4 -10
@@ -1684,12 +1684,6 @@ static inline void ext4_show_quota_options(struct seq_file *seq,if (sbi->s_qf_names[GRPQUOTA ])seq_printf (seq,",grpjquota=%s" , sbi->s_qf_names[GRPQUOTA ]); - -if (test_opt (sb,USRQUOTA )) -seq_puts (seq,",usrquota" ); - -if (test_opt (sb,GRPQUOTA )) -seq_puts (seq,",grpquota" );#endif }
@@ -3586,10 +3580,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) sbi->s_addr_per_block_bits =ilog2 (EXT4_ADDR_PER_BLOCK (sb)); sbi->s_desc_per_block_bits =ilog2 (EXT4_DESC_PER_BLOCK (sb)); -/* Do we have standard group size of blocksize * 8 blocks ? */ -if (sbi->s_blocks_per_group == blocksize <<3 ) -set_opt2 (sb,STD_GROUP_SIZE ); -for (i =0 ; i <4 ; i++) sbi->s_hash_seed[i] =le32_to_cpu (es->s_hash_seed[i]); sbi->s_def_hash_version = es->s_def_hash_version;
@@ -3659,6 +3649,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) goto failed_mount; } +/* Do we have standard group size of clustersize * 8 blocks ? */ +if (sbi->s_blocks_per_group == clustersize <<3 ) +set_opt2 (sb,STD_GROUP_SIZE ); +/* * Test whether we have more sectors than will fit in sector_t, * and whether the max offset is addressable by the page cache.
fs/jbd2/journal.c +2 -1
@@ -1318,6 +1318,7 @@ static int journal_reset(journal_t *journal)static void jbd2_write_superblock (journal_t *journal,int write_op) {struct buffer_head *bh = journal->j_sb_buffer; +journal_superblock_t *sb = journal->j_superblock;int ret;trace_jbd2_write_superblock (journal, write_op);
@@ -1339,6 +1340,7 @@ static void jbd2_write_superblock(journal_t *journal, int write_op)clear_buffer_write_io_error (bh);set_buffer_uptodate (bh); } +jbd2_superblock_csum_set (journal, sb);get_bh (bh); bh->b_end_io = end_buffer_write_sync; ret =submit_bh (write_op, bh);
@@ -1435,7 +1437,6 @@ void jbd2_journal_update_sb_errno(journal_t *journal)jbd_debug (1 ,"JBD2: updating superblock error (errno %d)\n" , journal->j_errno); sb->s_errno =cpu_to_be32 (journal->j_errno); -jbd2_superblock_csum_set (journal, sb);read_unlock (&journal->j_state_lock);jbd2_write_superblock (journal,WRITE_SYNC );
fs/jbd2/transaction.c +1 -1
@@ -517,10 +517,10 @@ int jbd2__journal_restart(handle_t *handle, int nblocks, gfp_t gfp_mask) &transaction->t_outstanding_credits);if (atomic_dec_and_test (&transaction->t_updates))wake_up (&journal->j_wait_updates); + tid = transaction->t_tid;spin_unlock (&transaction->t_handle_lock);jbd_debug (2 ,"restarting handle %p\n" , handle); - tid = transaction->t_tid; need_to_start = !tid_geq (journal->j_commit_request, tid);read_unlock (&journal->j_state_lock);if (need_to_start)
fs/ocfs2/xattr.c +10 -0
@@ -6499,6 +6499,16 @@ static int ocfs2_reflink_xattr_inline(struct ocfs2_xattr_reflink *args) } new_oi =OCFS2_I (args->new_inode); +/* +* Adjust extent record count to reserve space for extended attribute. +* Inline data count had been adjusted in ocfs2_duplicate_inline_data(). +*/ +if (!(new_oi->ip_dyn_features &OCFS2_INLINE_DATA_FL ) && + !(ocfs2_inode_is_fast_symlink (args->new_inode))) { +struct ocfs2_extent_list *el = &new_di->id2.i_list; +le16_add_cpu (&el->l_count, -(inline_size / +sizeof (struct ocfs2_extent_rec ))); + }spin_lock (&new_oi->ip_lock); new_oi->ip_dyn_features |=OCFS2_HAS_XATTR_FL |OCFS2_INLINE_XATTR_FL ; new_di->i_dyn_features =cpu_to_le16 (new_oi->ip_dyn_features);
fs/ubifs/super.c +1 -1
@@ -1412,7 +1412,7 @@ static int mount_ubifs(struct ubifs_info *c)ubifs_msg ("mounted UBI device %d, volume %d, name \"%s\"%s" , c->vi.ubi_num, c->vi.vol_id, c->vi.name, - c->ro_mount ?", R/O mode" :NULL ); + c->ro_mount ?", R/O mode" :"" ); x = (long long )c->main_lebs * c->leb_size; y = (long long )c->log_lebs * c->leb_size + c->max_bud_bytes; ubifs_msg("LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes",
include/linux/cgroup.h +48 -10
70 lines not on this page · raw message
include/linux/nbd.h +1 -0
@@ -41,6 +41,7 @@ struct nbd_device {u64 bytesize;pid_t pid;/* pid of nbd-client, if attached */ int xmit_timeout; + int disconnect; /* a disconnect has been requested by user */ };#endif
kernel/cgroup.c +19 -6
@@ -3727,6 +3727,23 @@ static int cgroup_write_notify_on_release(struct cgroup *cgrp, }/* +* When dput() is called asynchronously, if umount has been done and +* then deactivate_super() in cgroup_free_fn() kills the superblock, +* there's a small window that vfs will see the root dentry with non-zero +* refcnt and trigger BUG(). +* +* That's why we hold a reference before dput() and drop it right after. +*/ +static void cgroup_dput (struct cgroup *cgrp) +{ +struct super_block *sb = cgrp->root->sb; + +atomic_inc (&sb->s_active); +dput (cgrp->dentry); +deactivate_super (sb); +} + +/* * Unregister event and free resources. * * Gets called from workqueue.
@@ -3746,7 +3763,7 @@ static void cgroup_event_remove(struct work_struct *work)eventfd_ctx_put (event->eventfd);kfree (event); -dput (cgrp->dentry); +cgroup_dput (cgrp); }/*
@@ -4031,12 +4048,8 @@ static void css_dput_fn(struct work_struct *work) {struct cgroup_subsys_state *css = container_of(work, struct cgroup_subsys_state, dput_work); -struct dentry *dentry = css->cgroup->dentry; -struct super_block *sb = dentry->d_sb; -atomic_inc (&sb->s_active); -dput (dentry); -deactivate_super (sb); +cgroup_dput (css->cgroup); } static void init_cgroup_css(struct cgroup_subsys_state *css,
kernel/irq/manage.c +3 -3
@@ -555,9 +555,9 @@ int can_request_irq(unsigned int irq, unsigned long irqflags)return 0 ;if (irq_settings_can_request (desc)) { -if (desc->action) -if (irqflags & desc->action->flags &IRQF_SHARED ) - canrequest =1 ; +if (!desc->action || + irqflags & desc->action->flags &IRQF_SHARED ) + canrequest =1 ; }irq_put_desc_unlock (desc, flags);return canrequest;
kernel/timer.c +5 -3
@@ -149,9 +149,11 @@ static unsigned long round_jiffies_common(unsigned long j, int cpu,/* now that we have rounded, subtract the extra skew again */ j -= cpu *3 ; -if (j <= jiffies)/* rounding ate our timeout entirely; */ -return original; -return j; +/* +* Make sure j is still in the future. Otherwise return the +* unmodified value. +*/ +return time_is_after_jiffies (j) ? j : original; }/**
mm/memcontrol.c +0 -8
@@ -6296,14 +6296,6 @@ mem_cgroup_css_online(struct cgroup *cont) error =memcg_init_kmem (memcg, &mem_cgroup_subsys);mutex_unlock (&memcg_create_mutex); -if (error) { -/* -* We call put now because our (and parent's) refcnts -* are already in place. mem_cgroup_put() will internally -* call __mem_cgroup_free, so return directly -*/ -mem_cgroup_put (memcg); - }return error; }
mm/page_alloc.c +4 -0
@@ -6142,6 +6142,10 @@ __offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn)list_del (&page->lru);rmv_page_order (page); zone->free_area[order].nr_free--; +#ifdef CONFIG_HIGHMEM +if (PageHighMem (page)) + totalhigh_pages -=1 << order; +#endif for (i =0 ; i < (1 << order); i++)SetPageReserved ((page+i)); pfn += (1 << order);
mm/slab.c +1 -1
@@ -565,7 +565,7 @@ static void init_node_lock_keys(int q)if (slab_state <UP )return ; -for (i =1 ; i <PAGE_SHIFT +MAX_ORDER ; i++) { +for (i =1 ; i <=KMALLOC_SHIFT_HIGH ; i++) {struct kmem_cache_node *n;struct kmem_cache *cache = kmalloc_caches[i];