From 2c8fe5e15087b16ed66cf8d23ed2a3326d7dd75e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 30 Jan 2008 13:34:05 +0100 Subject: [PATCH] --- yaml --- r: 80507 b: refs/heads/master c: 1aaf74e919be54be0023c3124923fb537c7fb772 h: refs/heads/master i: 80505: fa2d8f0002fa3e95250d9bf86a44f821bc3f3cf2 80503: 2813fc9af1b7d1da12691ceb071feac9b76f8ed4 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/ioremap_64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index afe3e228dcbc..29e13decfcf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a40343497e8983cdf07fde99c9081ee62b96f745 +refs/heads/master: 1aaf74e919be54be0023c3124923fb537c7fb772 diff --git a/trunk/arch/x86/mm/ioremap_64.c b/trunk/arch/x86/mm/ioremap_64.c index 0a05f024dc22..a37556124c86 100644 --- a/trunk/arch/x86/mm/ioremap_64.c +++ b/trunk/arch/x86/mm/ioremap_64.c @@ -53,7 +53,7 @@ ioremap_change_attr(unsigned long phys_addr, unsigned long size, * Must use a address here and not struct page because the phys addr * can be a in hole between nodes and not have an memmap entry. */ - err = change_page_attr_addr(vaddr,npages,__pgprot(__PAGE_KERNEL|flags)); + err = change_page_attr_addr(vaddr,npages,MAKE_GLOBAL(__PAGE_KERNEL|flags)); if (!err) global_flush_tlb(); } @@ -91,7 +91,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS) return (__force void __iomem *)phys_to_virt(phys_addr); - pgprot = __pgprot(__PAGE_KERNEL_EXEC | _PAGE_GLOBAL | flags); + pgprot = MAKE_GLOBAL(__PAGE_KERNEL | flags); /* * Mappings have to be page-aligned */