diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:54:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:54:28 -0700 |
| commit | 6ebfc0e20b409f13e62bbb84ce70102b49945cfd (patch) | |
| tree | 67fea9b9c039ba47f96c7d51d8b2959b35543edf /arch/sh/kernel | |
| parent | 1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b (diff) | |
| parent | fac99d97469e7f91102f97101bea620e5f073196 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fixup __raw_read_trylock().
sh: Kill off remaining config.h references.
sh: Initial gitignore list
sh: build fixes for defconfigs.
sh: Kill off more dead headers.
sh: Set pclk default for SH7705.
sh: defconfig updates.
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/apm.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/entry.S | 6 | ||||
| -rw-r--r-- | arch/sh/kernel/setup.c | 4 | ||||
| -rw-r--r-- | arch/sh/kernel/sh_ksyms.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/vsyscall/.gitignore | 1 |
5 files changed, 5 insertions, 8 deletions
diff --git a/arch/sh/kernel/apm.c b/arch/sh/kernel/apm.c index 871e7d640002..4f66f91b1006 100644 --- a/arch/sh/kernel/apm.c +++ b/arch/sh/kernel/apm.c @@ -16,7 +16,6 @@ * [This document is available from Microsoft at: * http://www.microsoft.com/hwdev/busbios/amp_12.htm] */ -#include <linux/config.h> #include <linux/module.h> #include <linux/poll.h> #include <linux/timer.h> diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/entry.S index fe8221855b28..97c571fbcdf1 100644 --- a/arch/sh/kernel/entry.S +++ b/arch/sh/kernel/entry.S @@ -10,8 +10,8 @@ * for more details. * */ - #include <linux/sys.h> +#include <linux/errno.h> #include <linux/linkage.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -53,10 +53,6 @@ * syscall # * */ - -ENOSYS = 38 -EINVAL = 22 - #if defined(CONFIG_KGDB_NMI) NMI_VEC = 0x1c0 ! Must catch early for debounce #endif diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 77491cf9b259..36d86f9ac38a 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -1,5 +1,4 @@ -/* $Id: setup.c,v 1.30 2003/10/13 07:21:19 lethal Exp $ - * +/* * linux/arch/sh/kernel/setup.c * * Copyright (C) 1999 Niibe Yutaka @@ -21,6 +20,7 @@ #include <linux/utsname.h> #include <linux/cpu.h> #include <linux/pfn.h> +#include <linux/fs.h> #include <asm/uaccess.h> #include <asm/io.h> #include <asm/sections.h> diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c index d3cbfa2ad4a7..9daad70bc305 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms.c @@ -72,6 +72,7 @@ DECLARE_EXPORT(__ashrdi3); DECLARE_EXPORT(__ashldi3); DECLARE_EXPORT(__lshrdi3); DECLARE_EXPORT(__movstr); +DECLARE_EXPORT(__movstrSI16); EXPORT_SYMBOL(strcpy); diff --git a/arch/sh/kernel/vsyscall/.gitignore b/arch/sh/kernel/vsyscall/.gitignore new file mode 100644 index 000000000000..40836ad9079c --- /dev/null +++ b/arch/sh/kernel/vsyscall/.gitignore @@ -0,0 +1 @@ +vsyscall.lds |