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

Commit 62a8bd6c authored by Milton Miller's avatar Milton Miller Committed by Paul Mackerras
Browse files

powerpc: Use is_kdump_kernel() 



linux/crash_dump.h defines is_kdump_kernel() to be used by code that
needs to know if the previous kernel crashed instead of a (clean) boot
or reboot.

This updates the just added powerpc code to use it.  This is needed
for the next commit, which will remove __kdump_flag.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 1767c8f3

arch/powerpc/include/asm/kdump.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 


#ifndef __ASSEMBLY__



extern unsigned long __kdump_flag;



#if defined(CONFIG_CRASH_DUMP) && !defined(CONFIG_RELOCATABLE)

extern void reserve_kdump_trampoline(void);

extern void setup_kdump_trampoline(void);

arch/powerpc/kernel/iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/bitops.h>

#include <linux/iommu-helper.h>

#include <linux/crash_dump.h>

#include <asm/io.h>

#include <asm/prom.h>

#include <asm/iommu.h>
@@ -460,7 +461,7 @@ void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist, 


static void iommu_table_clear(struct iommu_table *tbl)

{

	if (!__kdump_flag) {

	if (!is_kdump_kernel()) {

		/* Clear the table in case firmware left allocations in it */

		ppc_md.tce_free(tbl, tbl->it_offset, tbl->it_size);

		return;

arch/powerpc/platforms/cell/ras.c

+3 −3
Original line number Diff line number Diff line
@@ -13,15 +13,15 @@ 
#include <linux/kernel.h>

#include <linux/smp.h>

#include <linux/reboot.h>

#include <linux/kexec.h>

#include <linux/crash_dump.h>



#include <asm/reg.h>

#include <asm/io.h>

#include <asm/prom.h>

#include <asm/kexec.h>

#include <asm/machdep.h>

#include <asm/rtas.h>

#include <asm/cell-regs.h>

#include <asm/kdump.h>



#include "ras.h"
@@ -112,7 +112,7 @@ static int __init cbe_ptcal_enable_on_node(int nid, int order) 
	int ret = -ENOMEM;

	unsigned long addr;



	if (__kdump_flag)

	if (is_kdump_kernel())

		rtas_call(ptcal_stop_tok, 1, 1, NULL, nid);



	area = kmalloc(sizeof(*area), GFP_KERNEL);

arch/powerpc/platforms/pseries/iommu.c

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

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/crash_dump.h>

#include <asm/io.h>

#include <asm/prom.h>

#include <asm/rtas.h>
@@ -44,7 +45,6 @@ 
#include <asm/tce.h>

#include <asm/ppc-pci.h>

#include <asm/udbg.h>

#include <asm/kdump.h>



#include "plpar_wrappers.h"
@@ -292,7 +292,7 @@ static void iommu_table_setparms(struct pci_controller *phb, 


	tbl->it_base = (unsigned long)__va(*basep);



	if (!__kdump_flag)

	if (!is_kdump_kernel())

		memset((void *)tbl->it_base, 0, *sizep);



	tbl->it_busno = phb->bus->number;