summaryrefslogtreecommitdiffstats
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-10 09:09:51 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-10 09:09:51 +0200
commit6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (patch)
tree2087ca69776116b70a6af0daae9c10bfac1aa347 /include/linux/kernel.h
parentab7476cf76e560f0efda2a631a70aabe93009025 (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
downloadlinux-6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b.tar.gz
linux-6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b.tar.bz2
linux-6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b.zip
Merge branch 'linus' into core/debug
Conflicts: lib/vsprintf.c Manual merge: include/linux/kernel.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 4e1366b552ae..3f30557be2a3 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -188,7 +188,6 @@ extern int core_kernel_text(unsigned long addr);
extern int __kernel_text_address(unsigned long addr);
extern int kernel_text_address(unsigned long addr);
extern int func_ptr_is_kernel_text(void *ptr);
-extern void *dereference_function_descriptor(void *ptr);
struct pid;
extern struct pid *session_of_pgrp(struct pid *pgrp);