diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-02 18:43:51 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-12-02 18:43:51 -0700 |
| commit | 8c6beb5a26d5e0bd4e0f28e8b5c9810883611bc2 (patch) | |
| tree | 064d665c62e4eafbf1277b82eef1a20cc598b4b1 /include/linux | |
| parent | d142a8d4f214b8390244d6424142dae35f3e4888 (diff) | |
| parent | 4d0d50caa287236994a5c5bc84dabbc2cb36b9e3 (diff) | |
Promotion of kernel.lnx.4.4-161202.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1094097 Iad76a7e317dd9caf846dbe870baee63a8c5ce6c1 usb: gadget: f_rmnet: Add support for configfs
1050304 I768b3390fbe4728be285424d0ce27981e1a5d6cb msm: mdss: dp: set crypto clock rate
1093028 Ic534c518116c18e98bd4e421365831400ef967f4 ARM: dts: msm: change ufs regulators for msmfalcon inter
1092638 I22df2ab1210d0ec7da1ac394e6c61beaa52eb712 ARM: dts: msm: Add sdhc2 support for msmfalcon interpose
1094107 I7d463e4e14c896be33ffb3be418b9f91f49107c5 misc: qcom: qdsp6v2: modify amr decoder driver
1074469 1094107 Ia187948fab9840447b1f5b1ede4e9a1ece0b85c5 audio: add G711 audio encoding support
1096038 Ib763bf5f58155fe2c6001357aa939d8098d2ff14 ARM: dts: msm: Add sdhc2 regulator for QRD msmfalcon int
1072067 I8e84577b5aff5e932632c4612a88808615d764ae ASoc: msm: qdsp6v2: Add TX app type support in compress
1072067 I1c46befc223285495b3c0650e6c3eaae81f58771 ASoc: msm: qdsp6v2: Add timestamp support for compress c
1087543 I3e2fffdddfb7822a4eb3e142738363f1e80522d8 SoC: msm: q6dspv2: add null check for payload
1060631 I814c4b219c0c3b91c4e1280b09c2b819d864f787 msm: camera2: cpp: Added secure buffer [un]mapping
1050304 Ib551b1fe8641203b66a31e745d5091641b4d0ae2 msm: mdss: dp: hdcp 2.2: add support for interrupt handl
1086187 I32aa42ceef069241e00e734dc4d84f5d5277bda4 ASoC: wcd934x: enable lineout path in codec
1093889 Ib60d079a4d8685e781624bb1403b2a3060e31d27 mm: Inform KASAN when allocating pages during isolation
1022395 I6bef9f2c033f78ad0959954acc5d7627e8a92139 mmc: core: check if CQE is already disabled before halt/
1094769 Ifc32ab4ead63c382ae390358ed86f7cc5b6eb2dc sched: pre-allocate colocation groups
1083787 1084152 I734f53162055373126f9a11038b8cbfc75ae7a5e ASoC: soc-dapm: Invalidate DAPM path during dapm additio
1081032 Input: synaptics: check input, prevent sysfs races
1091186 Ic2df5ba83d1e7166aadc954aa137ec65ffa79133 ARM: dts: msm: Remove clocks associated with GDSC for MS
1022395 I90d17cbc73783b88bbafbdf7048c8a26eb8434bc mmc: block: send CMD13 when a response error detected in
1096606 I5f7393f3f486a884bfa881a93c01623c3cd2664d clk: msm: Remove overrides from clock header files for c
1088824 Ifaa4b5387d4285ddce16d8e745aa0500c64c568b msm: camera: fix bound check of offset to avoid overread
1090500 I1d7ecc6a3d4c48d0de9645043d5e5bfdfa1d1f5f ASoC: audio-ext-clk: add new audio ext clock
1074469 1094107 I5296de4f525adec549c8d51fbf7fc76120b3b4f5 misc: qcom: qdsp6v2: add G711 decoder driver
1096336 I405cb68749f63f6f779e4f3c2b47065b02ec07de ARM: dts: msm: Update ascent battery profile for GEN3 FG
1050304 I0afc56e0177ceccf76b717a483584f7ad5055fe1 msm: mdss: hdcp_1x: update hdcp state on link integrity
1091194 I78261addaa84d1239b92e1528e77bbfcaa09105f ASoC: msm8998: Update supported sample rates for USB bac
1094107 I496a975e427f68d7bb5cc2789bfc9bb949658233 ASoC: msm: qdsp6v2: support encode of g711 format
1091999 Ia8495790b031ae69dd8d9f36cdd2408de9aed29b msm: camera: jpegdma: Check for compat config
1096408 I4afcf7d5b22395eeda2e77131bd45592abaeb561 uapi/media: add additional ubwc compressed formats
1074037 I29cf58d7069d758239c2f5712e70e94be20a42d3 defconfig: msm: Disable CRYPTO_DEV_QCE config flag for m
1081525 I61956a4038f80f55d9507be87d7f7ee278ccf45e msm: mdss: avoid scheduling pp work during continuous up
1093687 Ic0dedbadca5b4cc4ce567afad48a33078b549439 msm: kgsl: Reserve a context ID slot but don't populate
1081525 Ic97744a81198ff303f9c87e1cf7c2468b4356a25 mdss: move to a kthread for vsync_retire_work_handler
1074469 1094107 Iab3a45c43b38b4e004c9c297fb84dfe9e6f3e2be msm: Add msm_audio_g711_dec header file to Kbuild
1050304 Ib77756c942abfbdd6e1522a3238d5d8499496fc9 msm: hdcp: add response timeout and new messages for sin
1074469 1094107 Ie90fd68e24e7e793aaac64290e3c1e41682d6d5a ASoC: msm: qdsp6v2: support decode of g711 clips
1094107 I40a0e5b7635e8585b9fc4cb01cfdb213418619c5 msm: Add msm_audio_g711 header file to Kbuild
1094946 I1db579626d96302e07fef1a755fb39944d3eaca8 msm: mdss: restore pipe src/dst rect after multiple PU R
1094653 I578dc96da96f7c10be51eac1f8b3c190e45dcfcf msm ipa3: fix blocking faulty IOCTLs
1092188 I872f18235b0b1685dfdee3de99827d031077a012 msm: mdss: add support to set mdp clock rate before enab
1022395 Ic529aae53fdecd6b9ecbb17ba13147964dce55dc mmc: sdhci: Handle legacy commands sent in CQ error case
1022395 I944ab4060e779c7f41a945532e6a65c30797d40f mmc: cmdq_hci: enable legacy interrupts when CQ is disab
1094097 I5b763acfb28c2f1832874af786704835314fa9c7 usb: gadget: Add RMNET support using IPA over BAM2BAM
1086873 I8bd2eb93393766bf9c301766e525354770577e0a net: rmnet_data: Handle leaked packets when adding MAP f
1096656 I8cb59e1475376167c7a8a60c54df0939597f5083 msm: kgsl: Check MMU type for memory and pagetable opera
1084188 I41410f1e4916fadc8d1dc5c08f088e0fe71405e1 msm: camera: Print kernel pointer using correct specifie
1050304 I9b120b88f92be517d1734697625038b28b32feb1 msm: mdss: hdcp_1x: remove obsolete code
1085889 I12be44ac272fc5079230feb6ae24c68ccde99cf2 ASoC: msm: qdsp6v2: Fix an incorrect string comparison l
1074469 1094107 Ia5fddfce1f2eebaa08aad0f53cab9c0993b37695 misc: qcom: qdsp6v2: register ioctl calls for g711mlaw d
Change-Id: Iaec5bb3c4a0a4d3779866d8fa697d4b704b2c84a
CRs-Fixed: 1086873, 1084188, 1060631, 1094097, 1088824, 1074469, 1074037, 1092188, 1081525, 1050304, 1096408, 1096656, 1091186, 1084152, 1093889, 1096038, 1096336, 1081032, 1092638, 1022395, 1094653, 1072067, 1096606, 1091999, 1094107, 1083787, 1087543, 1094769, 1085889, 1094946, 1093028, 1086187, 1090500, 1093687, 1091194
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clk/msm-clk-provider.h | 4 | ||||
| -rw-r--r-- | include/linux/clk/msm-clk.h | 7 | ||||
| -rw-r--r-- | include/linux/sched.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/clk/msm-clk-provider.h b/include/linux/clk/msm-clk-provider.h index a09ce5c3b156..2fa8916ad356 100644 --- a/include/linux/clk/msm-clk-provider.h +++ b/include/linux/clk/msm-clk-provider.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2007 Google, Inc. - * Copyright (c) 2007-2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2007-2016, The Linux Foundation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -29,6 +29,7 @@ #include <linux/seq_file.h> #include <linux/clk/msm-clk.h> +#if defined(CONFIG_COMMON_CLK_MSM) /* * Bit manipulation macros */ @@ -265,4 +266,5 @@ static inline const char *clk_name(struct clk *c) return "(null)"; return c->dbg_name; }; +#endif /* CONFIG_COMMON_CLK_MSM */ #endif diff --git a/include/linux/clk/msm-clk.h b/include/linux/clk/msm-clk.h index 964909d25021..8455fd776246 100644 --- a/include/linux/clk/msm-clk.h +++ b/include/linux/clk/msm-clk.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2012-2015 The Linux Foundation. All rights reserved. +/* Copyright (c) 2009, 2012-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -23,6 +23,9 @@ enum branch_mem_flags { CLKFLAG_PERIPH_OFF_SET, CLKFLAG_PERIPH_OFF_CLEAR, }; + +#include <linux/clk.h> + #elif defined(CONFIG_COMMON_CLK_MSM) #define CLKFLAG_INVERT 0x00000001 #define CLKFLAG_NOINVERT 0x00000002 @@ -42,7 +45,6 @@ enum branch_mem_flags { #define CLKFLAG_EPROBE_DEFER 0x00010000 #define CLKFLAG_PERIPH_OFF_SET 0x00020000 #define CLKFLAG_PERIPH_OFF_CLEAR 0x00040000 -#endif struct clk_lookup; struct clk; @@ -132,4 +134,5 @@ int msm_clk_notif_register(struct clk *clk, struct notifier_block *nb); int msm_clk_notif_unregister(struct clk *clk, struct notifier_block *nb); +#endif /* CONFIG_COMMON_CLK_MSM */ #endif diff --git a/include/linux/sched.h b/include/linux/sched.h index 4f6711f31939..9c3be2d56ac5 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2401,6 +2401,8 @@ struct cpu_cycle_counter_cb { u64 (*get_cpu_cycle_counter)(int cpu); }; +#define MAX_NUM_CGROUP_COLOC_ID 20 + #ifdef CONFIG_SCHED_HMP extern void free_task_load_ptrs(struct task_struct *p); extern int sched_set_window(u64 window_start, unsigned int window_size); |