diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:51:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:51:10 -0500 |
| commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
| tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /scripts/gcc-plugins/gen-random-seed.sh | |
| parent | c201c91799d687c0a6d8c3272950f51aad5ffebe (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/include/asm/x2apic.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'` |