diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/powerpc/kernel/prom_init.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 6ee4b72cda42..4e74fc588a3f 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
| @@ -2940,7 +2940,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, | |||
| 2940 | 2940 | ||
| 2941 | /* Don't print anything after quiesce under OPAL, it crashes OFW */ | 2941 | /* Don't print anything after quiesce under OPAL, it crashes OFW */ |
| 2942 | if (of_platform != PLATFORM_OPAL) { | 2942 | if (of_platform != PLATFORM_OPAL) { |
| 2943 | prom_printf("Booting Linux via __start() ...\n"); | 2943 | prom_printf("Booting Linux via __start() @ 0x%lx ...\n", kbase); |
| 2944 | prom_debug("->dt_header_start=0x%x\n", hdr); | 2944 | prom_debug("->dt_header_start=0x%x\n", hdr); |
| 2945 | } | 2945 | } |
| 2946 | 2946 | ||