Changes in / [51e5608:b330b309] in mainline

Files:

• HelenOS.config (modified) (1 diff)
• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (1 diff)
• kernel/arch/mips32/include/cp0.h (modified) (2 diffs)
• kernel/arch/sparc64/src/smp/sun4v/smp.c (modified) (2 diffs)
• kernel/arch/sparc64/src/sun4v/start.S (modified) (1 diff)
• kernel/arch/sparc64/src/trap/sun4v/interrupt.c (modified) (1 diff)
• kernel/genarch/Makefile.inc (modified) (1 diff)
• kernel/genarch/src/kbrd/kbrd_pl050.c (added)
• kernel/genarch/src/kbrd/scanc_pl050.c (added)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (10 diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.h (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (2 diffs)
• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (2 diffs)
• uspace/drv/pciintel/pci.c (modified) (1 diff)
• uspace/lib/c/include/ipc/services.h (modified) (1 diff)
• uspace/lib/fs/libfs.c (modified) (2 diffs)
• uspace/srv/hid/kbd/Makefile (modified) (1 diff)
• uspace/srv/hid/kbd/ctl/pl050.c (added)
• uspace/srv/hid/kbd/generic/kbd.c (modified) (2 diffs)
• uspace/srv/hid/kbd/include/kbd.h (modified) (1 diff)
• uspace/srv/hid/kbd/port/ns16550.c (modified) (1 diff)
• uspace/srv/hid/kbd/port/z8530.c (modified) (1 diff)
• uspace/srv/hw/irc/apic/apic.c (modified) (4 diffs)
• uspace/srv/hw/irc/fhc/fhc.c (modified) (1 diff)
• uspace/srv/hw/irc/i8259/i8259.c (modified) (1 diff)
• uspace/srv/hw/irc/obio/obio.c (modified) (1 diff)
• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (2 diffs)
• uspace/srv/net/net/net.c (modified) (2 diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (6 diffs)
• version (modified) (2 diffs)

HelenOS.config

@@ -417 +417 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_PC_KBD (y/n)
 
-% PC keyboard support
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n)
-
 % Support for msim/GXemul keyboard
 ! [CONFIG_HID_IN=generic&PLATFORM=mips32] CONFIG_MIPS_KBD (y/n)

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -292 +292 @@
                 .y = 480,
                 .scan = 2560,
-                .visual = VISUAL_RGB_8_8_8_0,
+                .visual = VISUAL_BGR_0_8_8_8,
         };
         

kernel/arch/mips32/include/cp0.h

@@ -70 +70 @@
   { \
       uint32_t retval; \
-      asm volatile ("mfc0 %0, $" #reg : "=r"(retval)); \
+      asm("mfc0 %0, $" #reg : "=r"(retval)); \
       return retval; \
   }
@@ -76 +76 @@
 #define GEN_WRITE_CP0(nm,reg) static inline void cp0_ ##nm##_write(uint32_t val) \
  { \
-    asm volatile ("mtc0 %0, $" #reg : : "r"(val) ); \
+    asm("mtc0 %0, $" #reg : : "r"(val) ); \
  }
 

kernel/arch/sparc64/src/smp/sun4v/smp.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2009 Pavel Rimsky
+ * Copyright (c) 2009 Pavel Rimsky 
  * All rights reserved.
  *
@@ -439 +439 @@
         if (waitq_sleep_timeout(&ap_completion_wq, 10000000, SYNCH_FLAGS_NONE) ==
             ESYNCH_TIMEOUT)
-                printf("%s: waiting for processor (cpuid = %" PRIu64 ") timed out\n",
+                printf("%s: waiting for processor (cpuid = %" PRIu32 ") timed out\n",
                     __func__, cpuid);
         

kernel/arch/sparc64/src/sun4v/start.S

@@ -296 +296 @@
          * Create the first stack frame.
          */
-        save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
+        save %sp, -(STACK_WINDWO_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
         flushw
         add %g0, -STACK_BIAS, %fp

kernel/arch/sparc64/src/trap/sun4v/interrupt.c

@@ -111 +111 @@
                         ((void (*)(void)) data1)();
                 } else {
-                        printf("Spurious interrupt on %" PRIu64 ", data = %" PRIx64 ".\n",
+                        printf("Spurious interrupt on %d, data = %" PRIx64 ".\n",
                             CPU->arch.id, data1);
                 }

kernel/genarch/Makefile.inc

@@ -122 +122 @@
 endif
 
+ifeq ($(CONFIG_PL050),y)
+        GENARCH_SOURCES += \
+                genarch/src/kbrd/kbrd_pl050.c \
+                genarch/src/kbrd/scanc_pl050.c
+endif
+
 ifeq ($(CONFIG_MAC_KBD),y)
         GENARCH_SOURCES += \

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -1 +1 @@
 /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
- * Copyright (c) 2011, Martin Sucha
  * All rights reserved.
  *
@@ -36 +35 @@
 #include <str.h>
 #include <fcntl.h>
-#include <io/console.h>
-#include <io/color.h>
-#include <io/style.h>
-#include <io/keycode.h>
-#include <errno.h>
-#include <vfs/vfs.h>
-#include <assert.h>
 
 #include "config.h"
@@ -56 +48 @@
 
 static const char *cat_oops = "That option is not yet supported\n";
-static const char *hexchars = "0123456789abcdef";
-
-static bool paging_enabled = false;
-static size_t chars_remaining = 0;
-static size_t lines_remaining = 0;
-static sysarg_t console_cols = 0;
-static sysarg_t console_rows = 0;
-static bool should_quit = false;
 
 static struct option const long_options[] = {
@@ -72 +56 @@
         { "buffer", required_argument, 0, 'b' },
         { "more", no_argument, 0, 'm' },
-        { "hex", no_argument, 0, 'x' },
         { 0, 0, 0, 0 }
 };
@@ -92 +75 @@
                 "  -b, --buffer ##  Set the read buffer size to ##\n"
                 "  -m, --more       Pause after each screen full\n"
-                "  -x, --hex        Print bytes as hex values\n"
                 "Currently, %s is under development, some options don't work.\n",
                 cmdname, cmdname);
@@ -100 +82 @@
 }
 
-static void waitprompt()
-{
-        console_set_pos(fphone(stdout), 0, console_rows-1);
-        console_set_color(fphone(stdout), COLOR_BLUE, COLOR_WHITE, 0);
-        printf("ENTER/SPACE/PAGE DOWN - next page, "
-               "ESC/Q - quit, C - continue unpaged");
-        fflush(stdout);
-        console_set_style(fphone(stdout), STYLE_NORMAL);
-}
-
-static void waitkey()
-{
-        console_event_t ev;
-        
-        while (true) {
-                if (!console_get_event(fphone(stdin), &ev)) {
-                        return;
-                }
-                if (ev.type == KEY_PRESS) {
-                        if (ev.key == KC_ESCAPE || ev.key == KC_Q) {
-                                should_quit = true;
-                                return;
-                        }
-                        if (ev.key == KC_C) {
-                                paging_enabled = false;
-                                return;
-                        }
-                        if (ev.key == KC_ENTER || ev.key == KC_SPACE ||
-                            ev.key == KC_PAGE_DOWN) {
-                                return;
-                        }
-                }
-        }
-        assert(false);
-}
-
-static void newpage()
-{
-        console_clear(fphone(stdout));
-        chars_remaining = console_cols;
-        lines_remaining = console_rows-1;
-}
-
-static void paged_char(wchar_t c)
-{
-        putchar(c);
-        if (paging_enabled) {
-                chars_remaining--;
-                if (c == '\n' || chars_remaining == 0) {
-                        chars_remaining = console_cols;
-                        lines_remaining--;
-                }
-                if (lines_remaining == 0) {
-                        fflush(stdout);
-                        waitprompt();
-                        waitkey();
-                        newpage();
-                }
-        }
-}
-
-static unsigned int cat_file(const char *fname, size_t blen, bool hex)
+static unsigned int cat_file(const char *fname, size_t blen)
 {
         int fd, bytes = 0, count = 0, reads = 0;
         off64_t total = 0;
         char *buff = NULL;
-        int i;
-        size_t offset = 0;
 
         fd = open(fname, O_RDONLY);
@@ -190 +109 @@
                         count += bytes;
                         buff[bytes] = '\0';
-                        offset = 0;
-                        for (i = 0; i < bytes && !should_quit; i++) {
-                                if (hex) {
-                                        paged_char(hexchars[((uint8_t)buff[i])/16]);
-                                        paged_char(hexchars[((uint8_t)buff[i])%16]);
-                                }
-                                else {
-                                        wchar_t c = str_decode(buff, &offset, bytes);
-                                        if (c == 0) {
-                                                // reached end of string
-                                                break;
-                                        }
-                                        paged_char(c);
-                                }
-                                
-                        }
+                        printf("%s", buff);
                         reads++;
                 }
-        } while (bytes > 0 && !should_quit);
+        } while (bytes > 0);
 
         close(fd);
@@ -227 +131 @@
         unsigned int argc, i, ret = 0, buffer = 0;
         int c, opt_ind;
-        bool hex = false;
-        bool more = false;
-        sysarg_t rows, cols;
-        int rc;
-        
-        // reset global state
-        // TODO: move to structure?
-        paging_enabled = false;
-        chars_remaining = 0;
-        lines_remaining = 0;
-        console_cols = 0;
-        console_rows = 0;
-        should_quit = false;
 
         argc = cli_count_args(argv);
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "xhvmH:t:b:", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "hvmH:t:b:", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -262 +153 @@
                         break;
                 case 'm':
-                        more = true;
-                        break;
-                case 'x':
-                        hex = true;
-                        break;
+                        printf("%s", cat_oops);
+                        return CMD_FAILURE;
                 }
         }
@@ -280 +168 @@
         if (buffer <= 0)
                 buffer = CAT_DEFAULT_BUFLEN;
-        
-        if (more) {
-                rc = console_get_size(fphone(stdout), &cols, &rows);
-                if (rc != EOK) {
-                        printf("%s - cannot get console size\n", cmdname);
-                        return CMD_FAILURE;
-                }
-                console_cols = cols;
-                console_rows = rows;
-                paging_enabled = true;
-                newpage();
-        }
 
-        for (i = optind; argv[i] != NULL && !should_quit; i++)
-                ret += cat_file(argv[i], buffer, hex);
+        for (i = optind; argv[i] != NULL; i++)
+                ret += cat_file(argv[i], buffer);
 
         if (ret)

uspace/app/bdsh/cmds/modules/cat/cat.h

@@ -4 +4 @@
 /* Prototypes for the cat command, excluding entry points */
 
-static unsigned int cat_file(const char *, size_t, bool);
+static unsigned int cat_file(const char *, size_t);
 
 #endif /* CAT_H */

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -108 +108 @@
         for (;;) {
                 ssize_t res;
-                size_t written = 0;
 
                 bytes = read(fd1, buff, blen);
@@ -121 +120 @@
                          * returned less data than requested.
                          */
-                        bytes = write(fd2, buff + written, res);
+                        bytes = write(fd2, buff, res);
                         if (bytes < 0)
                                 goto err;
-                        written += bytes;
                         res -= bytes;
                 } while (res > 0);

uspace/app/bdsh/cmds/modules/rm/rm.c

@@ -101 +101 @@
 }
 
-static unsigned int rm_recursive_not_empty_dirs(const char *path)
-{
-        DIR *dirp;
-        struct dirent *dp;
-        char buff[PATH_MAX];
-        unsigned int scope;
-        unsigned int ret = 0;
-
-        dirp = opendir(path);
-        if (!dirp) {
-                /* May have been deleted between scoping it and opening it */
-                cli_error(CL_EFAIL, "Could not open %s", path);
-                return ret;
-        }
-
-        memset(buff, 0, sizeof(buff));
-        while ((dp = readdir(dirp))) {
-                snprintf(buff, PATH_MAX - 1, "%s/%s", path, dp->d_name);
-                scope = rm_scope(buff);
-                switch (scope) {
-                case RM_BOGUS:
-                        break;
-                case RM_FILE:
-                        ret += rm_single(buff);
-                        break;
-                case RM_DIR:
-                        ret += rm_recursive(buff);
-                        break;
-                }
-        }
-        
-        return ret;
-}
-
 static unsigned int rm_recursive(const char *path)
 {
         int rc;
-        unsigned int ret = 0;
 
         /* First see if it will just go away */
@@ -146 +111 @@
 
         /* Its not empty, recursively scan it */
-        ret = rm_recursive_not_empty_dirs(path);
-
-        /* Delete directory */
-        rc = rmdir(path);
-        if (rc == 0)
-                return ret;
-
-        cli_error(CL_ENOTSUP, "Can not remove %s", path);
-
-        return ret + 1;
+        cli_error(CL_ENOTSUP,
+                "Can not remove %s, directory not empty", path);
+        return 1;
 }
 

uspace/drv/pciintel/pci.c

@@ -95 +95 @@
         sysarg_t i8259;
 
-        int irc_phone = ENOTSUP;
-
-        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
-            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
-                irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
-        }
-
+        int irc_phone = -1;
+        int irc_service = -1;
+
+        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) {
+                irc_service = SERVICE_APIC;
+        } else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)) {
+                irc_service = SERVICE_I8259;
+        }
+
+        if (irc_service == -1) {
+                return false;
+        }
+
+        irc_phone = service_connect_blocking(irc_service, 0, 0);
         if (irc_phone < 0) {
                 return false;

uspace/lib/c/include/ipc/services.h

@@ -47 +47 @@
         SERVICE_DEVMAP,
         SERVICE_DEVMAN,
-        SERVICE_IRC,
+        SERVICE_FHC,
+        SERVICE_OBIO,
+        SERVICE_APIC,
+        SERVICE_I8259,
         SERVICE_CLIPBOARD,
         SERVICE_NETWORKING,

uspace/lib/fs/libfs.c

@@ -391 +391 @@
                                                 if (lflag & L_CREATE)
                                                         (void) ops->destroy(fn);
-                                                else
-                                                        (void) ops->node_put(fn);
                                                 async_answer_0(rid, rc);
                                         } else {
@@ -475 +473 @@
                                         if (lflag & L_CREATE)
                                                 (void) ops->destroy(fn);
-                                        else
-                                                (void) ops->node_put(fn);
                                         async_answer_0(rid, rc);
                                 } else {

uspace/srv/hid/kbd/Makefile

@@ -78 +78 @@
                 SOURCES += \
                         port/pl050.c \
-                        ctl/pc.c
+                        ctl/pl050.c
         endif
 endif

uspace/srv/hid/kbd/generic/kbd.c

@@ -67 +67 @@
 static unsigned lock_keys;
 
-bool irc_service = false;
-int irc_phone = -1;
+int cir_service = 0;
+int cir_phone = -1;
 
 #define NUM_LAYOUTS 3
@@ -216 +216 @@
         sysarg_t obio;
         
-        if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
-            || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)))
-                irc_service = true;
-        
-        if (irc_service) {
-                while (irc_phone < 0)
-                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
+        if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
+                cir_service = SERVICE_FHC;
+        else if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
+                cir_service = SERVICE_OBIO;
+        
+        if (cir_service) {
+                while (cir_phone < 0)
+                        cir_phone = service_connect_blocking(cir_service, 0, 0);
         }
         

uspace/srv/hid/kbd/include/kbd.h

@@ -38 +38 @@
 #define KBD_KBD_H_
 
-#include <bool.h>
-
-extern bool irc_service;
-extern int irc_phone;
+extern int cir_service;
+extern int cir_phone;
 
 extern void kbd_push_scancode(int);

uspace/srv/hid/kbd/port/ns16550.c

@@ -120 +120 @@
         kbd_push_scancode(scan_code);
         
-        if (irc_service)
-                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
+        if (cir_service)
+                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }

uspace/srv/hid/kbd/port/z8530.c

@@ -108 +108 @@
         kbd_push_scancode(scan_code);
         
-        if (irc_service)
-                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
+        if (cir_service)
+                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }

uspace/srv/hw/irc/apic/apic.c

@@ -54 +54 @@
 #define NAME  "apic"
 
+static bool apic_found = false;
+
 static int apic_enable_irq(sysarg_t irq)
 {
@@ -79 +81 @@
                 callid = async_get_call(&call);
                 
-                switch (IPC_GET_IMETHOD(call)) {
+                sysarg_t method = IPC_GET_IMETHOD(call);
+                if (method == IPC_M_PHONE_HUNGUP) {
+                        return;
+                }
+
+                if (!apic_found) {
+                        async_answer_0(callid, ENOTSUP);
+                        break;
+                }
+
+                switch (method) {
                 case IRC_ENABLE_INTERRUPT:
                         async_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call)));
@@ -97 +109 @@
  *
  */
-static bool apic_init(void)
+static void apic_init(void)
 {
         sysarg_t apic;
         
-        if ((sysinfo_get_value("apic", &apic) != EOK) || (!apic)) {
-                printf(NAME ": No APIC found\n");
-                return false;
+        apic_found = sysinfo_get_value("apic", &apic) && apic;
+        if (!apic_found) {
+                printf(NAME ": Warning: no APIC found\n");
         }
         
         async_set_client_connection(apic_connection);
-        service_register(SERVICE_IRC);
-        
-        return true;
+        service_register(SERVICE_APIC);
 }
 
@@ -116 +126 @@
         printf(NAME ": HelenOS APIC driver\n");
         
-        if (!apic_init())
-                return -1;
-        
+        apic_init();
+
         printf(NAME ": Accepting connections\n");
         async_manager();

uspace/srv/hw/irc/fhc/fhc.c

@@ -136 +136 @@
         
         async_set_client_connection(fhc_connection);
-        service_register(SERVICE_IRC);
+        service_register(SERVICE_FHC);
         
         return true;

uspace/srv/hw/irc/i8259/i8259.c

@@ -149 +149 @@
         
         async_set_client_connection(i8259_connection);
-        service_register(SERVICE_IRC);
+        service_register(SERVICE_I8259);
         
         return true;

uspace/srv/hw/irc/obio/obio.c

@@ -137 +137 @@
         
         async_set_client_connection(obio_connection);
-        service_register(SERVICE_IRC);
+        service_register(SERVICE_OBIO);
         
         return true;

uspace/srv/hw/netif/ne2000/ne2000.c

@@ -75 +75 @@
 #define IRQ_GET_TSR(call)  ((int) IPC_GET_ARG3(call))
 
-static bool irc_service = false;
+static int irc_service = 0;
 static int irc_phone = -1;
 
@@ -383 +383 @@
         sysarg_t i8259;
         
-        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
-            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)))
-                irc_service = true;
+        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic))
+                irc_service = SERVICE_APIC;
+        else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))
+                irc_service = SERVICE_I8259;
         
         if (irc_service) {
                 while (irc_phone < 0)
-                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
+                        irc_phone = service_connect_blocking(irc_service, 0, 0);
         }
         

uspace/srv/net/net/net.c

@@ -289 +289 @@
         if (rc != EOK)
                 return rc;
-        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME,
             (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service);
         if (rc != EOK)
                 return rc;
-        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME,
             (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service);
         if (rc != EOK)
                 return rc;
-        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME,
             (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service);
@@ -593 +590 @@
                 rc = start_device(netif);
                 if (rc != EOK) {
-                        printf("%s: Ignoring failed interface %s (%s)\n", NAME,
+                        printf("%s: Error starting interface %s (%s)\n", NAME,
                             netif->name, str_error(rc));
                         measured_strings_destroy(&netif->configuration);
                         netifs_exclude_index(&net_globals.netifs, index);
-                        continue;
+                        
+                        return rc;
                 }
                 

uspace/srv/vfs/vfs_ops.c

@@ -1234 +1234 @@
         if (!parentc) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
-                vfs_node_put(old_node);
                 async_answer_0(rid, rc);
                 free(old);
@@ -1252 +1251 @@
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
-                vfs_node_put(old_node);
                 async_answer_0(rid, rc);
                 free(old);
@@ -1263 +1261 @@
             (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
-                vfs_node_put(old_node);
                 async_answer_0(rid, EXDEV);     /* different file systems */
                 free(old);
@@ -1282 +1279 @@
                 if (!new_node) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
-                        vfs_node_put(old_node);
                         async_answer_0(rid, ENOMEM);
                         free(old);
@@ -1294 +1290 @@
         default:
                 fibril_rwlock_write_unlock(&namespace_rwlock);
-                vfs_node_put(old_node);
                 async_answer_0(rid, ENOTEMPTY);
                 free(old);
@@ -1305 +1300 @@
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
-                vfs_node_put(old_node);
                 if (new_node)
                         vfs_node_put(new_node);

version

@@ -37 +37 @@
 VERSION = 0
 PATCHLEVEL = 4
-SUBLEVEL = 3
+SUBLEVEL = 2
 
 ifdef EXTRAVERSION
@@ -45 +45 @@
 endif
 
-NAME = Sashimi
+NAME = Skewer