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

Commit 51ccbb0a authored by Petr Mladek's avatar Petr Mladek
Browse files

Merge branch 'for-4.16-print-symbol' into for-4.16

parents 3ccdc519 d2279c9d

Documentation/filesystems/sysfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ static ssize_t dev_attr_show(struct kobject *kobj, struct attribute *attr, 
        if (dev_attr->show)

                ret = dev_attr->show(dev, dev_attr, buf);

        if (ret >= (ssize_t)PAGE_SIZE) {

                print_symbol("dev_attr_show: %s returned bad count\n",

                                (unsigned long)dev_attr->show);

                printk("dev_attr_show: %pS returned bad count\n",

                                dev_attr->show);

        }

        return ret;

}

Documentation/translations/zh_CN/filesystems/sysfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ static ssize_t dev_attr_show(struct kobject *kobj, struct attribute *attr, 
        if (dev_attr->show)

                ret = dev_attr->show(dev, dev_attr, buf);

        if (ret >= (ssize_t)PAGE_SIZE) {

                print_symbol("dev_attr_show: %s returned bad count\n",

                                (unsigned long)dev_attr->show);

                printk("dev_attr_show: %pS returned bad count\n",

                                dev_attr->show);

        }

        return ret;

}

arch/arm/kernel/process.c

+2 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/unistd.h>

#include <linux/user.h>

#include <linux/interrupt.h>

#include <linux/kallsyms.h>

#include <linux/init.h>

#include <linux/elfcore.h>

#include <linux/pm.h>
@@ -121,8 +120,8 @@ void __show_regs(struct pt_regs *regs) 


	show_regs_print_info(KERN_DEFAULT);



	print_symbol("PC is at %s\n", instruction_pointer(regs));

	print_symbol("LR is at %s\n", regs->ARM_lr);

	printk("PC is at %pS\n", (void *)instruction_pointer(regs));

	printk("LR is at %pS\n", (void *)regs->ARM_lr);

	printk("pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n",

	       regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr);

	printk("sp : %08lx  ip : %08lx  fp : %08lx\n",

arch/arm64/kernel/process.c

+2 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <linux/delay.h>

#include <linux/reboot.h>

#include <linux/interrupt.h>

#include <linux/kallsyms.h>

#include <linux/init.h>

#include <linux/cpu.h>

#include <linux/elfcore.h>
@@ -221,8 +220,8 @@ void __show_regs(struct pt_regs *regs) 


	show_regs_print_info(KERN_DEFAULT);

	print_pstate(regs);

	print_symbol("pc : %s\n", regs->pc);

	print_symbol("lr : %s\n", lr);

	printk("pc : %pS\n", (void *)regs->pc);

	printk("lr : %pS\n", (void *)lr);

	printk("sp : %016llx\n", sp);



	i = top_reg;

arch/c6x/kernel/traps.c

+1 −3
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/module.h>

#include <linux/ptrace.h>

#include <linux/sched/debug.h>

#include <linux/kallsyms.h>

#include <linux/bug.h>



#include <asm/soc.h>
@@ -375,8 +374,7 @@ static void show_trace(unsigned long *stack, unsigned long *endstack) 
			if (i % 5 == 0)

				pr_debug("\n	    ");

#endif

			pr_debug(" [<%08lx>]", addr);

			print_symbol(" %s\n", addr);

			pr_debug(" [<%08lx>] %pS\n", addr, (void *)addr);

			i++;

		}

	}