Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f10fae02 authored by Pete Popov's avatar Pete Popov Committed by Ralf Baechle
Browse files

Fix the fixup_bigphys_addr compile problem. 



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 10f6567e

include/asm-mips/mach-au1x00/ioremap.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,9 @@ 
#include <linux/config.h>

#include <linux/config.h>

#include <linux/types.h>

#include <linux/types.h>





#ifndef CONFIG_64BIT_PHYS_ADDR

#ifdef CONFIG_64BIT_PHYS_ADDR

extern phys_t __fixup_bigphys_addr(phys_t, phys_t);

#else

static inline phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)

static inline phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)

{

{

	return phys_addr;

	return phys_addr;

include/asm-mips/pgtable.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/pgtable-64.h>

#include <asm/pgtable-64.h>

#endif

#endif





#include <asm/io.h>

#include <asm/pgtable-bits.h>

#include <asm/pgtable-bits.h>





#define PAGE_NONE	__pgprot(_PAGE_PRESENT | _CACHE_CACHABLE_NONCOHERENT)

#define PAGE_NONE	__pgprot(_PAGE_PRESENT | _CACHE_CACHABLE_NONCOHERENT)
@@ -362,7 +363,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, 
#endif

#endif





#ifdef CONFIG_64BIT_PHYS_ADDR

#ifdef CONFIG_64BIT_PHYS_ADDR

extern phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size);

extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot);

extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot);





static inline int io_remap_pfn_range(struct vm_area_struct *vma,

static inline int io_remap_pfn_range(struct vm_area_struct *vma,