mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
e31cf2f4ca
Patch series "mm: consolidate definitions of page table accessors", v2.
The low level page table accessors (pXY_index(), pXY_offset()) are
duplicated across all architectures and sometimes more than once. For
instance, we have 31 definition of pgd_offset() for 25 supported
architectures.
Most of these definitions are actually identical and typically it boils
down to, e.g.
static inline unsigned long pmd_index(unsigned long address)
{
return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
}
static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
{
return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address);
}
These definitions can be shared among 90% of the arches provided
XYZ_SHIFT, PTRS_PER_XYZ and xyz_page_vaddr() are defined.
For architectures that really need a custom version there is always
possibility to override the generic version with the usual ifdefs magic.
These patches introduce include/linux/pgtable.h that replaces
include/asm-generic/pgtable.h and add the definitions of the page table
accessors to the new header.
This patch (of 12):
The linux/mm.h header includes <asm/pgtable.h> to allow inlining of the
functions involving page table manipulations, e.g. pte_alloc() and
pmd_alloc(). So, there is no point to explicitly include <asm/pgtable.h>
in the files that include <linux/mm.h>.
The include statements in such cases are remove with a simple loop:
for f in $(git grep -l "include <linux/mm.h>") ; do
sed -i -e '/include <asm\/pgtable.h>/ d' $f
done
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200514170327.31389-1-rppt@kernel.org
Link: http://lkml.kernel.org/r/20200514170327.31389-2-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
134 lines
2.5 KiB
C
134 lines
2.5 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 1998, 2003 by Ralf Baechle
|
|
*/
|
|
#ifndef __ASM_MACH_JAZZ_FLOPPY_H
|
|
#define __ASM_MACH_JAZZ_FLOPPY_H
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/linkage.h>
|
|
#include <linux/types.h>
|
|
#include <linux/mm.h>
|
|
#include <asm/addrspace.h>
|
|
#include <asm/jazz.h>
|
|
#include <asm/jazzdma.h>
|
|
|
|
static inline unsigned char fd_inb(unsigned int base, unsigned int reg)
|
|
{
|
|
unsigned char c;
|
|
|
|
c = *(volatile unsigned char *) (base + reg);
|
|
udelay(1);
|
|
|
|
return c;
|
|
}
|
|
|
|
static inline void fd_outb(unsigned char value, unsigned int base, unsigned int reg)
|
|
{
|
|
*(volatile unsigned char *) (base + reg) = value;
|
|
}
|
|
|
|
/*
|
|
* How to access the floppy DMA functions.
|
|
*/
|
|
static inline void fd_enable_dma(void)
|
|
{
|
|
vdma_enable(JAZZ_FLOPPY_DMA);
|
|
}
|
|
|
|
static inline void fd_disable_dma(void)
|
|
{
|
|
vdma_disable(JAZZ_FLOPPY_DMA);
|
|
}
|
|
|
|
static inline int fd_request_dma(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void fd_free_dma(void)
|
|
{
|
|
}
|
|
|
|
static inline void fd_clear_dma_ff(void)
|
|
{
|
|
}
|
|
|
|
static inline void fd_set_dma_mode(char mode)
|
|
{
|
|
vdma_set_mode(JAZZ_FLOPPY_DMA, mode);
|
|
}
|
|
|
|
static inline void fd_set_dma_addr(char *a)
|
|
{
|
|
vdma_set_addr(JAZZ_FLOPPY_DMA, vdma_phys2log(CPHYSADDR((unsigned long)a)));
|
|
}
|
|
|
|
static inline void fd_set_dma_count(unsigned int count)
|
|
{
|
|
vdma_set_count(JAZZ_FLOPPY_DMA, count);
|
|
}
|
|
|
|
static inline int fd_get_dma_residue(void)
|
|
{
|
|
return vdma_get_residue(JAZZ_FLOPPY_DMA);
|
|
}
|
|
|
|
static inline void fd_enable_irq(void)
|
|
{
|
|
}
|
|
|
|
static inline void fd_disable_irq(void)
|
|
{
|
|
}
|
|
|
|
static inline int fd_request_irq(void)
|
|
{
|
|
return request_irq(FLOPPY_IRQ, floppy_interrupt,
|
|
0, "floppy", NULL);
|
|
}
|
|
|
|
static inline void fd_free_irq(void)
|
|
{
|
|
free_irq(FLOPPY_IRQ, NULL);
|
|
}
|
|
|
|
static inline unsigned long fd_getfdaddr1(void)
|
|
{
|
|
return JAZZ_FDC_BASE;
|
|
}
|
|
|
|
static inline unsigned long fd_dma_mem_alloc(unsigned long size)
|
|
{
|
|
unsigned long mem;
|
|
|
|
mem = __get_dma_pages(GFP_KERNEL, get_order(size));
|
|
if(!mem)
|
|
return 0;
|
|
vdma_alloc(CPHYSADDR(mem), size); /* XXX error checking */
|
|
|
|
return mem;
|
|
}
|
|
|
|
static inline void fd_dma_mem_free(unsigned long addr, unsigned long size)
|
|
{
|
|
vdma_free(vdma_phys2log(CPHYSADDR(addr)));
|
|
free_pages(addr, get_order(size));
|
|
}
|
|
|
|
static inline unsigned long fd_drive_type(unsigned long n)
|
|
{
|
|
/* XXX This is wrong for machines with ED 2.88mb disk drives like the
|
|
Olivetti M700. Anyway, we should suck this from the ARC
|
|
firmware. */
|
|
if (n == 0)
|
|
return 4; /* 3,5", 1.44mb */
|
|
|
|
return 0;
|
|
}
|
|
|
|
#endif /* __ASM_MACH_JAZZ_FLOPPY_H */
|