diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 08:05:44 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 08:05:44 -0700 |
| commit | 0606263f24f3d64960de742c55894190b5df903b (patch) | |
| tree | 673894f227c1a761f601ad7bdc1ceef003bb85cb /arch/x86/lib/x86-opcode-map.txt | |
| parent | a72255983f12f31f0c8d8275fb1a781546cfacb7 (diff) | |
| parent | d4c5725d57323e2348940fcc6416072671a9b432 (diff) | |
Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-nextlibnvdimm-for-4.8
Diffstat (limited to 'arch/x86/lib/x86-opcode-map.txt')
| -rw-r--r-- | arch/x86/lib/x86-opcode-map.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/x86-opcode-map.txt b/arch/x86/lib/x86-opcode-map.txt index d388de72eaca..28632ee68377 100644 --- a/arch/x86/lib/x86-opcode-map.txt +++ b/arch/x86/lib/x86-opcode-map.txt @@ -947,7 +947,7 @@ GrpTable: Grp15 4: XSAVE 5: XRSTOR | lfence (11B) 6: XSAVEOPT | clwb (66) | mfence (11B) -7: clflush | clflushopt (66) | sfence (11B) | pcommit (66),(11B) +7: clflush | clflushopt (66) | sfence (11B) EndTable GrpTable: Grp16 |