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

Commit 577830b0 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] Consolidate pseries platform header files into pseries.h 



Following the example of platforms/pasemi, consolidate a couple of
tiny header files in platforms/pseries into pseries.h.

This gives us a convenient place to put things that need to be
available to the platform code, but not public. And hopefully will
help people resist the temptation of sticking externs in C files.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 944b380e

arch/powerpc/platforms/pseries/firmware.h

deleted100644 → 0
+0 −17
Original line number Original line Diff line number Diff line 
/*

 * Copyright 2006 IBM Corporation.

 *

 *  This program is free software; you can redistribute it and/or

 *  modify it under the terms of the GNU General Public License

 *  as published by the Free Software Foundation; either version

 *  2 of the License, or (at your option) any later version.

 */



#ifndef _PSERIES_FIRMWARE_H

#define _PSERIES_FIRMWARE_H



#include <asm/firmware.h>



extern void __init fw_feature_init(void);



#endif /* _PSERIES_FIRMWARE_H */

arch/powerpc/platforms/pseries/pseries.h

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright 2006 IBM Corporation.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#ifndef _PSERIES_PSERIES_H

#define _PSERIES_PSERIES_H



extern void __init fw_feature_init(void);



struct pt_regs;



extern int pSeries_system_reset_exception(struct pt_regs *regs);

extern int pSeries_machine_check_exception(struct pt_regs *regs);



#endif /* _PSERIES_PSERIES_H */

arch/powerpc/platforms/pseries/ras.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include <asm/udbg.h>

#include <asm/udbg.h>

#include <asm/firmware.h>

#include <asm/firmware.h>





#include "ras.h"

#include "pseries.h"





static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX];

static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX];

static DEFINE_SPINLOCK(ras_log_buf_lock);

static DEFINE_SPINLOCK(ras_log_buf_lock);

arch/powerpc/platforms/pseries/ras.h

deleted100644 → 0
+0 −9
Original line number Original line Diff line number Diff line 
#ifndef _PSERIES_RAS_H

#define _PSERIES_RAS_H



struct pt_regs;



extern int pSeries_system_reset_exception(struct pt_regs *regs);

extern int pSeries_machine_check_exception(struct pt_regs *regs);



#endif /* _PSERIES_RAS_H */

arch/powerpc/platforms/pseries/setup.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -65,10 +65,10 @@ 
#include <asm/i8259.h>

#include <asm/i8259.h>

#include <asm/udbg.h>

#include <asm/udbg.h>

#include <asm/smp.h>

#include <asm/smp.h>

#include <asm/firmware.h>





#include "plpar_wrappers.h"

#include "plpar_wrappers.h"

#include "ras.h"

#include "pseries.h"

#include "firmware.h"





#ifdef DEBUG

#ifdef DEBUG

#define DBG(fmt...) udbg_printf(fmt)

#define DBG(fmt...) udbg_printf(fmt)