Changeset 235d31d in mainline for kernel/arch/ia64/src/mm/tlb.c

Timestamp:

2014-12-22T17:47:40Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8c7d5ad

Parents:

eae91e0 (diff), 759ea0d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge the CHT pre-integration branch

This branch contains:

• the merge of lp:~adam-hraska+lp/helenos/rcu, which brings:

• a new preemptible kernel RCU variant called A-RCU,
• a preemptible variant of Podzimek's non-preemptible kernel RCU and
• a new variant of usersace RCU,
• a new concurrent hash table (CHT) implementation based on RCU,
• a deployment of CHT in kernel futex handling,
• a deployment of the userspace RCU in the implementation of upgradable futexes,

all described in Adam Hraska's master thesis named Read-Copy-Update
for HelenOS, defended in 2013 at MFF UK; furthemore, the branch
fixes two synchronization bugs in condvars and waitq, respectively:

• revid:adam.hraska+hos@gmail.com-20121116144921-3to9u1tn1sg07rg7
• revid:adam.hraska+hos@gmail.com-20121116173623-km7gwtqixwudpe66

• build fixes required to pass make check
• overhaul of ia64 and sparc64 trap handling, to allow exc_dispatch() to be used now when the kernel is more picky about CPU state accounting
• an important fix of the sparc64/sun4v preemptible trap handler
• various other fixes of issues discovered on non-x86 architectures

File:

• kernel/arch/ia64/src/mm/tlb.c (modified) (8 diffs)

kernel/arch/ia64/src/mm/tlb.c

@@ -477 +477 @@
 /** Instruction TLB fault handler for faults with VHPT turned off.
  *
- * @param vector Interruption vector.
- * @param istate Structure with saved interruption state.
- *
- */
-void alternate_instruction_tlb_fault(uint64_t vector, istate_t *istate)
+ * @param n Interruption vector.
+ * @param istate Structure with saved interruption state.
+ *
+ */
+void alternate_instruction_tlb_fault(unsigned int n, istate_t *istate)
 {
         uintptr_t va;
@@ -566 +566 @@
 /** Data TLB fault handler for faults with VHPT turned off.
  *
- * @param vector Interruption vector.
- * @param istate Structure with saved interruption state.
- *
- */
-void alternate_data_tlb_fault(uint64_t vector, istate_t *istate)
+ * @param n Interruption vector.
+ * @param istate Structure with saved interruption state.
+ *
+ */
+void alternate_data_tlb_fault(unsigned int n, istate_t *istate)
 {
         if (istate->cr_isr.sp) {
@@ -623 +623 @@
  * This fault should not occur.
  *
- * @param vector Interruption vector.
- * @param istate Structure with saved interruption state.
- *
- */
-void data_nested_tlb_fault(uint64_t vector, istate_t *istate)
+ * @param n Interruption vector.
+ * @param istate Structure with saved interruption state.
+ *
+ */
+void data_nested_tlb_fault(unsigned int n, istate_t *istate)
 {
         ASSERT(false);
@@ -634 +634 @@
 /** Data Dirty bit fault handler.
  *
- * @param vector Interruption vector.
- * @param istate Structure with saved interruption state.
- *
- */
-void data_dirty_bit_fault(uint64_t vector, istate_t *istate)
+ * @param n Interruption vector.
+ * @param istate Structure with saved interruption state.
+ *
+ */
+void data_dirty_bit_fault(unsigned int n, istate_t *istate)
 {
         uintptr_t va;
@@ -665 +665 @@
 /** Instruction access bit fault handler.
  *
- * @param vector Interruption vector.
- * @param istate Structure with saved interruption state.
- *
- */
-void instruction_access_bit_fault(uint64_t vector, istate_t *istate)
+ * @param n Interruption vector.
+ * @param istate Structure with saved interruption state.
+ *
+ */
+void instruction_access_bit_fault(unsigned int n, istate_t *istate)
 {
         uintptr_t va;
@@ -694 +694 @@
 /** Data access bit fault handler.
  *
- * @param vector Interruption vector.
- * @param istate Structure with saved interruption state.
- *
- */
-void data_access_bit_fault(uint64_t vector, istate_t *istate)
+ * @param n Interruption vector.
+ * @param istate Structure with saved interruption state.
+ *
+ */
+void data_access_bit_fault(unsigned int n, istate_t *istate)
 {
         uintptr_t va;
@@ -729 +729 @@
 /** Data access rights fault handler.
  *
- * @param vector Interruption vector.
- * @param istate Structure with saved interruption state.
- *
- */
-void data_access_rights_fault(uint64_t vector, istate_t *istate)
+ * @param n Interruption vector.
+ * @param istate Structure with saved interruption state.
+ *
+ */
+void data_access_rights_fault(unsigned int n, istate_t *istate)
 {
         uintptr_t va;
@@ -753 +753 @@
 /** Page not present fault handler.
  *
- * @param vector Interruption vector.
- * @param istate Structure with saved interruption state.
- *
- */
-void page_not_present(uint64_t vector, istate_t *istate)
+ * @param n Interruption vector.
+ * @param istate Structure with saved interruption state.
+ *
+ */
+void page_not_present(unsigned int n, istate_t *istate)
 {
         uintptr_t va;