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

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
#ifndef _PPC64_IO_H #ifndef _ASM_POWERPC_IO_H
#define _PPC64_IO_H #define _ASM_POWERPC_IO_H
/* /*
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -8,7 +8,10 @@ ...@@ -8,7 +8,10 @@
* 2 of the License, or (at your option) any later version. * 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 <linux/compiler.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
...@@ -455,4 +458,5 @@ extern int check_legacy_ioport(unsigned long base_port); ...@@ -455,4 +458,5 @@ extern int check_legacy_ioport(unsigned long base_port);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _PPC64_IO_H */ #endif /* CONFIG_PPC64 */
#endif /* _ASM_POWERPC_IO_H */
#ifndef _ASM_POWERPC_MMU_H_
#define _ASM_POWERPC_MMU_H_
#ifndef CONFIG_PPC64
#include <asm-ppc/mmu.h>
#else
/* /*
* PowerPC memory management structures * PowerPC memory management structures
* *
...@@ -10,10 +17,6 @@ ...@@ -10,10 +17,6 @@
* 2 of the License, or (at your option) any later version. * 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/asm-compat.h>
#include <asm/page.h> #include <asm/page.h>
...@@ -392,4 +395,5 @@ static inline unsigned long get_vsid(unsigned long context, unsigned long ea) ...@@ -392,4 +395,5 @@ static inline unsigned long get_vsid(unsigned long context, unsigned long ea)
#endif /* __ASSEMBLY */ #endif /* __ASSEMBLY */
#endif /* _PPC64_MMU_H_ */ #endif /* CONFIG_PPC64 */
#endif /* _ASM_POWERPC_MMU_H_ */
#ifndef __PPC64_MMU_CONTEXT_H #ifndef __ASM_POWERPC_MMU_CONTEXT_H
#define __PPC64_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/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/mmu.h> #include <asm/mmu.h>
...@@ -82,4 +85,5 @@ static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next) ...@@ -82,4 +85,5 @@ static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
local_irq_restore(flags); local_irq_restore(flags);
} }
#endif /* __PPC64_MMU_CONTEXT_H */ #endif /* CONFIG_PPC64 */
#endif /* __ASM_POWERPC_MMU_CONTEXT_H */
#ifdef __KERNEL__ #ifndef _ASM_POWERPC_PCI_BRIDGE_H
#ifndef _ASM_PCI_BRIDGE_H #define _ASM_POWERPC_PCI_BRIDGE_H
#define _ASM_PCI_BRIDGE_H
#ifndef CONFIG_PPC64
#include <asm-ppc/pci-bridge.h>
#else
#include <linux/config.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/list.h> #include <linux/list.h>
...@@ -147,5 +149,5 @@ extern void pcibios_free_controller(struct pci_controller *phb); ...@@ -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_NORMAL 0 /* Do normal PCI probing */
#define PCI_PROBE_DEVTREE 1 /* Instantiate from device tree */ #define PCI_PROBE_DEVTREE 1 /* Instantiate from device tree */
#endif /* CONFIG_PPC64 */
#endif #endif
#endif /* __KERNEL__ */
#ifndef _PPC64_PGALLOC_H #ifndef _ASM_POWERPC_PGALLOC_H
#define _PPC64_PGALLOC_H #define _ASM_POWERPC_PGALLOC_H
#ifndef CONFIG_PPC64
#include <asm-ppc/pgalloc.h>
#else
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -148,4 +152,5 @@ extern void pgtable_free_tlb(struct mmu_gather *tlb, pgtable_free_t pgf); ...@@ -148,4 +152,5 @@ extern void pgtable_free_tlb(struct mmu_gather *tlb, pgtable_free_t pgf);
#define check_pgt_cache() do { } while (0) #define check_pgt_cache() do { } while (0)
#endif /* _PPC64_PGALLOC_H */ #endif /* CONFIG_PPC64 */
#endif /* _ASM_POWERPC_PGALLOC_H */
#ifndef _PPC64_PGTABLE_H #ifndef _ASM_POWERPC_PGTABLE_H
#define _PPC64_PGTABLE_H #define _ASM_POWERPC_PGTABLE_H
#ifndef CONFIG_PPC64
#include <asm-ppc/pgtable.h>
#else
/* /*
* This file contains the functions and defines necessary to modify and use * This file contains the functions and defines necessary to modify and use
...@@ -76,7 +80,7 @@ struct mm_struct; ...@@ -76,7 +80,7 @@ struct mm_struct;
#define _PAGE_WRENABLE (_PAGE_RW | _PAGE_DIRTY) #define _PAGE_WRENABLE (_PAGE_RW | _PAGE_DIRTY)
/* __pgprot defined in asm-ppc64/page.h */ /* __pgprot defined in asm-powerpc/page.h */
#define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED) #define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED)
#define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER) #define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER)
...@@ -516,4 +520,5 @@ void pgtable_cache_init(void); ...@@ -516,4 +520,5 @@ void pgtable_cache_init(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _PPC64_PGTABLE_H */ #endif /* CONFIG_PPC64 */
#endif /* _ASM_POWERPC_PGTABLE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment