682137f7e6
Fix compilation breakage of all m68knommu targets:
CC arch/m68knommu/kernel/asm-offsets.s
In file included from include/linux/sched.h:77,
from arch/m68knommu/kernel/asm-offsets.c:12:
include/linux/percpu.h: In function 'per_cpu_ptr_to_phys':
include/linux/percpu.h:161: error: implicit declaration of function 'virt_to_phy
This is broken in linux-2.6.33-rc3.
Change the definitions of __pa() and __va() to not use virt_to_phys()
and phys_to_virt(). Trivial 1:1 conversion required for the non-MMU case.
A side effect if this is that the m68knommu can now use asm/virtconvert.h
for the definition of virt_to_phys() and phys_to_virt().
Also cleaned up the definition of page_to_phys() when moving into
virtconvert.h.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
52 lines
1.1 KiB
C
52 lines
1.1 KiB
C
#ifndef __VIRT_CONVERT__
|
|
#define __VIRT_CONVERT__
|
|
|
|
/*
|
|
* Macros used for converting between virtual and physical mappings.
|
|
*/
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/mmzone.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/page.h>
|
|
|
|
/*
|
|
* Change virtual addresses to physical addresses and vv.
|
|
*/
|
|
static inline unsigned long virt_to_phys(void *address)
|
|
{
|
|
return __pa(address);
|
|
}
|
|
|
|
static inline void *phys_to_virt(unsigned long address)
|
|
{
|
|
return __va(address);
|
|
}
|
|
|
|
/* Permanent address of a page. */
|
|
#ifdef CONFIG_MMU
|
|
#ifdef CONFIG_SINGLE_MEMORY_CHUNK
|
|
#define page_to_phys(page) \
|
|
__pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))
|
|
#else
|
|
#define page_to_phys(_page) ({ \
|
|
struct page *__page = _page; \
|
|
struct pglist_data *pgdat; \
|
|
pgdat = pg_data_table[page_to_nid(__page)]; \
|
|
page_to_pfn(__page) << PAGE_SHIFT; \
|
|
})
|
|
#endif
|
|
#else
|
|
#define page_to_phys(page) (((page) - mem_map) << PAGE_SHIFT)
|
|
#endif
|
|
|
|
/*
|
|
* IO bus memory addresses are 1:1 with the physical address,
|
|
*/
|
|
#define virt_to_bus virt_to_phys
|
|
#define bus_to_virt phys_to_virt
|
|
|
|
#endif
|
|
#endif
|