diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 21:29:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 21:29:57 -0500 |
| commit | 5d9c4a7de64d398604a978d267a6987f1f4025b7 (patch) | |
| tree | e15ec482773e28babab19c0edc25bcb90a5f802b /arch/x86 | |
| parent | 3a93dc42f56c507d1034273d1e1d6f9b3ad94bb1 (diff) | |
| parent | 44a207fc66c13c82f627178f9f858b8f3e76028f (diff) | |
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
agp: fix missing casts that produced a warning.
agp: add support for 662/671 to agp driver
fix historic ioremap() abuse in AGP
agp/sis: Suspend support for SiS AGP
agp/sis: Clear bit 2 from aperture size byte as well
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/mm/ioremap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index f4c95aec5acb..882328efc3db 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -134,6 +134,8 @@ static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size, | |||
| 134 | return NULL; | 134 | return NULL; |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | WARN_ON_ONCE(page_is_ram(pfn)); | ||
| 138 | |||
| 137 | switch (mode) { | 139 | switch (mode) { |
| 138 | case IOR_MODE_UNCACHED: | 140 | case IOR_MODE_UNCACHED: |
| 139 | default: | 141 | default: |