Context |
Check |
Description |
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/merge (6b450d0404ca83dc131dadffd40c5aa6f7a603af)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/next (612ee81b9461475b5a5612c2e8d71559dd3c7920)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linus/master (3b7c59a1950c75f2c0152e5a9cd77675b09233d6)
|
snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/fixes (d10f60ae27d26d811e2a1bb39ded47df96d7499f)
|
snowpatch_ozlabs/apply_patch |
success
|
Successfully applied on branch linux-next (f3c452cfc59c817950b150b51ec2b33409d7640b)
|
snowpatch_ozlabs/checkpatch |
fail
|
Test checkpatch on branch linux-next
|
@@ -77,10 +77,17 @@ static unsigned int __ioremap_check_ram(struct resource *res)
start_pfn = (res->start + PAGE_SIZE - 1) >> PAGE_SHIFT;
stop_pfn = (res->end + 1) >> PAGE_SHIFT;
if (stop_pfn > start_pfn) {
- for (i = 0; i < (stop_pfn - start_pfn); ++i)
- if (pfn_valid(start_pfn + i) &&
- !PageReserved(pfn_to_page(start_pfn + i)))
+ for (i = 0; i < (stop_pfn - start_pfn); ++i) {
+ struct page *page;
+ /*
+ * We treat any pages that are not online (not managed
+ * by the buddy) as not being RAM. This includes
+ * ZONE_DEVICE pages.
+ */
+ page = pfn_to_online_page(start_pfn + i);
+ if (page && !PageReserved(page))
return IORES_MAP_SYSTEM_RAM;
+ }
}
return 0;
Right now, ZONE_DEVICE memory is always set PG_reserved. We want to change that. We could explicitly check for is_zone_device_page(page). But looking at the pfn_valid() check, it seems safer to just use pfn_to_online_page() here, that will skip all ZONE_DEVICE pages right away. Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: David Hildenbrand <david@redhat.com> --- arch/x86/mm/ioremap.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)