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

Commit 7e6735c3 authored by Cyril Chemparathy's avatar Cyril Chemparathy Committed by Greg Kroah-Hartman
Browse files

/dev/mem: use phys_addr_t for physical addresses 



This patch fixes the /dev/mem driver to use phys_addr_t for physical
addresses.  This is required on PAE systems, especially those that run
entirely out of >4G physical memory space.

Signed-off-by: default avatarCyril Chemparathy <cyril@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f0c0580

arch/arm/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); 


#ifdef CONFIG_MMU

#define ARCH_HAS_VALID_PHYS_ADDR_RANGE

extern int valid_phys_addr_range(unsigned long addr, size_t size);

extern int valid_phys_addr_range(phys_addr_t addr, size_t size);

extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);

extern int devmem_is_allowed(unsigned long pfn);

#endif

arch/arm/mm/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm) 
 * You really shouldn't be using read() or write() on /dev/mem.  This

 * might go away in the future.

 */

int valid_phys_addr_range(unsigned long addr, size_t size)

int valid_phys_addr_range(phys_addr_t addr, size_t size)

{

	if (addr < PHYS_OFFSET)

		return 0;

arch/ia64/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ phys_to_virt (unsigned long address) 


#define ARCH_HAS_VALID_PHYS_ADDR_RANGE

extern u64 kern_mem_attribute (unsigned long phys_addr, unsigned long size);

extern int valid_phys_addr_range (unsigned long addr, size_t count); /* efi.c */

extern int valid_phys_addr_range (phys_addr_t addr, size_t count); /* efi.c */

extern int valid_mmap_phys_addr_range (unsigned long pfn, size_t count);



/*

arch/ia64/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ kern_mem_attribute (unsigned long phys_addr, unsigned long size) 
EXPORT_SYMBOL(kern_mem_attribute);



int

valid_phys_addr_range (unsigned long phys_addr, unsigned long size)

valid_phys_addr_range (phys_addr_t phys_addr, unsigned long size)

{

	u64 attr;

arch/sh/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } 
#define xlate_dev_kmem_ptr(p)	p



#define ARCH_HAS_VALID_PHYS_ADDR_RANGE

int valid_phys_addr_range(unsigned long addr, size_t size);

int valid_phys_addr_range(phys_addr_t addr, size_t size);

int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);



#endif /* __KERNEL__ */