[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>
This commit is contained in:
Jeff Dike
2006-01-08 01:01:32 -08:00
committed by Linus Torvalds
parent c66fdd5e32
commit f8aaeacec1
18 changed files with 72 additions and 777 deletions

View File

@@ -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