]> nv-tegra.nvidia Code Review - linux-4.9.git/commitdiff
Merge 4.9.135 into android-4.9-o
authorGreg Kroah-Hartman <gregkh@google.com>
Sat, 20 Oct 2018 12:55:54 +0000 (14:55 +0200)
committerGreg Kroah-Hartman <gregkh@google.com>
Sat, 20 Oct 2018 12:55:54 +0000 (14:55 +0200)
Changes in 4.9.135
media: af9035: prevent buffer overflow on write
batman-adv: Fix segfault when writing to throughput_override
batman-adv: Fix segfault when writing to sysfs elp_interval
batman-adv: Prevent duplicated nc_node entry
batman-adv: Prevent duplicated softif_vlan entry
batman-adv: Prevent duplicated global TT entry
batman-adv: Prevent duplicated tvlv handler
batman-adv: fix backbone_gw refcount on queue_work() failure
batman-adv: fix hardif_neigh refcount on queue_work() failure
clocksource/drivers/ti-32k: Add CLOCK_SOURCE_SUSPEND_NONSTOP flag for non-am43 SoCs
scsi: ibmvscsis: Fix a stringop-overflow warning
scsi: ibmvscsis: Ensure partition name is properly NUL terminated
Input: atakbd - fix Atari keymap
Input: atakbd - fix Atari CapsLock behaviour
ravb: do not write 1 to reserved bits
drm: mali-dp: Call drm_crtc_vblank_reset on device init
scsi: sd: don't crash the host on invalid commands
net/mlx4: Use cpumask_available for eq->affinity_mask
powerpc/tm: Fix userspace r13 corruption
powerpc/tm: Avoid possible userspace r1 corruption on reclaim
iommu/amd: Return devid as alias for ACPI HID devices
mremap: properly flush TLB before releasing the page
mm: Preserve _PAGE_DEVMAP across mprotect() calls
netfilter: check for seqadj ext existence before adding it in nf_nat_setup_info
ARC: build: Get rid of toolchain check
ARC: build: Don't set CROSS_COMPILE in arch's Makefile
HID: quirks: fix support for Apple Magic Keyboards
usb: gadget: serial: fix oops when data rx'd after close
sched/cputime: Convert kcpustat to nsecs
macintosh/rack-meter: Convert cputime64_t use to u64
sched/cputime: Increment kcpustat directly on irqtime account
sched/cputime: Fix ksoftirqd cputime accounting regression
ext4: avoid running out of journal credits when appending to an inline file
HV: properly delay KVP packets when negotiation is in progress
Linux 4.9.135

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1  2 
drivers/cpufreq/cpufreq.c
fs/ext4/ext4.h
fs/ext4/inline.c
kernel/sched/cputime.c
kernel/sched/sched.h

Simple merge
diff --cc fs/ext4/ext4.h
Simple merge
Simple merge
index 5e9422b66f5f085b21c764932d955cd0210008ff,448d6426fa5fe5ba38d651bafbecde69ce20c493..889f47796e1503081f776716ed38dccc620141e3
@@@ -69,19 -73,9 +80,19 @@@ void irqtime_account_irq(struct task_st
         * that do not consume any time, but still wants to run.
         */
        if (hardirq_count())
-               irqtime->hardirq_time += delta;
+               irqtime_account_delta(irqtime, delta, CPUTIME_IRQ);
        else if (in_serving_softirq() && curr != this_cpu_ksoftirqd())
-               irqtime->softirq_time += delta;
+               irqtime_account_delta(irqtime, delta, CPUTIME_SOFTIRQ);
 +#ifdef CONFIG_SCHED_WALT
 +      else
 +              account = false;
 +#endif
 +
 +      u64_stats_update_end(&irqtime->sync);
 +#ifdef CONFIG_SCHED_WALT
 +      if (account)
 +              walt_account_irqtime(cpu, curr, delta, wallclock);
 +#endif
  }
  EXPORT_SYMBOL_GPL(irqtime_account_irq);
  
Simple merge