diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
| commit | aaadff81195056c7c14e0d834b3318c624c0fd78 (patch) | |
| tree | 34d66d8dcb25fa9ffb568f8acfdb317ddf203b44 /arch/powerpc/kernel/syscalls.c | |
| parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
| parent | df7addbb45874f0f992266003155de5a22e1872f (diff) | |
Merge branch 'master'
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 */ |