Skip to content

L
linux
Commit 3d1331e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://drm.bkbits.net/drm-fntbl 

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 1c6fb916 2a96c525
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
include/asm-ia64/page.h
View file @ 3d1331e4
...@@ -90,7 +90,6 @@ extern struct page *vmem_map; ...@@ -90,7 +90,6 @@ extern struct page *vmem_map;
# define page_to_pfn(page) ((unsigned long) (page - vmem_map)) # define page_to_pfn(page) ((unsigned long) (page - vmem_map))
# define pfn_to_page(pfn) (vmem_map + (pfn)) # define pfn_to_page(pfn) (vmem_map + (pfn))
# endif # endif
#else /* !CONFIG_VIRTUAL_MEM_MAP */
#define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) #define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn))
#define page_to_pfn(page) ((unsigned long) (page - mem_map)) #define page_to_pfn(page) ((unsigned long) (page - mem_map))
#define pfn_to_page(pfn) (mem_map + (pfn)) #define pfn_to_page(pfn) (mem_map + (pfn))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7