diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-03-26 01:19:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:19 -0400 |
commit | 55c626820a82b25d7fceca702e9422037ae80626 (patch) | |
tree | 320b875d82e45c3242268af71b5628bfb9a76ddf | |
parent | 2e5d9c857d4e6c9e7b7d8c8c86a68a7842d213d6 (diff) |
x86: revert ucminus change
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/mm/ioremap.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 3d0a589d92c..df95d1d6b4d 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
@@ -159,11 +159,7 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size, | |||
159 | switch (mode) { | 159 | switch (mode) { |
160 | case IOR_MODE_UNCACHED: | 160 | case IOR_MODE_UNCACHED: |
161 | default: | 161 | default: |
162 | /* | 162 | prot = PAGE_KERNEL_NOCACHE; |
163 | * FIXME: we will use UC MINUS for now, as video fb drivers | ||
164 | * depend on it. Upcoming ioremap_wc() will fix this behavior. | ||
165 | */ | ||
166 | prot = PAGE_KERNEL_UC_MINUS; | ||
167 | break; | 163 | break; |
168 | case IOR_MODE_CACHED: | 164 | case IOR_MODE_CACHED: |
169 | prot = PAGE_KERNEL; | 165 | prot = PAGE_KERNEL; |