The patch titled
Subject: random: fix debug format strings
has been added to the -mm tree. Its filename is
random-fix-debug-format-strings.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Jiri Kosina <jkosina@xxxxxxx>
Subject: random: fix debug format strings
Fix the following warnings in formatting debug output:
drivers/char/random.c: In function `xfer_secondary_pool':
drivers/char/random.c:827: warning: format `%d' expects type `int', but argument 7 has type `size_t'
drivers/char/random.c: In function `account':
drivers/char/random.c:859: warning: format `%d' expects type `int', but argument 5 has type `size_t'
drivers/char/random.c:881: warning: format `%d' expects type `int', but argument 5 has type `size_t'
drivers/char/random.c: In function `random_read':
drivers/char/random.c:1141: warning: format `%d' expects type `int', but argument 5 has type `ssize_t'
drivers/char/random.c:1145: warning: format `%d' expects type `int', but argument 5 has type `ssize_t'
drivers/char/random.c:1145: warning: format `%d' expects type `int', but argument 6 has type `long unsigned int'
by using '%zd' instead of '%d' to properly denote ssize_t/size_t conversion.
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Cc: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/random.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/char/random.c~random-fix-debug-format-strings drivers/char/random.c
--- a/drivers/char/random.c~random-fix-debug-format-strings
+++ a/drivers/char/random.c
@@ -825,7 +825,7 @@ static void xfer_secondary_pool(struct e
bytes = min_t(int, bytes, sizeof(tmp));
DEBUG_ENT("going to reseed %s with %d bits "
- "(%d of %d requested)\n",
+ "(%zd of %d requested)\n",
r->name, bytes * 8, nbytes * 8, r->entropy_count);
bytes = extract_entropy(r->pull, tmp, bytes,
@@ -856,7 +856,7 @@ static size_t account(struct entropy_sto
spin_lock_irqsave(&r->lock, flags);
BUG_ON(r->entropy_count > r->poolinfo->POOLBITS);
- DEBUG_ENT("trying to extract %d bits from %s\n",
+ DEBUG_ENT("trying to extract %zd bits from %s\n",
nbytes * 8, r->name);
/* Can we pull enough? */
@@ -878,7 +878,7 @@ static size_t account(struct entropy_sto
}
}
- DEBUG_ENT("debiting %d entropy credits from %s%s\n",
+ DEBUG_ENT("debiting %zd entropy credits from %s%s\n",
nbytes * 8, r->name, r->limit ? "" : " (unlimited)");
spin_unlock_irqrestore(&r->lock, flags);
@@ -1138,11 +1138,11 @@ random_read(struct file *file, char __us
if (n > SEC_XFER_SIZE)
n = SEC_XFER_SIZE;
- DEBUG_ENT("reading %d bits\n", n*8);
+ DEBUG_ENT("reading %zd bits\n", n*8);
n = extract_entropy_user(&blocking_pool, buf, n);
- DEBUG_ENT("read got %d bits (%d still needed)\n",
+ DEBUG_ENT("read got %zd bits (%zd still needed)\n",
n*8, (nbytes-n)*8);
if (n == 0) {
_
Patches currently in -mm which might be from jkosina@xxxxxxx are
linux-next.patch
random-make-it-possible-to-enable-debugging-without-rebuild.patch
random-fix-debug-format-strings.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
