From e1ffb9a34e69531e0b02b21ce099257b5052272f Mon Sep 17 00:00:00 2001 From: Amerigo Wang Date: Mon, 14 Dec 2009 18:00:22 -0800 Subject: [PATCH] --- yaml --- r: 176336 b: refs/heads/master c: 948c1e2521979c332b21b623414cf258150f214e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 9 --------- trunk/include/linux/kallsyms.h | 12 ------------ 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/[refs] b/[refs] index 073eed4a9982..ec5587acbe8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29671f22a8b6522db3b126a3fdfb208759ce46e3 +refs/heads/master: 948c1e2521979c332b21b623414cf258150f214e diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index eb2c138c277c..21ab9357326d 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -291,15 +291,6 @@ Who: Michael Buesch --------------------------- -What: print_fn_descriptor_symbol() -When: October 2009 -Why: The %pF vsprintf format provides the same functionality in a - simpler way. print_fn_descriptor_symbol() is deprecated but - still present to give out-of-tree modules time to change. -Who: Bjorn Helgaas - ---------------------------- - What: /sys/o2cb symlink When: January 2010 Why: /sys/fs/o2cb is the proper location for this information - /sys/o2cb diff --git a/trunk/include/linux/kallsyms.h b/trunk/include/linux/kallsyms.h index 792274269f2b..d8e9b3d1c23c 100644 --- a/trunk/include/linux/kallsyms.h +++ b/trunk/include/linux/kallsyms.h @@ -107,18 +107,6 @@ static inline void print_symbol(const char *fmt, unsigned long addr) __builtin_extract_return_addr((void *)addr)); } -/* - * Pretty-print a function pointer. This function is deprecated. - * Please use the "%pF" vsprintf format instead. - */ -static inline void __deprecated print_fn_descriptor_symbol(const char *fmt, void *addr) -{ -#if defined(CONFIG_IA64) || defined(CONFIG_PPC64) - addr = *(void **)addr; -#endif - print_symbol(fmt, (unsigned long)addr); -} - static inline void print_ip_sym(unsigned long ip) { printk("[<%p>] %pS\n", (void *) ip, (void *) ip);