Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Paul Mackerras <paulus@samba.org>
+49
-25
+8
-4
include/asm-ppc64/io.h
include/asm-powerpc/io.h
+8
-4
include/asm-ppc64/io.h
include/asm-powerpc/io.h
···
1
-
#ifndef _PPC64_IO_H
2
-
#define _PPC64_IO_H
1
+
#ifndef _ASM_POWERPC_IO_H
2
+
#define _ASM_POWERPC_IO_H
3
3
4
4
/*
5
5
* This program is free software; you can redistribute it and/or
···
8
8
* 2 of the License, or (at your option) any later version.
9
9
*/
10
10
11
-
#include <linux/config.h>
11
+
#ifndef CONFIG_PPC64
12
+
#include <asm-ppc/io.h>
13
+
#else
14
+
12
15
#include <linux/compiler.h>
13
16
#include <asm/page.h>
14
17
#include <asm/byteorder.h>
···
458
455
459
456
#endif /* __KERNEL__ */
460
457
461
-
#endif /* _PPC64_IO_H */
458
+
#endif /* CONFIG_PPC64 */
459
+
#endif /* _ASM_POWERPC_IO_H */
+9
-5
include/asm-ppc64/mmu.h
include/asm-powerpc/mmu.h
+9
-5
include/asm-ppc64/mmu.h
include/asm-powerpc/mmu.h
···
1
+
#ifndef _ASM_POWERPC_MMU_H_
2
+
#define _ASM_POWERPC_MMU_H_
3
+
4
+
#ifndef CONFIG_PPC64
5
+
#include <asm-ppc/mmu.h>
6
+
#else
7
+
1
8
/*
2
9
* PowerPC memory management structures
3
10
*
···
17
10
* 2 of the License, or (at your option) any later version.
18
11
*/
19
12
20
-
#ifndef _PPC64_MMU_H_
21
-
#define _PPC64_MMU_H_
22
-
23
-
#include <linux/config.h>
24
13
#include <asm/asm-compat.h>
25
14
#include <asm/page.h>
26
15
···
395
392
396
393
#endif /* __ASSEMBLY */
397
394
398
-
#endif /* _PPC64_MMU_H_ */
395
+
#endif /* CONFIG_PPC64 */
396
+
#endif /* _ASM_POWERPC_MMU_H_ */
+8
-4
include/asm-ppc64/mmu_context.h
include/asm-powerpc/mmu_context.h
+8
-4
include/asm-ppc64/mmu_context.h
include/asm-powerpc/mmu_context.h
···
1
-
#ifndef __PPC64_MMU_CONTEXT_H
2
-
#define __PPC64_MMU_CONTEXT_H
1
+
#ifndef __ASM_POWERPC_MMU_CONTEXT_H
2
+
#define __ASM_POWERPC_MMU_CONTEXT_H
3
3
4
-
#include <linux/config.h>
4
+
#ifndef CONFIG_PPC64
5
+
#include <asm-ppc/mmu_context.h>
6
+
#else
7
+
5
8
#include <linux/kernel.h>
6
9
#include <linux/mm.h>
7
10
#include <asm/mmu.h>
···
85
82
local_irq_restore(flags);
86
83
}
87
84
88
-
#endif /* __PPC64_MMU_CONTEXT_H */
85
+
#endif /* CONFIG_PPC64 */
86
+
#endif /* __ASM_POWERPC_MMU_CONTEXT_H */
include/asm-ppc64/mmzone.h
include/asm-powerpc/mmzone.h
include/asm-ppc64/mmzone.h
include/asm-powerpc/mmzone.h
+7
-5
include/asm-ppc64/pci-bridge.h
include/asm-powerpc/pci-bridge.h
+7
-5
include/asm-ppc64/pci-bridge.h
include/asm-powerpc/pci-bridge.h
···
1
-
#ifdef __KERNEL__
2
-
#ifndef _ASM_PCI_BRIDGE_H
3
-
#define _ASM_PCI_BRIDGE_H
1
+
#ifndef _ASM_POWERPC_PCI_BRIDGE_H
2
+
#define _ASM_POWERPC_PCI_BRIDGE_H
4
3
5
-
#include <linux/config.h>
4
+
#ifndef CONFIG_PPC64
5
+
#include <asm-ppc/pci-bridge.h>
6
+
#else
7
+
6
8
#include <linux/pci.h>
7
9
#include <linux/list.h>
8
10
···
149
147
#define PCI_PROBE_NORMAL 0 /* Do normal PCI probing */
150
148
#define PCI_PROBE_DEVTREE 1 /* Instantiate from device tree */
151
149
150
+
#endif /* CONFIG_PPC64 */
152
151
#endif
153
-
#endif /* __KERNEL__ */
+8
-3
include/asm-ppc64/pgalloc.h
include/asm-powerpc/pgalloc.h
+8
-3
include/asm-ppc64/pgalloc.h
include/asm-powerpc/pgalloc.h
···
1
-
#ifndef _PPC64_PGALLOC_H
2
-
#define _PPC64_PGALLOC_H
1
+
#ifndef _ASM_POWERPC_PGALLOC_H
2
+
#define _ASM_POWERPC_PGALLOC_H
3
+
4
+
#ifndef CONFIG_PPC64
5
+
#include <asm-ppc/pgalloc.h>
6
+
#else
3
7
4
8
#include <linux/mm.h>
5
9
#include <linux/slab.h>
···
152
148
153
149
#define check_pgt_cache() do { } while (0)
154
150
155
-
#endif /* _PPC64_PGALLOC_H */
151
+
#endif /* CONFIG_PPC64 */
152
+
#endif /* _ASM_POWERPC_PGALLOC_H */
include/asm-ppc64/pgtable-4k.h
include/asm-powerpc/pgtable-4k.h
include/asm-ppc64/pgtable-4k.h
include/asm-powerpc/pgtable-4k.h
include/asm-ppc64/pgtable-64k.h
include/asm-powerpc/pgtable-64k.h
include/asm-ppc64/pgtable-64k.h
include/asm-powerpc/pgtable-64k.h
+9
-4
include/asm-ppc64/pgtable.h
include/asm-powerpc/pgtable.h
+9
-4
include/asm-ppc64/pgtable.h
include/asm-powerpc/pgtable.h
···
1
-
#ifndef _PPC64_PGTABLE_H
2
-
#define _PPC64_PGTABLE_H
1
+
#ifndef _ASM_POWERPC_PGTABLE_H
2
+
#define _ASM_POWERPC_PGTABLE_H
3
+
4
+
#ifndef CONFIG_PPC64
5
+
#include <asm-ppc/pgtable.h>
6
+
#else
3
7
4
8
/*
5
9
* This file contains the functions and defines necessary to modify and use
···
80
76
81
77
#define _PAGE_WRENABLE (_PAGE_RW | _PAGE_DIRTY)
82
78
83
-
/* __pgprot defined in asm-ppc64/page.h */
79
+
/* __pgprot defined in asm-powerpc/page.h */
84
80
#define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED)
85
81
86
82
#define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER)
···
520
516
521
517
#endif /* __ASSEMBLY__ */
522
518
523
-
#endif /* _PPC64_PGTABLE_H */
519
+
#endif /* CONFIG_PPC64 */
520
+
#endif /* _ASM_POWERPC_PGTABLE_H */