Skip to content

Commit db77b85

Browse files
committed
Merge tag 'asm-generic-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic cleanups from Arnd Bergmann: "Only three minor changes: a cross-platform series from Mike Rapoport to consolidate asm/agp.h between architectures, and a correctness change for __generic_cmpxchg_local() from Matt Evans" * tag 'asm-generic-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: char/agp: introduce asm-generic/agp.h char/agp: consolidate {alloc,free}_gatt_pages() locking/atomic: cmpxchg: Make __generic_cmpxchg_local compare against zero-extended 'old' value
2 parents 950b666 + a13408c commit db77b85

File tree

14 files changed

+25
-112
lines changed

14 files changed

+25
-112
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 & 19 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 & 27 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 & 21 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/powerpc/include/asm/agp.h

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

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 & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)