xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into core/debug

Browse Source 
Conflicts:
	lib/vsprintf.c

Manual merge:

	include/linux/kernel.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2008-09-10 09:09:51 +02:00
parent ab7476cf76 adee14b2e1
commit 6003ab0bad
1360 changed files with 38523 additions and 14845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/kernel.h
View File

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