sandbox: Tidy up terminal restore

[karo-tx-uboot.git] / arch / sandbox / cpu / cpu.c

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 168f2efa33e5fe4f5eaab52503dbb724fd2f5528..02c4cd366d13c0444eb28f11c35074a06d608413 100644 (file)
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -22,6 +22,8 @@ unsigned long map_len;
 
 void reset_cpu(ulong ignored)
 {
+       /* Do this here while it still has an effect */
+       os_fd_restore();
        if (state_uninit())
                os_exit(2);
 
@@ -45,11 +47,6 @@ void __udelay(unsigned long usec)
        os_usleep(usec);
 }
 
-unsigned long __attribute__((no_instrument_function)) timer_get_us(void)
-{
-       return os_get_nsec() / 1000;
-}
-
 int cleanup_before_linux(void)
 {
        return 0;