Skip to content

Commit a13408c

Browse files
rpptarndb
authored andcommitted
char/agp: introduce asm-generic/agp.h
There are several architectures that duplicate definitions of map_page_into_agp(), unmap_page_from_agp() and flush_agp_cache(). Define those in asm-generic/agp.h and use it instead of duplicated per-architecture headers. Signed-off-by: Mike Rapoport (IBM) <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 0e4f2c4 commit a13408c

File tree

10 files changed

+8
-65
lines changed

10 files changed

+8
-65
lines changed

arch/alpha/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22

33
generated-y += syscall_table.h
4+
generic-y += agp.h
45
generic-y += export.h
56
generic-y += kvm_para.h
67
generic-y += mcs_spinlock.h

arch/alpha/include/asm/agp.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

arch/ia64/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
generated-y += syscall_table.h
3+
generic-y += agp.h
34
generic-y += kvm_para.h
45
generic-y += mcs_spinlock.h
56
generic-y += vtime.h

arch/ia64/include/asm/agp.h

Lines changed: 0 additions & 21 deletions
This file was deleted.

arch/parisc/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
generated-y += syscall_table_32.h
33
generated-y += syscall_table_64.h
4+
generic-y += agp.h
45
generic-y += kvm_para.h
56
generic-y += mcs_spinlock.h
67
generic-y += user.h

arch/parisc/include/asm/agp.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

arch/powerpc/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
generated-y += syscall_table_32.h
33
generated-y += syscall_table_64.h
44
generated-y += syscall_table_spu.h
5+
generic-y += agp.h
56
generic-y += export.h
67
generic-y += kvm_types.h
78
generic-y += mcs_spinlock.h

arch/sparc/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
generated-y += syscall_table_32.h
33
generated-y += syscall_table_64.h
4+
generic-y += agp.h
45
generic-y += export.h
56
generic-y += kvm_para.h
67
generic-y += mcs_spinlock.h

arch/sparc/include/asm/agp.h

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
#ifndef _ASM_POWERPC_AGP_H
3-
#define _ASM_POWERPC_AGP_H
4-
#ifdef __KERNEL__
2+
#ifndef _ASM_GENERIC_AGP_H
3+
#define _ASM_GENERIC_AGP_H
54

65
#include <asm/io.h>
76

87
#define map_page_into_agp(page) do {} while (0)
98
#define unmap_page_from_agp(page) do {} while (0)
109
#define flush_agp_cache() mb()
1110

12-
#endif /* __KERNEL__ */
13-
#endif /* _ASM_POWERPC_AGP_H */
11+
#endif /* _ASM_GENERIC_AGP_H */

0 commit comments

Comments
 (0)