Merge branch 'linux-2.6'

2 files changed, 4 insertions, 3 deletions

diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 6f92f732d253..c3ecc2a84e0c 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -320,7 +320,8 @@ int os_file_size(char *file, unsigned long long *size_out)
         }
 
         if(S_ISBLK(buf.ust_mode)){
-                int fd, blocks;
+                int fd;
+                long blocks;
 
                 fd = os_open_file(file, of_read(OPENFLAGS()), 0);
                 if(fd < 0){
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 18e5c8b67eb8..b98f7ea2d2f6 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -119,7 +119,7 @@ void (*handlers[_NSIG])(int sig, struct sigcontext *sc);
 
 void handle_signal(int sig, struct sigcontext *sc)
 {
-        unsigned long pending = 0;
+        unsigned long pending = 1UL << sig;
 
         do {
                 int nested, bail;
@@ -134,7 +134,7 @@ void handle_signal(int sig, struct sigcontext *sc)
                  * have to return, and the upper handler will deal
                  * with this interrupt.
                  */
-                bail = to_irq_stack(sig, &pending);
+                bail = to_irq_stack(&pending);
                 if(bail)
                         return;