Changes in / [c0e74b1:d9e2e0e] in mainline

Files:

• kernel/arch/mips32/include/smp/dorder.h (deleted)
• kernel/arch/mips32/src/interrupt.c (modified) (4 diffs)
• kernel/arch/mips32/src/smp/dorder.c (modified) (1 diff)
• tools/toolchain.sh (modified) (12 diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (2 diffs)

kernel/arch/mips32/src/interrupt.c

@@ -38 +38 @@
 #include <arch.h>
 #include <arch/cp0.h>
-#include <arch/smp/dorder.h>
 #include <time/clock.h>
 #include <ipc/sysipc.h>
@@ -49 +48 @@
 function virtual_timer_fnc = NULL;
 static irq_t timer_irq;
-static irq_t dorder_irq;
 
 // TODO: This is SMP unsafe!!!
@@ -151 +149 @@
 }
 
-static irq_ownership_t dorder_claim(irq_t *irq)
-{
-        return IRQ_ACCEPT;
-}
-
-static void dorder_irq_handler(irq_t *irq)
-{
-        dorder_ipi_ack(1 << dorder_cpuid());
-}
-
 /* Initialize basic tables for exception dispatching */
 void interrupt_init(void)
@@ -175 +163 @@
         timer_start();
         cp0_unmask_int(TIMER_IRQ);
-        
-        irq_initialize(&dorder_irq);
-        dorder_irq.devno = device_assign_devno();
-        dorder_irq.inr = DORDER_IRQ;
-        dorder_irq.claim = dorder_claim;
-        dorder_irq.handler = dorder_irq_handler;
-        irq_register(&dorder_irq);
-        
-        cp0_unmask_int(DORDER_IRQ);
 }
 

kernel/arch/mips32/src/smp/dorder.c

@@ -33 +33 @@
  */
 
-#include <typedefs.h>
 #include <smp/ipi.h>
-#include <arch/smp/dorder.h>
+
+#ifdef CONFIG_SMP
 
 #define MSIM_DORDER_ADDRESS  0xB0000004
 
-#ifdef CONFIG_SMP
-
 void ipi_broadcast_arch(int ipi)
 {
-        *((volatile uint32_t *) MSIM_DORDER_ADDRESS) = 0x7fffffff;
+        *((volatile unsigned int *) MSIM_DORDER_ADDRESS) = 0x7FFFFFFF;
 }
 
 #endif
 
-uint32_t dorder_cpuid(void)
-{
-        return *((volatile uint32_t *) MSIM_DORDER_ADDRESS);
-}
-
-void dorder_ipi_ack(uint32_t mask)
-{
-        *((volatile uint32_t *) (MSIM_DORDER_ADDRESS + 4)) = mask;
-}
-
 /** @}
  */

tools/toolchain.sh

@@ -1 @@
-#! /bin/bash
+#!/bin/bash
 
 #
@@ -33 +33 @@
                 echo
                 echo "Script failed: $2"
-                
                 exit 1
         fi
@@ -46 +45 @@
                 echo
                 echo "Checksum of ${FILE} does not match."
-                
                 exit 2
         fi
@@ -73 +71 @@
 }
 
-change_title() {
-        echo -en "\e]0;$1\a"
-}
-
-show_countdown() {
-        TM="$1"
-        
-        if [ "${TM}" -eq 0 ] ; then
-                echo
-                return 0
-        fi
-        
-        echo -n "${TM} "
-        change_title "${TM}"
-        sleep 1
-        
-        TM="`expr "${TM}" - 1`"
-        show_countdown "${TM}"
-}
-
-show_dependencies() {
-        echo "IMPORTANT NOTICE:"
-        echo
-        echo "For a successful compilation and use of the cross-compiler"
-        echo "toolchain you need at least the following dependencies."
-        echo
-        echo "Please make sure that the dependencies are present in your"
-        echo "system. Otherwise the compilation process might fail after"
-        echo "a few seconds or minutes."
-        echo
-        echo " - SED, AWK, Flex, Bison, gzip, bzip2, Bourne Shell"
-        echo " - gettext, zlib, Texinfo, libelf, libgomp"
-        echo " - GNU Multiple Precision Library (GMP)"
-        echo " - GNU Make"
-        echo " - GNU tar"
-        echo " - GNU Coreutils"
-        echo " - GNU Sharutils"
-        echo " - MPFR"
-        echo " - MPC"
-        echo " - Parma Polyhedra Library (PPL)"
-        echo " - ClooG-PPL"
-        echo " - native C compiler, assembler and linker"
-        echo " - native C library with headers"
-        echo
-        
-        show_countdown 10
-}
-
 download_check() {
         SOURCE="$1"
@@ -127 +77 @@
         
         if [ ! -f "${FILE}" ]; then
-                change_title "Downloading ${FILE}"
                 wget -c "${SOURCE}${FILE}"
                 check_error $? "Error downloading ${FILE}."
@@ -139 +88 @@
         
         if [ -d "${DIR}" ]; then
-                change_title "Removing ${DIR}"
                 echo " >>> Removing ${DIR}"
                 rm -fr "${DIR}"
@@ -149 +97 @@
         DESC="$2"
         
-        change_title "Creating ${DESC}"
         echo ">>> Creating ${DESC}"
         
@@ -161 +108 @@
         DESC="$2"
         
-        change_title "Unpacking ${DESC}"
-        echo " >>> Unpacking ${DESC}"
+        echo " >>> ${DESC}"
         
         tar -xjf "${FILE}"
@@ -196 +142 @@
         
         BINUTILS_VERSION="2.20"
-        GCC_VERSION="4.5.1"
+        GCC_VERSION="4.5.0"
         
         BINUTILS="binutils-${BINUTILS_VERSION}.tar.bz2"
@@ -219 +165 @@
         echo ">>> Downloading tarballs"
         download_check "${BINUTILS_SOURCE}" "${BINUTILS}" "ee2d3e996e9a2d669808713360fa96f8"
-        download_check "${GCC_SOURCE}" "${GCC_CORE}" "dc8959e31b01a65ce10d269614815054"
-        download_check "${GCC_SOURCE}" "${GCC_OBJC}" "3c11b7037896e967eddf8178af2ddd98"
-        download_check "${GCC_SOURCE}" "${GCC_CPP}" "b294953ff0bb2f20c7acb2bf005d832a"
+        download_check "${GCC_SOURCE}" "${GCC_CORE}" "58eda33c3184303628f91c42a7ab15b5"
+        download_check "${GCC_SOURCE}" "${GCC_OBJC}" "8d8c01b6631b020cc6c167860fde2398"
+        download_check "${GCC_SOURCE}" "${GCC_CPP}" "5ab93605af40def4844eda09ca769c2d"
         
         echo ">>> Removing previous content"
@@ -238 +184 @@
         unpack_tarball "${GCC_CPP}" "C++"
         
-        echo ">>> Processing binutils (${PLATFORM})"
+        echo ">>> Compiling and installing binutils"
         cd "${BINUTILSDIR}"
         check_error $? "Change directory failed."
         patch_binutils "${PLATFORM}"
-        
-        change_title "binutils: configure (${PLATFORM})"
-        ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --disable-nls
+        ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" "--disable-nls"
         check_error $? "Error configuring binutils."
-        
-        change_title "binutils: make (${PLATFORM})"
         make all install
         check_error $? "Error compiling/installing binutils."
         
-        echo ">>> Processing GCC (${PLATFORM})"
+        echo ">>> Compiling and installing GCC"
         cd "${OBJDIR}"
         check_error $? "Change directory failed."
-        
-        change_title "GCC: configure (${PLATFORM})"
         "${GCCDIR}/configure" "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --with-gnu-as --with-gnu-ld --disable-nls --disable-threads --enable-languages=c,objc,c++,obj-c++ --disable-multilib --disable-libgcj --without-headers --disable-shared --enable-lto
         check_error $? "Error configuring GCC."
-        
-        change_title "GCC: make (${PLATFORM})"
         PATH="${PATH}:${PREFIX}/bin" make all-gcc install-gcc
         check_error $? "Error compiling/installing GCC."
@@ -278 +216 @@
         show_usage
 fi
-
-show_dependencies
 
 case "$1" in

uspace/srv/vfs/vfs_ops.c

@@ -1355 +1355 @@
                 int ret = vfs_close_internal(newfile);
                 if (ret != EOK) {
-                        fibril_mutex_unlock(&oldfile->lock);
                         ipc_answer_0(rid, ret);
                         return;
@@ -1362 +1361 @@
                 ret = vfs_fd_free(newfd);
                 if (ret != EOK) {
-                        fibril_mutex_unlock(&oldfile->lock);
                         ipc_answer_0(rid, ret);
                         return;