From b803d7d4e9b63a8482f3732ba4db7bcd6e84fd1e Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Tue, 16 Feb 2021 12:42:11 +0800
Subject: [PATCH] commit that captures the multiple lend bug

---
 kernel/src/arch/riscv/mem.rs    | 2 ++
 services/log-server/src/main.rs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs
index 83a6f9ccc..61abb07b1 100644
--- a/kernel/src/arch/riscv/mem.rs
+++ b/kernel/src/arch/riscv/mem.rs
@@ -474,6 +474,7 @@ pub fn lend_page_inner(
     dest_addr: *mut u8,
     mutable: bool,
 ) -> Result<usize, xous_kernel::Error> {
+    klog!("***lend - src: {:08x} dest: {:08x}***", src_addr as u32, dest_addr as u32);
     let entry = pagetable_entry(src_addr as usize)?;
     let phys = (*entry >> 10) << 12;
 
@@ -542,6 +543,7 @@ pub fn return_page_inner(
     dest_space: &MemoryMapping,
     dest_addr: *mut u8,
 ) -> Result<usize, xous_kernel::Error> {
+    klog!("***return - src: {:08x} dest: {:08x}***", src_addr as u32, dest_addr as u32);
     let src_entry = pagetable_entry(src_addr as usize)?;
     let phys = (*src_entry >> 10) << 12;
 
diff --git a/services/log-server/src/main.rs b/services/log-server/src/main.rs
index 8fd871bdd..3bac51b57 100644
--- a/services/log-server/src/main.rs
+++ b/services/log-server/src/main.rs
@@ -258,7 +258,7 @@ fn reader_thread(mut output: implementation::OutputWriter) {
                 .unwrap();
             }
             xous::Message::Move(msg) => {
-                String<4000>::from_message(msg)
+                String::<4000>::from_message(msg)
                     .map(|log_entry: String<4000>| {
                         writeln!(
                             output,
@@ -285,7 +285,7 @@ fn reader_thread(mut output: implementation::OutputWriter) {
                     .ok();
             }
             xous::Message::MutableBorrow(msg) => {
-                String<4000>::from_message(msg)
+                String::<4000>::from_message(msg)
                     .map(|mut log_entry: String<4000>| {
                         writeln!(
                             output,