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

Commit 047ea784 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc 



For these, I have just done the lame-o merge where the file ends up
looking like:

	#ifndef CONFIG_PPC64
	#include <asm-ppc/foo.h>
	#else
	... contents from asm-ppc64/foo.h
	#endif

so nothing has changed, really, except that we reduce include/asm-ppc64
a bit more.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 800fc3ee

include/asm-ppc64/io.h→include/asm-powerpc/io.h

+8 −4
Original line number Diff line number Diff line 
#ifndef _PPC64_IO_H

#define _PPC64_IO_H

#ifndef _ASM_POWERPC_IO_H

#define _ASM_POWERPC_IO_H



/* 

 * This program is free software; you can redistribute it and/or
@@ -8,7 +8,10 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#include <linux/config.h>

#ifndef CONFIG_PPC64

#include <asm-ppc/io.h>

#else



#include <linux/compiler.h>

#include <asm/page.h>

#include <asm/byteorder.h>
@@ -455,4 +458,5 @@ extern int check_legacy_ioport(unsigned long base_port); 


#endif /* __KERNEL__ */



#endif /* _PPC64_IO_H */
 
#endif /* CONFIG_PPC64 */

#endif /* _ASM_POWERPC_IO_H */

include/asm-ppc64/mmu.h→include/asm-powerpc/mmu.h

+9 −5
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_MMU_H_

#define _ASM_POWERPC_MMU_H_



#ifndef CONFIG_PPC64

#include <asm-ppc/mmu.h>

#else



/*

 * PowerPC memory management structures

 *
@@ -10,10 +17,6 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#ifndef _PPC64_MMU_H_

#define _PPC64_MMU_H_



#include <linux/config.h>

#include <asm/asm-compat.h>

#include <asm/page.h>
@@ -392,4 +395,5 @@ static inline unsigned long get_vsid(unsigned long context, unsigned long ea) 


#endif /* __ASSEMBLY */



#endif /* _PPC64_MMU_H_ */
 
#endif /* CONFIG_PPC64 */

#endif /* _ASM_POWERPC_MMU_H_ */

include/asm-ppc64/mmu_context.h→include/asm-powerpc/mmu_context.h

+8 −4
Original line number Diff line number Diff line 
#ifndef __PPC64_MMU_CONTEXT_H

#define __PPC64_MMU_CONTEXT_H

#ifndef __ASM_POWERPC_MMU_CONTEXT_H

#define __ASM_POWERPC_MMU_CONTEXT_H



#ifndef CONFIG_PPC64

#include <asm-ppc/mmu_context.h>

#else



#include <linux/config.h>

#include <linux/kernel.h>	

#include <linux/mm.h>	

#include <asm/mmu.h>
@@ -82,4 +85,5 @@ static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next) 
	local_irq_restore(flags);

}



#endif /* __PPC64_MMU_CONTEXT_H */
 
#endif /* CONFIG_PPC64 */

#endif /* __ASM_POWERPC_MMU_CONTEXT_H */

include/asm-ppc64/mmzone.h→include/asm-powerpc/mmzone.h

+0 −0

File moved.

View file

include/asm-ppc64/pci-bridge.h→include/asm-powerpc/pci-bridge.h

+7 −5
Original line number Diff line number Diff line 
#ifdef __KERNEL__

#ifndef _ASM_PCI_BRIDGE_H

#define _ASM_PCI_BRIDGE_H

#ifndef _ASM_POWERPC_PCI_BRIDGE_H

#define _ASM_POWERPC_PCI_BRIDGE_H



#ifndef CONFIG_PPC64

#include <asm-ppc/pci-bridge.h>

#else



#include <linux/config.h>

#include <linux/pci.h>

#include <linux/list.h>
@@ -147,5 +149,5 @@ extern void pcibios_free_controller(struct pci_controller *phb); 
#define PCI_PROBE_NORMAL	0	/* Do normal PCI probing */

#define PCI_PROBE_DEVTREE	1	/* Instantiate from device tree */



#endif /* CONFIG_PPC64 */

#endif
 
#endif /* __KERNEL__ */