Changeset 55896b6 in mainline


Ignore:
Timestamp:
2011-11-07T23:18:33Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
29938b2
Parents:
622f409
Message:

Add architecture specific hooks for km_(non)_identity_init().
Add config variables to say whether (non-)identity was configured.

Location:
kernel
Files:
21 added
12 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/abs32le/Makefile.inc

    r622f409 r55896b6  
    5757        arch/$(KARCH)/src/smp/smp.c \
    5858        arch/$(KARCH)/src/smp/ipi.c \
     59        arch/$(KARCH)/src/mm/km.c \
    5960        arch/$(KARCH)/src/mm/as.c \
    6061        arch/$(KARCH)/src/mm/frame.c \
  • kernel/arch/amd64/Makefile.inc

    r622f409 r55896b6  
    8686        arch/$(KARCH)/src/bios/bios.c \
    8787        arch/$(KARCH)/src/interrupt.c \
     88        arch/$(KARCH)/src/mm/km.c \
    8889        arch/$(KARCH)/src/mm/as.c \
    8990        arch/$(KARCH)/src/mm/frame.c \
  • kernel/arch/arm32/Makefile.inc

    r622f409 r55896b6  
    5353        arch/$(KARCH)/src/debug/stacktrace.c \
    5454        arch/$(KARCH)/src/debug/stacktrace_asm.S \
     55        arch/$(KARCH)/src/mm/km.c \
    5556        arch/$(KARCH)/src/mm/as.c \
    5657        arch/$(KARCH)/src/mm/frame.c \
  • kernel/arch/ia32/Makefile.inc

    r622f409 r55896b6  
    9999        arch/$(KARCH)/src/userspace.c \
    100100        arch/$(KARCH)/src/cpu/cpu.c \
     101        arch/$(KARCH)/src/mm/km.c \
    101102        arch/$(KARCH)/src/mm/as.c \
    102103        arch/$(KARCH)/src/mm/frame.c \
  • kernel/arch/ia64/Makefile.inc

    r622f409 r55896b6  
    5252        arch/$(KARCH)/src/ivt.S \
    5353        arch/$(KARCH)/src/interrupt.c \
     54        arch/$(KARCH)/src/mm/km.c \
    5455        arch/$(KARCH)/src/mm/as.c \
    5556        arch/$(KARCH)/src/mm/frame.c \
  • kernel/arch/mips32/Makefile.inc

    r622f409 r55896b6  
    6363        arch/$(KARCH)/src/debug/stacktrace.c \
    6464        arch/$(KARCH)/src/debug/stacktrace_asm.S \
     65        arch/$(KARCH)/src/mm/km.c \
    6566        arch/$(KARCH)/src/mm/frame.c \
    6667        arch/$(KARCH)/src/mm/page.c \
  • kernel/arch/mips64/Makefile.inc

    r622f409 r55896b6  
    5555        arch/$(KARCH)/src/debug/stacktrace.c \
    5656        arch/$(KARCH)/src/debug/stacktrace_asm.S \
     57        arch/$(KARCH)/src/mm/km.c \
    5758        arch/$(KARCH)/src/mm/frame.c \
    5859        arch/$(KARCH)/src/mm/page.c \
  • kernel/arch/ppc32/Makefile.inc

    r622f409 r55896b6  
    5252        arch/$(KARCH)/src/proc/scheduler.c \
    5353        arch/$(KARCH)/src/ddi/ddi.c \
     54        arch/$(KARCH)/src/mm/km.c \
    5455        arch/$(KARCH)/src/mm/as.c \
    5556        arch/$(KARCH)/src/mm/frame.c \
  • kernel/arch/sparc64/Makefile.inc

    r622f409 r55896b6  
    6868        arch/$(KARCH)/src/fpu_context.c \
    6969        arch/$(KARCH)/src/dummy.s \
     70        arch/$(KARCH)/src/mm/$(USARCH)/km.c \
    7071        arch/$(KARCH)/src/mm/$(USARCH)/as.c \
    7172        arch/$(KARCH)/src/mm/$(USARCH)/frame.c \
  • kernel/generic/include/config.h

    r622f409 r55896b6  
    8888        size_t stack_size;
    8989
     90        bool identity_configured;
    9091        /** Base address of the kernel identity mapped memory. */
    9192        uintptr_t identity_base;
    9293        /** Size of the kernel identity mapped memory. */
    93         size_t identity_size;       
     94        size_t identity_size;
     95
     96        bool non_identity_configured;   
    9497} config_t;
    9598
  • kernel/generic/src/main/main.c

    r622f409 r55896b6  
    8989
    9090/** Global configuration structure. */
    91 config_t config;
     91config_t config = {
     92        .identity_configured = false,
     93        .non_identity_configured = false
     94};
    9295
    9396/** Initial user-space tasks */
  • kernel/generic/src/mm/km.c

    r622f409 r55896b6  
    3737
    3838#include <mm/km.h>
     39#include <arch/mm/km.h>
     40#include <config.h>
    3941
    4042/** Architecture dependent setup of identity-mapped kernel memory. */
    4143void km_identity_init(void)
    4244{
     45        km_identity_arch_init();
     46        config.identity_configured = true;
    4347}
    4448
     
    4650void km_non_identity_init(void)
    4751{
     52        km_non_identity_arch_init();
     53        config.non_identity_configured = true;
    4854}
    4955
Note: See TracChangeset for help on using the changeset viewer.