diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-07 05:27:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-07 05:27:54 -0400 |
| commit | 48652ced1533c3372f996a0d83b6e73b1f1c9381 (patch) | |
| tree | 5e17729cfcdc97bf798a17b57cdb888b4ded65b0 /kernel/sys.c | |
| parent | 99bd5e2f245d8cd17d040c82d40becdb3efd9b69 (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into sched/core
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 6d1a7e0f9d5b..7cb426a58965 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -1118,7 +1118,7 @@ DECLARE_RWSEM(uts_sem); | |||
| 1118 | 1118 | ||
| 1119 | #ifdef COMPAT_UTS_MACHINE | 1119 | #ifdef COMPAT_UTS_MACHINE |
| 1120 | #define override_architecture(name) \ | 1120 | #define override_architecture(name) \ |
| 1121 | (current->personality == PER_LINUX32 && \ | 1121 | (personality(current->personality) == PER_LINUX32 && \ |
| 1122 | copy_to_user(name->machine, COMPAT_UTS_MACHINE, \ | 1122 | copy_to_user(name->machine, COMPAT_UTS_MACHINE, \ |
| 1123 | sizeof(COMPAT_UTS_MACHINE))) | 1123 | sizeof(COMPAT_UTS_MACHINE))) |
| 1124 | #else | 1124 | #else |