diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/leds.h | 1 | ||||
| -rw-r--r-- | include/linux/memblock.h | 4 | ||||
| -rw-r--r-- | include/linux/msm_ext_display.h | 6 | ||||
| -rw-r--r-- | include/linux/page-flags.h | 8 | ||||
| -rw-r--r-- | include/linux/qpnp/qpnp-revid.h | 15 | ||||
| -rw-r--r-- | include/linux/sched/sysctl.h | 3 | ||||
| -rw-r--r-- | include/linux/zcache.h | 22 |
7 files changed, 51 insertions, 8 deletions
diff --git a/include/linux/leds.h b/include/linux/leds.h index fa359c79c825..bba189a62dfd 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -35,6 +35,7 @@ struct led_classdev { const char *name; enum led_brightness brightness; enum led_brightness max_brightness; + enum led_brightness usr_brightness_req; int flags; /* Lower 16 bits reflect status */ diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 42b40345119f..3d28c3a18b95 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -83,8 +83,8 @@ int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size); int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); ulong choose_memblock_flags(void); -void memblock_region_resize_late_begin(void); -void memblock_region_resize_late_end(void); +unsigned long memblock_region_resize_late_begin(void); +void memblock_region_resize_late_end(unsigned long); /* Low level functions */ int memblock_add_range(struct memblock_type *type, diff --git a/include/linux/msm_ext_display.h b/include/linux/msm_ext_display.h index eb90b49477cc..c0a506fa66ec 100644 --- a/include/linux/msm_ext_display.h +++ b/include/linux/msm_ext_display.h @@ -2,9 +2,9 @@ * * Copyright (c) 2014-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 - * may be copied, distributed, and modified under those terms. + * 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 + * only version 2 as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index bb53c7b86315..4b115168607f 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -108,6 +108,9 @@ enum pageflags { PG_young, PG_idle, #endif +#ifdef CONFIG_ZCACHE + PG_was_active, +#endif __NR_PAGEFLAGS, /* Filesystems */ @@ -224,6 +227,11 @@ PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked) __SETPAGEFLAG(SwapBacked, swapbacked) __PAGEFLAG(SlobFree, slob_free) +#ifdef CONFIG_ZCACHE +PAGEFLAG(WasActive, was_active) +#else +PAGEFLAG_FALSE(WasActive) +#endif /* * Private page markings that may be used by the filesystem that owns the page diff --git a/include/linux/qpnp/qpnp-revid.h b/include/linux/qpnp/qpnp-revid.h index 13464f807f68..388296c53460 100644 --- a/include/linux/qpnp/qpnp-revid.h +++ b/include/linux/qpnp/qpnp-revid.h @@ -177,6 +177,21 @@ /* PMICOBALT */ #define PMICOBALT_SUBTYPE 0x15 +#define PMICOBALT_V1P0_REV1 0x00 +#define PMICOBALT_V1P0_REV2 0x00 +#define PMICOBALT_V1P0_REV3 0x00 +#define PMICOBALT_V1P0_REV4 0x01 + +#define PMICOBALT_V1P1_REV1 0x00 +#define PMICOBALT_V1P1_REV2 0x00 +#define PMICOBALT_V1P1_REV3 0x01 +#define PMICOBALT_V1P1_REV4 0x01 + +#define PMICOBALT_V2P0_REV1 0x00 +#define PMICOBALT_V2P0_REV2 0x00 +#define PMICOBALT_V2P0_REV3 0x00 +#define PMICOBALT_V2P0_REV4 0x02 + /* PM8005 */ #define PM8005_SUBTYPE 0x18 diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h index 2ac84af88802..30ba03d1679b 100644 --- a/include/linux/sched/sysctl.h +++ b/include/linux/sched/sysctl.h @@ -42,13 +42,10 @@ extern unsigned int sysctl_sched_child_runs_first; extern unsigned int sysctl_sched_wake_to_idle; extern unsigned int sysctl_sched_wakeup_load_threshold; extern unsigned int sysctl_sched_window_stats_policy; -extern unsigned int sysctl_sched_account_wait_time; extern unsigned int sysctl_sched_ravg_hist_size; extern unsigned int sysctl_sched_cpu_high_irqload; -extern unsigned int sysctl_sched_freq_account_wait_time; extern unsigned int sysctl_sched_migration_fixup; extern unsigned int sysctl_sched_heavy_task_pct; -extern unsigned int sysctl_sched_enable_power_aware; #if defined(CONFIG_SCHED_FREQ_INPUT) || defined(CONFIG_SCHED_HMP) extern unsigned int sysctl_sched_init_task_load_pct; diff --git a/include/linux/zcache.h b/include/linux/zcache.h new file mode 100644 index 000000000000..2db7e4bbb662 --- /dev/null +++ b/include/linux/zcache.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2015, 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 + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#ifndef _LINUX_ZCACHE_H +#define _LINUX_ZCACHE_H + +#ifdef CONFIG_ZCACHE +extern u64 zcache_pages(void); +#else +u64 zcache_pages(void) { return 0; } +#endif + +#endif /* _LINUX_ZCACHE_H */ |