diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-01-08 01:01:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 20:13:39 -0800 |
| commit | f8aaeacec159f2d9003872781fa4d49659e347fb (patch) | |
| tree | f59dc7ae8fccc41e2ded098182a146086c6e2239 /include/asm-um | |
| parent | c66fdd5e324392584c6f11de65cfe24b0e2d9303 (diff) | |
| download | linux-f8aaeacec159f2d9003872781fa4d49659e347fb.tar.bz2 | |
[PATCH] consolidate asm/futex.h
Most of the architectures have the same asm/futex.h. This consolidates them
into asm-generic, with the arches including it from their own asm/futex.h.
In the case of UML, this reverts the old broken futex.h and goes back to using
the same one as almost everyone else.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-um')
| -rw-r--r-- | include/asm-um/futex.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/asm-um/futex.h b/include/asm-um/futex.h index 142ee2d8e0fd..6a332a9f099c 100644 --- a/include/asm-um/futex.h +++ b/include/asm-um/futex.h @@ -1,12 +1,6 @@ -#ifndef __UM_FUTEX_H -#define __UM_FUTEX_H +#ifndef _ASM_FUTEX_H +#define _ASM_FUTEX_H -#include <linux/futex.h> -#include <asm/errno.h> -#include <asm/system.h> -#include <asm/processor.h> -#include <asm/uaccess.h> - -#include "asm/arch/futex.h" +#include <asm-generic/futex.h> #endif |