projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
mce-internal.h
diff --git
a/arch/x86/kernel/cpu/mcheck/mce-internal.h
b/arch/x86/kernel/cpu/mcheck/mce-internal.h
index 09edd0b65fefbb1eda927e3af5ac84a8e4ab40cd..10b46906767fd4857389570322757fa89bbc8e6c 100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/mce-internal.h
+++ b/
arch/x86/kernel/cpu/mcheck/mce-internal.h
@@
-3,6
+3,8
@@
enum severity_level {
MCE_NO_SEVERITY,
enum severity_level {
MCE_NO_SEVERITY,
+ MCE_DEFERRED_SEVERITY,
+ MCE_UCNA_SEVERITY = MCE_DEFERRED_SEVERITY,
MCE_KEEP_SEVERITY,
MCE_SOME_SEVERITY,
MCE_AO_SEVERITY,
MCE_KEEP_SEVERITY,
MCE_SOME_SEVERITY,
MCE_AO_SEVERITY,
@@
-21,7
+23,7
@@
struct mce_bank {
char attrname[ATTR_LEN]; /* attribute name */
};
char attrname[ATTR_LEN]; /* attribute name */
};
-int mce_severity(struct mce *a, int tolerant, char **msg);
+int mce_severity(struct mce *a, int tolerant, char **msg
, bool is_excp
);
struct dentry *mce_get_debugfs_dir(void);
extern struct mce_bank *mce_banks;
struct dentry *mce_get_debugfs_dir(void);
extern struct mce_bank *mce_banks;