diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 11:39:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 11:39:00 -0800 |
| commit | 221d46841b931d0e6b11e6251e482f2afe3974dd (patch) | |
| tree | feb33999f71a84003f4ac752300c81f47f9e272f /include | |
| parent | cpm_load_patch() - declartion conflict (diff) | |
| parent | lguest: tidy up documentation (diff) | |
| download | linux-dev-221d46841b931d0e6b11e6251e482f2afe3974dd.tar.xz linux-dev-221d46841b931d0e6b11e6251e482f2afe3974dd.zip | |
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.h | 3 | ||||
| -rw-r--r-- | include/linux/futex.h | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-x86/lguest_hcall.h b/include/asm-x86/lguest_hcall.h index 9c5092b6aa9f..2091779e91fb 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 99650353adfa..92d420fe03f8 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); |