diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:53:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:53:26 -0700 |
| commit | 65fc471343acbab05e2e24ad9688af43a37d6a1b (patch) | |
| tree | 9911274b04db7f248405c579ce2231dc57aa4776 /arch/sparc64/kernel | |
| parent | ccaa36f73544163ef6e15eb29a620130755f6001 (diff) | |
| parent | 94e45a2b87bde64fd2eb170999da2fd2c5b04d28 (diff) | |
| download | kernel-crypto-65fc471343acbab05e2e24ad9688af43a37d6a1b.tar.gz kernel-crypto-65fc471343acbab05e2e24ad9688af43a37d6a1b.tar.xz kernel-crypto-65fc471343acbab05e2e24ad9688af43a37d6a1b.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[SPARC64]: Do not include compat.h from asm-sparc64/signal.h any more.
[SPARC64]: Move signal compat bits to new header file.
Diffstat (limited to 'arch/sparc64/kernel')
| -rw-r--r-- | arch/sparc64/kernel/signal32.c | 1 | ||||
| -rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 1 | ||||
| -rw-r--r-- | arch/sparc64/kernel/sys_sunos32.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c index 708ba9b42cd..c45f21b881d 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c @@ -29,6 +29,7 @@ #include <asm/psrcompat.h> #include <asm/fpumacro.h> #include <asm/visasm.h> +#include <asm/compat_signal.h> #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index dbc6d1a3be1..e27cb71bd8e 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c @@ -61,6 +61,7 @@ #include <asm/semaphore.h> #include <asm/mmu_context.h> #include <asm/a.out.h> +#include <asm/compat_signal.h> asmlinkage long sys32_chown16(const char __user * filename, u16 user, u16 group) { diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c index e414c8ef022..7da72d3b322 100644 --- a/arch/sparc64/kernel/sys_sunos32.c +++ b/arch/sparc64/kernel/sys_sunos32.c @@ -43,6 +43,7 @@ #include <asm/idprom.h> /* for gethostid() */ #include <asm/unistd.h> #include <asm/system.h> +#include <asm/compat_signal.h> /* For the nfs mount emulation */ #include <linux/socket.h> |