Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 668533dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

kallsyms: take advantage of the new '%px' format 



The conditional kallsym hex printing used a special fixed-width '%lx'
output (KALLSYM_FMT) in preparation for the hashing of %p, but that
series ended up adding a %px specifier to help with the conversions.

Use it, and avoid the "print pointer as an unsigned long" code.

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent da6af54d

include/linux/kallsyms.h

+0 −6
Original line number Diff line number Diff line
@@ -14,12 +14,6 @@ 
#define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \

			 2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1)



#ifndef CONFIG_64BIT

# define KALLSYM_FMT "%08lx"

#else

# define KALLSYM_FMT "%016lx"

#endif



struct module;



#ifdef CONFIG_KALLSYMS

kernel/kallsyms.c

+4 −4
Original line number Diff line number Diff line
@@ -614,14 +614,14 @@ static void s_stop(struct seq_file *m, void *p) 


static int s_show(struct seq_file *m, void *p)

{

	unsigned long value;

	void *value;

	struct kallsym_iter *iter = m->private;



	/* Some debugging symbols have no name.  Ignore them. */

	if (!iter->name[0])

		return 0;



	value = iter->show_value ? iter->value : 0;

	value = iter->show_value ? (void *)iter->value : NULL;



	if (iter->module_name[0]) {

		char type;
@@ -632,10 +632,10 @@ static int s_show(struct seq_file *m, void *p) 
		 */

		type = iter->exported ? toupper(iter->type) :

					tolower(iter->type);

		seq_printf(m, KALLSYM_FMT " %c %s\t[%s]\n", value,

		seq_printf(m, "%px %c %s\t[%s]\n", value,

			   type, iter->name, iter->module_name);

	} else

		seq_printf(m, KALLSYM_FMT " %c %s\n", value,

		seq_printf(m, "%px %c %s\n", value,

			   iter->type, iter->name);

	return 0;

}

kernel/module.c

+3 −3
Original line number Diff line number Diff line
@@ -4157,7 +4157,7 @@ static int m_show(struct seq_file *m, void *p) 
{

	struct module *mod = list_entry(p, struct module, list);

	char buf[MODULE_FLAGS_BUF_SIZE];

	unsigned long value;

	void *value;



	/* We always ignore unformed modules. */

	if (mod->state == MODULE_STATE_UNFORMED)
@@ -4173,8 +4173,8 @@ static int m_show(struct seq_file *m, void *p) 
		   mod->state == MODULE_STATE_COMING ? "Loading" :

		   "Live");

	/* Used by oprofile and other similar tools. */

	value = m->private ? 0 : (unsigned long)mod->core_layout.base;

	seq_printf(m, " 0x" KALLSYM_FMT, value);

	value = m->private ? NULL : mod->core_layout.base;

	seq_printf(m, " 0x%px", value);



	/* Taints info */

	if (mod->taints)