From ce2efb33c806105795badef471a074af32bd2226 Mon Sep 17 00:00:00 2001 From: Adrian Danis Date: Mon, 19 Feb 2018 16:00:02 +1100 Subject: [PATCH] Remove archInfo from bootinfo With extended bootinfo providing a more flexible and extensible form of archInfo this member can be retired. --- CHANGES | 4 +++- libsel4/include/sel4/bootinfo_types.h | 1 - src/arch/x86/kernel/boot.c | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 82af4806f..00b1dd78d 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,7 @@ This file should be word wrapped to 120 characters The upcoming release notes should indicate whether it is a SOURCE COMPATIBLE, BINARY COMPATIBLE or BREAKING change. As changes are added the compatibility information should be updated. -upcoming release +upcoming release BREAKING = Changes = * Debugging option on x86 for syscall interface to read/write MSRs (this is an, equally dangerous, alternative to @@ -25,6 +25,8 @@ upcoming release processes using the RSB * Define extended bootinfo header for the x86 TSC frequency * x86 TSC frequency exported in extended bootinfo header + * `archInfo` is no longer a member of the bootinfo struct. Its only use was for TSC frequency on x86, which + can now be retrieved through the extended bootinfo --- 8.0.0 2018-01-17 diff --git a/libsel4/include/sel4/bootinfo_types.h b/libsel4/include/sel4/bootinfo_types.h index 256e52a4c..b00ede401 100644 --- a/libsel4/include/sel4/bootinfo_types.h +++ b/libsel4/include/sel4/bootinfo_types.h @@ -65,7 +65,6 @@ typedef struct { seL4_SlotRegion extraBIPages; /* caps for any pages used to back the additional bootinfo information */ seL4_Uint8 initThreadCNodeSizeBits; /* initial thread's root CNode size (2^n slots) */ seL4_Domain initThreadDomain; /* Initial thread's domain ID */ - seL4_Word archInfo; /* tsc freq on x86, unused on arm */ seL4_SlotRegion untyped; /* untyped-object caps (untyped caps) */ seL4_UntypedDesc untypedList[CONFIG_MAX_NUM_BOOTINFO_UNTYPED_CAPS]; /* information about each untyped */ /* the untypedList should be the last entry in this struct, in order diff --git a/src/arch/x86/kernel/boot.c b/src/arch/x86/kernel/boot.c index 0d7be5bba..c66f7523c 100644 --- a/src/arch/x86/kernel/boot.c +++ b/src/arch/x86/kernel/boot.c @@ -456,8 +456,6 @@ init_sys_state( } write_it_asid_pool(it_ap_cap, it_vspace_cap); - ndks_boot.bi_frame->archInfo = tsc_freq; - /* create the idle thread */ if (!create_idle_thread()) { return false;