diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 17:23:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 17:23:29 +0200 |
| commit | 9dfed08eb4086584205717894177a9ee930c88c4 (patch) | |
| tree | 3455b242f0e85a86d836858a86bd6ffd21279e22 /arch/x86/kernel/cpu/feature_names.c | |
| parent | 1cf44baad76b6f20f95ece397c6f643320aa44c9 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | op-kernel-dev-9dfed08eb4086584205717894177a9ee930c88c4.zip op-kernel-dev-9dfed08eb4086584205717894177a9ee930c88c4.tar.gz | |
Merge commit 'v2.6.27-rc6' into core/resources
Diffstat (limited to 'arch/x86/kernel/cpu/feature_names.c')
| -rw-r--r-- | arch/x86/kernel/cpu/feature_names.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/feature_names.c b/arch/x86/kernel/cpu/feature_names.c index e43ad4a..c901779 100644 --- a/arch/x86/kernel/cpu/feature_names.c +++ b/arch/x86/kernel/cpu/feature_names.c @@ -39,7 +39,8 @@ const char * const x86_cap_flags[NCAPINTS*32] = { NULL, NULL, NULL, NULL, "constant_tsc", "up", NULL, "arch_perfmon", "pebs", "bts", NULL, NULL, - "rep_good", NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "rep_good", NULL, NULL, NULL, + "nopl", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* Intel-defined (#2) */ |
