Commit db77b850 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 950b6662 a13408c2

arch/alpha/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



generated-y += syscall_table.h

generic-y += agp.h

generic-y += export.h

generic-y += kvm_para.h

generic-y += mcs_spinlock.h

arch/alpha/include/asm/agp.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef AGP_H

#define AGP_H 1



#include <asm/io.h>



/* dummy for now */



#define map_page_into_agp(page)		do { } while (0)

#define unmap_page_from_agp(page)	do { } while (0)

#define flush_agp_cache() mb()



/* GATT allocation. Returns/accepts GATT kernel virtual address. */

#define alloc_gatt_pages(order)		\

	((char *)__get_free_pages(GFP_KERNEL, (order)))

#define free_gatt_pages(table, order)	\

	free_pages((unsigned long)(table), (order))



#endif

arch/ia64/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generated-y += syscall_table.h

generic-y += agp.h

generic-y += kvm_para.h

generic-y += mcs_spinlock.h

generic-y += vtime.h

arch/ia64/include/asm/agp.h

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_IA64_AGP_H

#define _ASM_IA64_AGP_H



/*

 * IA-64 specific AGP definitions.

 *

 * Copyright (C) 2002-2003 Hewlett-Packard Co

 *	David Mosberger-Tang <davidm@hpl.hp.com>

 */



/*

 * To avoid memory-attribute aliasing issues, we require that the AGPGART engine operate

 * in coherent mode, which lets us map the AGP memory as normal (write-back) memory

 * (unlike x86, where it gets mapped "write-coalescing").

 */

#define map_page_into_agp(page)		do { } while (0)

#define unmap_page_from_agp(page)	do { } while (0)

#define flush_agp_cache()		mb()



/* GATT allocation. Returns/accepts GATT kernel virtual address. */

#define alloc_gatt_pages(order)		\

	((char *)__get_free_pages(GFP_KERNEL, (order)))

#define free_gatt_pages(table, order)	\

	free_pages((unsigned long)(table), (order))



#endif /* _ASM_IA64_AGP_H */

arch/parisc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generated-y += syscall_table_32.h

generated-y += syscall_table_64.h

generic-y += agp.h

generic-y += kvm_para.h

generic-y += mcs_spinlock.h

generic-y += user.h