aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-05 11:39:00 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-05 11:39:00 -0800
commit221d46841b931d0e6b11e6251e482f2afe3974dd (patch)
treefeb33999f71a84003f4ac752300c81f47f9e272f /include
parent4d20826ffb6fa80c71b85d2cb858ae400a59a4d5 (diff)
parent633872b980f55f40a5e7de374f26970e41e2137b (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest: lguest: tidy up documentation kernel/futex.c: make 3 functions static unexport access_process_vm lguest: make async_hcall() static
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/lguest_hcall.h3
-rw-r--r--include/linux/futex.h4
2 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-x86/lguest_hcall.h b/include/asm-x86/lguest_hcall.h
index 9c5092b6aa9..2091779e91f 100644
--- a/include/asm-x86/lguest_hcall.h
+++ b/include/asm-x86/lguest_hcall.h
@@ -54,9 +54,6 @@ hcall(unsigned long call,
}
/*:*/
-void async_hcall(unsigned long call,
- unsigned long arg1, unsigned long arg2, unsigned long arg3);
-
/* Can't use our min() macro here: needs to be a constant */
#define LGUEST_IRQS (NR_IRQS < 32 ? NR_IRQS: 32)
diff --git a/include/linux/futex.h b/include/linux/futex.h
index 99650353adf..92d420fe03f 100644
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
@@ -149,10 +149,6 @@ union futex_key {
int offset;
} both;
};
-int get_futex_key(u32 __user *uaddr, struct rw_semaphore *shared,
- union futex_key *key);
-void get_futex_key_refs(union futex_key *key);
-void drop_futex_key_refs(union futex_key *key);
#ifdef CONFIG_FUTEX
extern void exit_robust_list(struct task_struct *curr);