diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-15 09:16:58 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-15 09:16:58 +0300 |
| commit | 0c697fafc66830ca7d5dc19123a1d0641deaa1f6 (patch) | |
| tree | c56336719ca8de16f78ada78e606dffa471e47d5 /drivers/char | |
| parent | 09ef2378dc42339f3871584dc26d27da220277cb (diff) | |
| parent | ef954844c7ace62f773f4f23e28d2d915adc419f (diff) | |
| download | linux-0c697fafc66830ca7d5dc19123a1d0641deaa1f6.tar.xz | |
Backmerge tag 'v4.13-rc5' into drm-next
Linux 4.13-rc5
There's a really nasty nouveau collision, hopefully someone can take a look
once I pushed this out.
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/random.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index afa3ce7d3e72..8ad92707e45f 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1492,7 +1492,7 @@ static void _warn_unseeded_randomness(const char *func_name, void *caller, #ifndef CONFIG_WARN_ALL_UNSEEDED_RANDOM print_once = true; #endif - pr_notice("random: %s called from %pF with crng_init=%d\n", + pr_notice("random: %s called from %pS with crng_init=%d\n", func_name, caller, crng_init); } |