31 files changed, 1270 insertions, 774 deletions

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 116e798b61e6..38ed8787261b 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1730,20 +1730,33 @@
         isapnp=         [ISAPNP]
                         Format: <RDP>,<reset>,<pci_scan>,<verbosity>
 
-        isolcpus=       [KNL,SMP] Isolate CPUs from the general scheduler.
-                        The argument is a cpu list, as described above.
+        isolcpus=       [KNL,SMP] Isolate a given set of CPUs from disturbance.
+                        [Deprecated - use cpusets instead]
+                        Format: [flag-list,]<cpu-list>
+
+                        Specify one or more CPUs to isolate from disturbances
+                        specified in the flag list (default: domain):
+
+                        nohz
+                          Disable the tick when a single task runs.
+                        domain
+                          Isolate from the general SMP balancing and scheduling
+                          algorithms. Note that performing domain isolation this way
+                          is irreversible: it's not possible to bring back a CPU to
+                          the domains once isolated through isolcpus. It's strongly
+                          advised to use cpusets instead to disable scheduler load
+                          balancing through the "cpuset.sched_load_balance" file.
+                          It offers a much more flexible interface where CPUs can
+                          move in and out of an isolated set anytime.
+
+                          You can move a process onto or off an "isolated" CPU via
+                          the CPU affinity syscalls or cpuset.
+                          <cpu number> begins at 0 and the maximum value is
+                          "number of CPUs in system - 1".
+
+                        The format of <cpu-list> is described above.
 
-                        This option can be used to specify one or more CPUs
-                        to isolate from the general SMP balancing and scheduling
-                        algorithms. You can move a process onto or off an
-                        "isolated" CPU via the CPU affinity syscalls or cpuset.
-                        <cpu number> begins at 0 and the maximum value is
-                        "number of CPUs in system - 1".
 
-                        This option is the preferred way to isolate CPUs. The
-                        alternative -- manually setting the CPU mask of all
-                        tasks in the system -- can cause problems and
-                        suboptimal load balancer performance.
 
         iucv=           [HW,NET]
 
@@ -4209,6 +4222,9 @@
                         Used to run time disable IRQ_TIME_ACCOUNTING on any
                         platforms where RDTSC is slow and this accounting
                         can add overhead.
+                        [x86] unstable: mark the TSC clocksource as unstable, this
+                        marks the TSC unconditionally unstable at bootup and
+                        avoids any further wobbles once the TSC watchdog notices.
 
         turbografx.map[2|3]=    [HW,JOY]
                         TurboGraFX parallel port interface
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 321cd7b4d817..a73ab95558f5 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -18,6 +18,7 @@
 #include <linux/cpufeature.h>
 #include <linux/tick.h>
 #include <linux/pm_qos.h>
+#include <linux/sched/isolation.h>
 
 #include "base.h"
 
@@ -271,8 +272,16 @@ static ssize_t print_cpus_isolated(struct device *dev,
                                   struct device_attribute *attr, char *buf)
 {
         int n = 0, len = PAGE_SIZE-2;
+        cpumask_var_t isolated;
 
-        n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(cpu_isolated_map));
+        if (!alloc_cpumask_var(&isolated, GFP_KERNEL))
+                return -ENOMEM;
+
+        cpumask_andnot(isolated, cpu_possible_mask,
+                       housekeeping_cpumask(HK_FLAG_DOMAIN));
+        n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(isolated));
+
+        free_cpumask_var(isolated);
 
         return n;
 }
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
index c00102b8145a..b3e5816a4678 100644
--- a/drivers/net/ethernet/tile/tilegx.c
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -40,7 +40,7 @@
 #include <linux/tcp.h>
 #include <linux/net_tstamp.h>
 #include <linux/ptp_clock_kernel.h>
-#include <linux/tick.h>
+#include <linux/sched/isolation.h>
 
 #include <asm/checksum.h>
 #include <asm/homecache.h>
@@ -2270,8 +2270,8 @@ static int __init tile_net_init_module(void)
                 tile_net_dev_init(name, mac);
 
         if (!network_cpus_init())
-                cpumask_and(&network_cpus_map, housekeeping_cpumask(),
-                            cpu_online_mask);
+                cpumask_and(&network_cpus_map,
+                            housekeeping_cpumask(HK_FLAG_MISC), cpu_online_mask);
 
         return 0;
 }
diff --git a/fs/proc/array.c b/fs/proc/array.c
index d82549e80402..6f6fc1672ad1 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -138,7 +138,7 @@ static const char * const task_state_array[] = {
 static inline const char *get_task_state(struct task_struct *tsk)
 {
         BUILD_BUG_ON(1 + ilog2(TASK_REPORT_MAX) != ARRAY_SIZE(task_state_array));
-        return task_state_array[__get_task_state(tsk)];
+        return task_state_array[task_state_index(tsk)];
 }
 
 static inline int get_task_umask(struct task_struct *tsk)
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 8d3125c493b2..75b565194437 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -131,6 +131,11 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
         return 0;
 }
 
+static inline unsigned int cpumask_last(const struct cpumask *srcp)
+{
+        return 0;
+}
+
 /* Valid inputs for n are -1 and 0. */
 static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
 {
@@ -179,6 +184,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
         return find_first_bit(cpumask_bits(srcp), nr_cpumask_bits);
 }
 
+/**