Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 686 → Rev 687

/kernel/trunk/genarch/src/mm/page_pt.c
30,13 → 30,14
#include <mm/page.h>
#include <mm/frame.h>
#include <arch/mm/page.h>
#include <arch/mm/asid.h>
#include <arch/types.h>
#include <typedefs.h>
#include <arch/asm.h>
#include <memstr.h>
 
static void pt_mapping_insert(__address page, __address frame, int flags, __address root);
static pte_t *pt_mapping_find(__address page, __address root);
static void pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
static pte_t *pt_mapping_find(__address page, asid_t asid, __address root);
 
page_operations_t page_pt_operations = {
.mapping_insert = pt_mapping_insert,
49,11 → 50,12
* using 'flags'.
*
* @param page Virtual address of the page to be mapped.
* @param asid Ignored.
* @param frame Physical address of memory frame to which the mapping is done.
* @param flags Flags to be used for mapping.
* @param root Explicit PTL0 address.
*/
void pt_mapping_insert(__address page, __address frame, int flags, __address root)
void pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
{
pte_t *ptl0, *ptl1, *ptl2, *ptl3;
__address newpt;
96,11 → 98,12
* Find mapping for virtual page.
*
* @param page Virtual page.
* @param asid Ignored.
* @param root PTL0 address if non-zero.
*
* @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
*/
pte_t *pt_mapping_find(__address page, __address root)
pte_t *pt_mapping_find(__address page, asid_t asid, __address root)
{
pte_t *ptl0, *ptl1, *ptl2, *ptl3;
 
/kernel/trunk/genarch/src/mm/page_ht.c
29,12 → 29,13
#include <genarch/mm/page_ht.h>
#include <mm/page.h>
#include <mm/frame.h>
#include <arch/mm/asid.h>
#include <arch/types.h>
#include <typedefs.h>
#include <arch/asm.h>
 
static void ht_mapping_insert(__address page, __address frame, int flags, __address root);
static pte_t *ht_mapping_find(__address page, __address root);
static void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
static pte_t *ht_mapping_find(__address page, asid_t asid, __address root);
 
page_operations_t page_ht_operations = {
.mapping_insert = ht_mapping_insert,
47,11 → 48,12
* using 'flags'.
*
* @param page Virtual address of the page to be mapped.
* @param asid Address space to which page belongs.
* @param frame Physical address of memory frame to which the mapping is done.
* @param flags Flags to be used for mapping.
* @param root Explicit PTL0 address.
*/
void ht_mapping_insert(__address page, __address frame, int flags, __address root)
void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
{
}
 
60,11 → 62,12
* Find mapping for virtual page.
*
* @param page Virtual page.
* @param asid Address space to wich page belongs.
* @param root PTL0 address if non-zero.
*
* @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
*/
pte_t *ht_mapping_find(__address page, __address root)
pte_t *ht_mapping_find(__address page, asid_t asid, __address root)
{
return NULL;
}
/kernel/trunk/genarch/src/acpi/acpi.c
29,7 → 29,7
#include <genarch/acpi/acpi.h>
#include <genarch/acpi/madt.h>
#include <arch/bios/bios.h>
 
#include <mm/asid.h>
#include <mm/page.h>
#include <print.h>
 
79,7 → 79,7
 
static void map_sdt(struct acpi_sdt_header *sdt)
{
page_mapping_insert((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
page_mapping_insert((__address) sdt, ASID_KERNEL, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
map_structure((__address) sdt, sdt->length);
}