diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 12:47:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 12:47:28 -0400 |
| commit | baadac8b10c5ac15ce3d26b68fa266c8889b163f (patch) | |
| tree | 8ab1c758f8b2fe21351102d9845c0f8ec81a52cf /arch/x86/mm/ioremap.c | |
| parent | 051a82fc0c450f6ca649acf684586477aa6d5c6a (diff) | |
| parent | 985a34bd75cc8c96e43f00dcdda7c3fdb51a3026 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: remove quicklists
x86: ia32 syscall restart fix
x86: ioremap, remove WARN_ON()
Diffstat (limited to 'arch/x86/mm/ioremap.c')
| -rw-r--r-- | arch/x86/mm/ioremap.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index ac3c959e271d..8fe576baa148 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -134,8 +134,6 @@ 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 | |||
| 139 | switch (mode) { | 137 | switch (mode) { |
| 140 | case IOR_MODE_UNCACHED: | 138 | case IOR_MODE_UNCACHED: |
| 141 | default: | 139 | default: |