Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[sfrench/cifs-2.6.git] / include / linux / kernel.h

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 52b70894eaa53fe9d827481e1f96104fa77c1654..6a1eb0b0aad96f2e8f890efb71ad5013a7241f20 100644 (file)
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -439,7 +439,8 @@ extern long simple_strtol(const char *,char **,unsigned int);
 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
 extern long long simple_strtoll(const char *,char **,unsigned int);
 
-extern int num_to_str(char *buf, int size, unsigned long long num);
+extern int num_to_str(char *buf, int size,
+                     unsigned long long num, unsigned int width);
 
 /* lib/printf utilities */
 
@@ -543,6 +544,7 @@ extern enum system_states {
        SYSTEM_RESTART,
 } system_state;
 
+/* This cannot be an enum because some may be used in assembly source. */
 #define TAINT_PROPRIETARY_MODULE       0
 #define TAINT_FORCED_MODULE            1
 #define TAINT_CPU_OUT_OF_SPEC          2
@@ -560,7 +562,8 @@ extern enum system_states {
 #define TAINT_SOFTLOCKUP               14
 #define TAINT_LIVEPATCH                        15
 #define TAINT_AUX                      16
-#define TAINT_FLAGS_COUNT              17
+#define TAINT_RANDSTRUCT               17
+#define TAINT_FLAGS_COUNT              18
 
 struct taint_flag {
        char c_true;    /* character printed when tainted */