diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-22 00:06:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-22 00:06:51 -0400 |
| commit | 8b53b57576292b92b27769f9e213df19b6e57786 (patch) | |
| tree | cd851ce4fa71b2653f120d7f11a9c6cbcf311b19 /arch/x86/mm/pageattr-test.c | |
| parent | ab7e79243746e2a9c5f00243e60108189c44c9eb (diff) | |
| parent | 38cc1c3df77c1bb739a4766788eb9fa49f16ffdf (diff) | |
Merge branch 'x86/urgent' into x86/pat
Conflicts:
arch/x86/mm/pageattr.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/pageattr-test.c')
| -rw-r--r-- | arch/x86/mm/pageattr-test.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c index 6ae1f28a7ff2..7c3017287119 100644 --- a/arch/x86/mm/pageattr-test.c +++ b/arch/x86/mm/pageattr-test.c | |||
| @@ -224,8 +224,7 @@ static int pageattr_test(void) | |||
| 224 | failed += print_split(&sc); | 224 | failed += print_split(&sc); |
| 225 | 225 | ||
| 226 | if (failed) { | 226 | if (failed) { |
| 227 | printk(KERN_ERR "NOT PASSED. Please report.\n"); | 227 | WARN(1, KERN_ERR "NOT PASSED. Please report.\n"); |
| 228 | WARN_ON(1); | ||
| 229 | return -EINVAL; | 228 | return -EINVAL; |
| 230 | } else { | 229 | } else { |
| 231 | if (print) | 230 | if (print) |