mirror of https://github.com/OpenIPC/firmware.git
72 lines
1.9 KiB
Diff
72 lines
1.9 KiB
Diff
diff -drupN a/fs/pstore/internal.h b/fs/pstore/internal.h
|
|
--- a/fs/pstore/internal.h 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/fs/pstore/internal.h 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -1,3 +1,4 @@
|
|
+/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __PSTORE_INTERNAL_H__
|
|
#define __PSTORE_INTERNAL_H__
|
|
|
|
@@ -5,39 +6,8 @@
|
|
#include <linux/time.h>
|
|
#include <linux/pstore.h>
|
|
|
|
-#if NR_CPUS <= 2 && defined(CONFIG_ARM_THUMB)
|
|
-#define PSTORE_CPU_IN_IP 0x1
|
|
-#elif NR_CPUS <= 4 && defined(CONFIG_ARM)
|
|
-#define PSTORE_CPU_IN_IP 0x3
|
|
-#endif
|
|
-
|
|
-struct pstore_ftrace_record {
|
|
- unsigned long ip;
|
|
- unsigned long parent_ip;
|
|
-#ifndef PSTORE_CPU_IN_IP
|
|
- unsigned int cpu;
|
|
-#endif
|
|
-};
|
|
-
|
|
-static inline void
|
|
-pstore_ftrace_encode_cpu(struct pstore_ftrace_record *rec, unsigned int cpu)
|
|
-{
|
|
-#ifndef PSTORE_CPU_IN_IP
|
|
- rec->cpu = cpu;
|
|
-#else
|
|
- rec->ip |= cpu;
|
|
-#endif
|
|
-}
|
|
-
|
|
-static inline unsigned int
|
|
-pstore_ftrace_decode_cpu(struct pstore_ftrace_record *rec)
|
|
-{
|
|
-#ifndef PSTORE_CPU_IN_IP
|
|
- return rec->cpu;
|
|
-#else
|
|
- return rec->ip & PSTORE_CPU_IN_IP;
|
|
-#endif
|
|
-}
|
|
+#define PSTORE_DEFAULT_KMSG_BYTES 10240
|
|
+extern unsigned long kmsg_bytes;
|
|
|
|
#ifdef CONFIG_PSTORE_FTRACE
|
|
extern void pstore_register_ftrace(void);
|
|
@@ -59,10 +29,16 @@ extern struct pstore_info *psinfo;
|
|
|
|
extern void pstore_set_kmsg_bytes(int);
|
|
extern void pstore_get_records(int);
|
|
-extern int pstore_mkfile(enum pstore_type_id, char *psname, u64 id,
|
|
- int count, char *data, bool compressed,
|
|
- size_t size, struct timespec time,
|
|
- struct pstore_info *psi);
|
|
+extern void pstore_get_backend_records(struct pstore_info *psi,
|
|
+ struct dentry *root, int quiet);
|
|
+extern int pstore_mkfile(struct dentry *root,
|
|
+ struct pstore_record *record);
|
|
extern bool pstore_is_mounted(void);
|
|
+extern void pstore_record_init(struct pstore_record *record,
|
|
+ struct pstore_info *psi);
|
|
+
|
|
+/* Called during pstore init/exit. */
|
|
+int __init pstore_init_fs(void);
|
|
+void __exit pstore_exit_fs(void);
|
|
|
|
#endif
|