diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /kernel/sys.c | |
| parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
| parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
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 |