Merge tag 'printk-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...

[sfrench/cifs-2.6.git] / Documentation / core-api / printk-formats.rst

diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst
index dffd5c0b24f8858c70a5e3e9dbf3e6829b683de0..050f34f3a70f07147111532aaa1e61fee0066924 100644 (file)
--- a/Documentation/core-api/printk-formats.rst
+++ b/Documentation/core-api/printk-formats.rst
@@ -13,10 +13,10 @@ Integer types
 
        If variable is of Type,         use printk format specifier:
        ------------------------------------------------------------
-               char                    %hhd or %hhx
-               unsigned char           %hhu or %hhx
-               short int               %hd or %hx
-               unsigned short int      %hu or %hx
+               char                    %d or %x
+               unsigned char           %u or %x
+               short int               %d or %x
+               unsigned short int      %u or %x
                int                     %d or %x
                unsigned int            %u or %x
                long                    %ld or %lx
@@ -25,10 +25,10 @@ Integer types
                unsigned long long      %llu or %llx
                size_t                  %zu or %zx
                ssize_t                 %zd or %zx
-               s8                      %hhd or %hhx
-               u8                      %hhu or %hhx
-               s16                     %hd or %hx
-               u16                     %hu or %hx
+               s8                      %d or %x
+               u8                      %u or %x
+               s16                     %d or %x
+               u16                     %u or %x
                s32                     %d or %x
                u32                     %u or %x
                s64                     %lld or %llx
@@ -131,7 +131,7 @@ Kernel Pointers
 
 For printing kernel pointers which should be hidden from unprivileged
 users. The behaviour of %pK depends on the kptr_restrict sysctl - see
-Documentation/sysctl/kernel.txt for more details.
+Documentation/admin-guide/sysctl/kernel.rst for more details.
 
 Unmodified Addresses
 --------------------