Commit 756a6c68 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: ioremap of 64-bit resource on 32-bit kernel fix 



Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5af5573e

arch/x86/mm/ioremap.c

+3 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static inline int phys_addr_valid(unsigned long addr) 


int page_is_ram(unsigned long pagenr)

{

	unsigned long addr, end;

	resource_size_t addr, end;

	int i;



	/*
@@ -120,7 +120,8 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size, 
static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,

			       unsigned long prot_val)

{

	unsigned long pfn, offset, last_addr, vaddr;

	unsigned long pfn, offset, vaddr;

	resource_size_t last_addr;

	struct vm_struct *area;

	unsigned long new_prot_val;

	pgprot_t prot;