Merge back earlier cpufreq material for v4.7.

diff --combined Documentation/kernel-parameters.txt
index 0b3de80ec8f69c1aef9dfaa59fb86c14395ba43e,1cffa3f2473218a60c97f5e088116bfc35e70e43..52292b28b291241935fbe6664958b1d059b59b79
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1661,6 -1661,11 +1661,11 @@@ bytes respectively. Such letter suffixe
                hwp_only
                        Only load intel_pstate on systems which support
                        hardware P state control (HWP) if available.
+               support_acpi_ppc
+                       Enforce ACPI _PPC performance limits. If the Fixed ACPI
+                       Description Table, specifies preferred power management
+                       profile as "Enterprise Server" or "Performance Server",
+                       then this feature is turned on by default.
  
        intremap=       [X86-64, Intel-IOMMU]
                        on      enable Interrupt Remapping (default)
@@@ -4077,8 -4082,6 +4082,8 @@@
                                        sector if the number is odd);
                                i = IGNORE_DEVICE (don't bind to this
                                        device);
 +                              j = NO_REPORT_LUNS (don't use report luns
 +                                      command, uas only);
                                l = NOT_LOCKABLE (don't try to lock and
                                        unlock ejectable media);
                                m = MAX_SECTORS_64 (don't transfer more

diff --combined include/linux/sched.h
index 52c4847b05e2882a72d04c3c75fc4d55c2b4a6b9,1b882592259734f473ca29b3d5dc6653e85c7055..8344e1947eec392c3c3731f0dd81bbe71044fb3c
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -720,7 -720,7 +720,7 @@@ struct signal_struct 
        struct task_cputime cputime_expires;
  
  #ifdef CONFIG_NO_HZ_FULL
 -      unsigned long tick_dep_mask;
 +      atomic_t tick_dep_mask;
  #endif
  
        struct list_head cpu_timers[3];
@@@ -1549,7 -1549,7 +1549,7 @@@ struct task_struct 
  #endif
  
  #ifdef CONFIG_NO_HZ_FULL
 -      unsigned long tick_dep_mask;
 +      atomic_t tick_dep_mask;
  #endif
        unsigned long nvcsw, nivcsw; /* context switch counts */
        u64 start_time;         /* monotonic time in nsec */
@@@ -3240,7 -3240,10 +3240,10 @@@ struct update_util_data 
                     u64 time, unsigned long util, unsigned long max);
  };
  
- void cpufreq_set_update_util_data(int cpu, struct update_util_data *data);
+ void cpufreq_add_update_util_hook(int cpu, struct update_util_data *data,
+                       void (*func)(struct update_util_data *data, u64 time,
+                                    unsigned long util, unsigned long max));
+ void cpufreq_remove_update_util_hook(int cpu);
  #endif /* CONFIG_CPU_FREQ */
  
  #endif