diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:32:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:32:44 -0500 |
| commit | 8c5db92a705d9e2c986adec475980d1120fa07b4 (patch) | |
| tree | 9f0eea56889819707c0a1a8eb5b1fb2db3cdaf3d /scripts/gcc-plugins/gen-random-seed.sh | |
| parent | ca5d376e17072c1b60c3fee66f3be58ef018952d (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
include/linux/compiler-clang.h
include/linux/compiler-gcc.h
include/linux/compiler-intel.h
include/uapi/linux/stddef.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/gcc-plugins/gen-random-seed.sh')
| -rw-r--r-- | scripts/gcc-plugins/gen-random-seed.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/gcc-plugins/gen-random-seed.sh b/scripts/gcc-plugins/gen-random-seed.sh index 7514850f4815..68af5cc20a64 100644 --- a/scripts/gcc-plugins/gen-random-seed.sh +++ b/scripts/gcc-plugins/gen-random-seed.sh | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | # SPDX-License-Identifier: GPL-2.0 | ||
| 2 | 3 | ||
| 3 | if [ ! -f "$1" ]; then | 4 | if [ ! -f "$1" ]; then |
| 4 | SEED=`od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n'` | 5 | SEED=`od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n'` |