Merge remote-tracking branch 'battery/master'

[karo-tx-linux.git] / Documentation / printk-formats.txt

diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 3e8cb73ac43c2be41b7537c156f7d87a1efbba90..445ad743ec814ee4571c175884d3ccce4ffda11a 100644 (file)
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -97,7 +97,7 @@ IPv4 addresses:
 
        %pI4    1.2.3.4
        %pi4    001.002.003.004
-       %p[Ii][hnbl]
+       %p[Ii]4[hnbl]
 
        For printing IPv4 dot-separated decimal addresses. The 'I4' and 'i4'
        specifiers result in a printed address with ('i4') or without ('I4')
@@ -168,6 +168,15 @@ UUID/GUID addresses:
        Where no additional specifiers are used the default little endian
        order with lower case hex characters will be printed.
 
+dentry names:
+       %pd{,2,3,4}
+       %pD{,2,3,4}
+
+       For printing dentry name; if we race with d_move(), the name might be
+       a mix of old and new ones, but it won't oops.  %pd dentry is a safer
+       equivalent of %s dentry->d_name.name we used to use, %pd<n> prints
+       n last components.  %pD does the same thing for struct file.
+
 struct va_format:
 
        %pV
@@ -185,11 +194,11 @@ struct va_format:
 
 u64 SHOULD be printed with %llu/%llx, (unsigned long long):
 
-       printk("%llu", (unsigned long long)u64_var);
+       printk("%llu", u64_var);
 
 s64 SHOULD be printed with %lld/%llx, (long long):
 
-       printk("%lld", (long long)s64_var);
+       printk("%lld", s64_var);
 
 If <type> is dependent on a config option for its size (e.g., sector_t,
 blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a