diff options
author | Len Brown <len.brown@intel.com> | 2005-12-21 04:38:01 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-12-21 04:38:01 -0500 |
commit | d8bcd8e41576809f276fa44be5012568296cce41 (patch) | |
tree | ec48438ed1a7b3d3794a0a4cc577d0bab69b7f03 /arch/powerpc/kernel/syscalls.c | |
parent | 5b2db367a28c12e8dfd0b404d9ea35e948c5d7b3 (diff) | |
parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) |
Auto-update from upstream
Diffstat (limited to 'arch/powerpc/kernel/syscalls.c')
-rw-r--r-- | arch/powerpc/kernel/syscalls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c index f72ced11212d..91b93d917b64 100644 --- a/arch/powerpc/kernel/syscalls.c +++ b/arch/powerpc/kernel/syscalls.c | |||
@@ -247,7 +247,7 @@ long ppc64_personality(unsigned long personality) | |||
247 | #define OVERRIDE_MACHINE 0 | 247 | #define OVERRIDE_MACHINE 0 |
248 | #endif | 248 | #endif |
249 | 249 | ||
250 | static inline int override_machine(char *mach) | 250 | static inline int override_machine(char __user *mach) |
251 | { | 251 | { |
252 | if (OVERRIDE_MACHINE) { | 252 | if (OVERRIDE_MACHINE) { |
253 | /* change ppc64 to ppc */ | 253 | /* change ppc64 to ppc */ |