diff options
| author | Ross Zwisler | 2018-02-03 08:26:26 +0100 |
|---|---|---|
| committer | Ross Zwisler | 2018-02-03 08:26:26 +0100 |
| commit | ee95f4059a833839bf52972191b2d4c3d3cec552 (patch) | |
| tree | a1c8587d9b82e64a75dde376a90a3d69b0f4847a /arch/x86/kernel/alternative.c | |
| parent | Merge branch 'for-4.16/dax' into libnvdimm-for-next (diff) | |
| parent | nfit-test: Add platform cap support from ACPI 6.2a to test (diff) | |
| download | kernel-qcow2-linux-ee95f4059a833839bf52972191b2d4c3d3cec552.tar.gz kernel-qcow2-linux-ee95f4059a833839bf52972191b2d4c3d3cec552.tar.xz kernel-qcow2-linux-ee95f4059a833839bf52972191b2d4c3d3cec552.zip | |
Merge branch 'for-4.16/nfit' into libnvdimm-for-next
Diffstat (limited to 'arch/x86/kernel/alternative.c')
| -rw-r--r-- | arch/x86/kernel/alternative.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index dbaf14d69ebd..4817d743c263 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -344,9 +344,12 @@ done: static void __init_or_module noinline optimize_nops(struct alt_instr *a, u8 *instr) { unsigned long flags; + int i; - if (instr[0] != 0x90) - return; + for (i = 0; i < a->padlen; i++) { + if (instr[i] != 0x90) + return; + } local_irq_save(flags); add_nops(instr + (a->instrlen - a->padlen), a->padlen); |