diff options
| author | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-21 15:00:22 -0500 | 
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-21 15:00:22 -0500 | 
| commit | e5b8d2c840f1ec65ced213c69fc1260b2343f094 (patch) | |
| tree | ee3d07c0ec3c4fd7efc50f1bc7ae21e376ecb023 /modules/devices/x86 | |
| parent | 57599512e1a26db103ad0cd4f6c42ad16605b8db (diff) | |
| parent | 69a2124e9a081518297951256eb5c8d72d93361f (diff) | |
Merge tag 'upstream/0.5.1+git20170620'
Upstream version 0.5.1+git20170620
Diffstat (limited to 'modules/devices/x86')
| -rw-r--r-- | modules/devices/x86/processor.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/modules/devices/x86/processor.c b/modules/devices/x86/processor.c index 7935a83d..25dc6c4a 100644 --- a/modules/devices/x86/processor.c +++ b/modules/devices/x86/processor.c @@ -369,7 +369,7 @@ static struct {  	{ "tsc",	"Time Stamp Counter and RDTSC instruction"	},  	{ "msr",	"Model Specific Registers"			},  	{ "pae",	"Physical Address Extensions"			}, -	{ "mce",	"Machine Check Architeture"			}, +	{ "mce",	"Machine Check Architecture"			},  	{ "cx8",	"CMPXCHG8 instruction"				},  	{ "apic",	"Advanced Programmable Interrupt Controller"	},  	{ "sep",	"Fast System Call (SYSENTER/SYSEXIT)"		}, | 
