diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 14:30:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 14:30:58 -0700 |
| commit | b693ffe67363119199ffe9f2fac9119475968e8a (patch) | |
| tree | 3b1e6ab0720bbfcbb3a4d58cd3a13750f830ffe8 /arch/sh/mm/consistent.c | |
| parent | 14408c4f4172eafc26ff52bebb7a8ab85b1c5492 (diff) | |
| parent | 4eb00c9f92202a759aadbce73ea4a947b639b5e6 (diff) | |
| download | op-kernel-dev-b693ffe67363119199ffe9f2fac9119475968e8a.zip op-kernel-dev-b693ffe67363119199ffe9f2fac9119475968e8a.tar.gz | |
Merge branch 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
i2c: fix i2c-sh_mobile timing issues
sh64: resume_kernel fix for kernel oops built with CONFIG_BKL_PREEMPT=y.
sh: resume_kernel fix for kernel oops built with CONFIG_BKL_PREEMPT=y.
sh: fix semtimedop syscall
sh: update AP325RXA defconfig
sh: update Migo-R defconfig
sh: fix platform_resource_setup_memory() section mismatch
sh: fix kexec entry point for crash kernels
sh: crash kernel resource fix
sh: fix ptrace_64.c:user_disable_single_step()
sh64: re-add the __strnlen_user() prototype
Diffstat (limited to 'arch/sh/mm/consistent.c')
| -rw-r--r-- | arch/sh/mm/consistent.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index 895bb3f..64b8f7f 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c @@ -101,7 +101,7 @@ static int __init memchunk_setup(char *str) } __setup("memchunk.", memchunk_setup); -static void memchunk_cmdline_override(char *name, unsigned long *sizep) +static void __init memchunk_cmdline_override(char *name, unsigned long *sizep) { char *p = boot_command_line; int k = strlen(name); @@ -118,8 +118,8 @@ static void memchunk_cmdline_override(char *name, unsigned long *sizep) } } -int platform_resource_setup_memory(struct platform_device *pdev, - char *name, unsigned long memsize) +int __init platform_resource_setup_memory(struct platform_device *pdev, + char *name, unsigned long memsize) { struct resource *r; dma_addr_t dma_handle; |
