diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/common/dis/i386/dis_tables.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/usr/src/common/dis/i386/dis_tables.c b/usr/src/common/dis/i386/dis_tables.c index 502165047c..26067a0fc5 100644 --- a/usr/src/common/dis/i386/dis_tables.c +++ b/usr/src/common/dis/i386/dis_tables.c @@ -3551,8 +3551,6 @@ just_mem: break; } /*FALLTHROUGH*/ -<<<<<<< HEAD -======= case SVM: if (mode == 3) { #if DIS_TEXT @@ -3591,7 +3589,6 @@ just_mem: break; } /*FALLTHROUGH*/ ->>>>>>> ed22c7109fc5dd9e1b7a5d0333bdc7ad2718e2ab case MONITOR_MWAIT: if (mode == 3) { if (r_m == 0) { |