summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/nmi.h4
-rw-r--r--include/linux/rmap.h11
-rw-r--r--include/linux/soc/qcom/smd-rpm.h4
3 files changed, 15 insertions, 4 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 9aeddb80cfd3..dbda77dc510c 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -41,7 +41,7 @@ static inline void hardlockup_detector_disable(void) {}
#ifdef arch_trigger_all_cpu_backtrace
static inline bool trigger_all_cpu_backtrace(void)
{
- #if defined(CONFIG_ARM) || defined(CONFIG_ARM64)
+ #if defined(CONFIG_ARM64)
arch_trigger_all_cpu_backtrace();
#else
arch_trigger_all_cpu_backtrace(true);
@@ -51,7 +51,7 @@ static inline bool trigger_all_cpu_backtrace(void)
}
static inline bool trigger_allbutself_cpu_backtrace(void)
{
- #if defined(CONFIG_ARM) || defined(CONFIG_ARM64)
+ #if defined(CONFIG_ARM64)
arch_trigger_all_cpu_backtrace();
#else
arch_trigger_all_cpu_backtrace(false);
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index ddda2ac3446e..e72b85737a99 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -10,6 +10,11 @@
#include <linux/rwsem.h>
#include <linux/memcontrol.h>
+extern int isolate_lru_page(struct page *page);
+extern void putback_lru_page(struct page *page);
+extern unsigned long reclaim_pages_from_list(struct list_head *page_list,
+ struct vm_area_struct *vma);
+
/*
* The anon_vma heads a list of private "related" vmas, to scan if
* an anonymous page pointing to this anon_vma needs to be unmapped:
@@ -176,7 +181,8 @@ int page_referenced(struct page *, int is_locked,
#define TTU_ACTION(x) ((x) & TTU_ACTION_MASK)
-int try_to_unmap(struct page *, enum ttu_flags flags);
+int try_to_unmap(struct page *, enum ttu_flags flags,
+ struct vm_area_struct *vma);
/*
* Used by uprobes to replace a userspace page safely
@@ -232,6 +238,7 @@ int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma);
*/
struct rmap_walk_control {
void *arg;
+ struct vm_area_struct *target_vma;
int (*rmap_one)(struct page *page, struct vm_area_struct *vma,
unsigned long addr, void *arg);
int (*done)(struct page *page);
@@ -255,7 +262,7 @@ static inline int page_referenced(struct page *page, int is_locked,
return 0;
}
-#define try_to_unmap(page, refs) SWAP_FAIL
+#define try_to_unmap(page, refs, vma) SWAP_FAIL
static inline int page_mkclean(struct page *page)
{
diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h
index 2a53dcaeeeed..ebdabd669d93 100644
--- a/include/linux/soc/qcom/smd-rpm.h
+++ b/include/linux/soc/qcom/smd-rpm.h
@@ -26,6 +26,10 @@ struct qcom_smd_rpm;
#define QCOM_SMD_RPM_SMPB 0x62706d73
#define QCOM_SMD_RPM_SPDM 0x63707362
#define QCOM_SMD_RPM_VSA 0x00617376
+#define QCOM_SMD_RPM_MMAXI_CLK 0x69786d6d
+#define QCOM_SMD_RPM_IPA_CLK 0x617069
+#define QCOM_SMD_RPM_CE_CLK 0x6563
+#define QCOM_SMD_RPM_AGGR_CLK 0x72676761
int qcom_rpm_smd_write(struct qcom_smd_rpm *rpm,
int state,