diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-19 10:48:09 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-19 10:48:09 (GMT) |
| commit | c8710ad38900153af7a3e6762e99c062cfa46443 (patch) | |
| tree | a0c0632274c4eb72f51e99a5861f71cffe65ea60 /arch/sh/kernel | |
| parent | 6016ee13db518ab1cd0cbf43fc2ad5712021e338 (diff) | |
| parent | 86397dc3ccfc0e17b7550d05eaf15fe91f6498dd (diff) | |
| download | linux-fsl-qoriq-c8710ad38900153af7a3e6762e99c062cfa46443.tar.xz | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/clkdev.c | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/process_64.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/clkdev.c b/arch/sh/kernel/clkdev.c index defdd6e..befc255 100644 --- a/arch/sh/kernel/clkdev.c +++ b/arch/sh/kernel/clkdev.c @@ -36,7 +36,7 @@ static DEFINE_MUTEX(clocks_mutex); * If an entry has a device ID, it must match * If an entry has a connection ID, it must match * Then we take the most specific entry - with the following - * order of precidence: dev+con > dev only > con only. + * order of precedence: dev+con > dev only > con only. */ static struct clk *clk_find(const char *dev_id, const char *con_id) { diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index d4ca648..68d128d 100644 --- a/arch/sh/kernel/process_64.c +++ b/arch/sh/kernel/process_64.c @@ -483,7 +483,7 @@ asmlinkage int sys_vfork(unsigned long r2, unsigned long r3, /* * sys_execve() executes a new program. */ -asmlinkage int sys_execve(char *ufilename, char **uargv, +asmlinkage int sys_execve(const char *ufilename, char **uargv, char **uenvp, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs *pregs) |