git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
i386
/
mm
/
pageattr.c
diff --git
a/arch/i386/mm/pageattr.c
b/arch/i386/mm/pageattr.c
index
ad0f86a
..
a00267a
100644
(file)
--- a/
arch/i386/mm/pageattr.c
+++ b/
arch/i386/mm/pageattr.c
@@
-3,13
+3,12
@@
* Thanks to Ben LaHaise for precious feedback.
*/
* Thanks to Ben LaHaise for precious feedback.
*/
+#include <linux/config.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/highmem.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/highmem.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/kernel.h>
-#include <asm/sections.h>
#include <asm/uaccess.h>
#include <asm/processor.h>
#include <asm/tlbflush.h>
#include <asm/uaccess.h>
#include <asm/processor.h>
#include <asm/tlbflush.h>
@@
-132,12
+131,6
@@
__change_page_attr(struct page *page, pgprot_t prot)
BUG_ON(PageHighMem(page));
address = (unsigned long)page_address(page);
BUG_ON(PageHighMem(page));
address = (unsigned long)page_address(page);
- if (address >= (unsigned long)__start_rodata && address <= (unsigned long)__end_rodata &&
- (pgprot_val(prot) & _PAGE_RW)) {
- pgprot_val(prot) &= ~(_PAGE_RW);
- add_taint(TAINT_MACHINE_CHECK);
- }
-
kpte = lookup_address(address);
if (!kpte)
return -EINVAL;
kpte = lookup_address(address);
if (!kpte)
return -EINVAL;
@@
-216,19
+209,19
@@
int change_page_attr(struct page *page, int numpages, pgprot_t prot)
}
void global_flush_tlb(void)
}
void global_flush_tlb(void)
-{
-
struct list_head l
;
+{
+
LIST_HEAD(l)
;
struct page *pg, *next;
BUG_ON(irqs_disabled());
spin_lock_irq(&cpa_lock);
struct page *pg, *next;
BUG_ON(irqs_disabled());
spin_lock_irq(&cpa_lock);
- list_
repla
ce_init(&df_list, &l);
+ list_
spli
ce_init(&df_list, &l);
spin_unlock_irq(&cpa_lock);
flush_map();
list_for_each_entry_safe(pg, next, &l, lru)
__free_page(pg);
spin_unlock_irq(&cpa_lock);
flush_map();
list_for_each_entry_safe(pg, next, &l, lru)
__free_page(pg);
-}
+}
#ifdef CONFIG_DEBUG_PAGEALLOC
void kernel_map_pages(struct page *page, int numpages, int enable)
#ifdef CONFIG_DEBUG_PAGEALLOC
void kernel_map_pages(struct page *page, int numpages, int enable)
@@
-236,8
+229,8
@@
void kernel_map_pages(struct page *page, int numpages, int enable)
if (PageHighMem(page))
return;
if (!enable)
if (PageHighMem(page))
return;
if (!enable)
- debug_check_no_locks_freed(page_address(page),
- numpages * PAGE_SIZE);
+
mutex_
debug_check_no_locks_freed(page_address(page),
+
numpages * PAGE_SIZE);
/* the return value is ignored - the calls cannot fail,
* large pages are disabled at boot time.
/* the return value is ignored - the calls cannot fail,
* large pages are disabled at boot time.