5 files changed, 28 insertions, 54 deletions

diff --git a/arch/xtensa/include/asm/mman.h b/arch/xtensa/include/asm/mman.h
index 30789010733d..25bc6c1309c3 100644
--- a/arch/xtensa/include/asm/mman.h
+++ b/arch/xtensa/include/asm/mman.h
@@ -86,6 +86,10 @@
 #define MADV_HUGEPAGE   14              /* Worth backing with hugepages */
 #define MADV_NOHUGEPAGE 15              /* Not worth backing with hugepages */
 
+#define MADV_DONTDUMP   16              /* Explicity exclude from the core dump,
+                                           overrides the coredump filter bits */
+#define MADV_DODUMP     17              /* Clear the MADV_NODUMP flag */
+
 /* compatibility flags */
 #define MAP_FILE        0
 
diff --git a/arch/xtensa/include/asm/socket.h b/arch/xtensa/include/asm/socket.h
index bb06968be227..e36c68184920 100644
--- a/arch/xtensa/include/asm/socket.h
+++ b/arch/xtensa/include/asm/socket.h
@@ -75,5 +75,9 @@
 
 #define SO_WIFI_STATUS          41
 #define SCM_WIFI_STATUS         SO_WIFI_STATUS
+#define SO_PEEK_OFF             42
+
+/* Instruct lower device to use last 4-bytes of skb data as FCS */
+#define SO_NOFCS                43
 
 #endif  /* _XTENSA_SOCKET_H */
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index 61045c192e88..eb30e356f5be 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -153,7 +153,7 @@ static void __init pci_controller_apertures(struct pci_controller *pci_ctrl,
         }
         res->start += io_offset;
         res->end += io_offset;
-        pci_add_resource(resources, res);
+        pci_add_resource_offset(resources, res, io_offset);
 
         for (i = 0; i < 3; i++) {
                 res = &pci_ctrl->mem_resources[i];
@@ -200,24 +200,9 @@ subsys_initcall(pcibios_init);
 
 void __init pcibios_fixup_bus(struct pci_bus *bus)
 {
-        struct pci_controller *pci_ctrl = bus->sysdata;
-        struct resource *res;
-        unsigned long io_offset;
-        int i;
-
-        io_offset = (unsigned long)pci_ctrl->io_space.base;
         if (bus->parent) {
                 /* This is a subordinate bridge */
                 pci_read_bridge_bases(bus);
-
-                for (i = 0; i < 4; i++) {
-                        if ((res = bus->resource[i]) == NULL || !res->flags)
-                                continue;
-                        if (io_offset && (res->flags & IORESOURCE_IO)) {
-                                res->start += io_offset;
-                                res->end += io_offset;
-                        }
-                }
         }
 }
 
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index f2220b5bdce6..b69b000349fc 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -260,10 +260,7 @@ asmlinkage long xtensa_rt_sigreturn(long a0, long a1, long a2, long a3,
                 goto badframe;
 
         sigdelsetmask(&set, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        set_current_blocked(&set);
 
         if (restore_sigcontext(regs, frame))
                 goto badframe;
@@ -336,8 +333,8 @@ gen_return_code(unsigned char *codemem)
 }
 
 
-static void setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                        sigset_t *set, struct pt_regs *regs)
+static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+                       sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe *frame;
         int err = 0;
@@ -422,12 +419,11 @@ static void setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 current->comm, current->pid, signal, frame, regs->pc);
 #endif
 
-        return;
+        return 0;
 
 give_sigsegv:
-        if (sig == SIGSEGV)
-                ka->sa.sa_handler = SIG_DFL;
-        force_sig(SIGSEGV, current);
+        force_sigsegv(sig, current);
+        return -EFAULT;
 }
 
 /*
@@ -449,11 +445,8 @@ asmlinkage long xtensa_rt_sigsuspend(sigset_t __user *unewset,
                 return -EFAULT;
 
         sigdelsetmask(&newset, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
         saveset = current->blocked;
-        current->blocked = newset;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        set_current_blocked(&newset);
 
         regs->areg[2] = -EINTR;
         while (1) {
@@ -536,17 +529,11 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 
                 /* Whee!  Actually deliver the signal.  */
                 /* Set up the stack frame */
-                setup_frame(signr, &ka, &info, oldset, regs);
-
-                if (ka.sa.sa_flags & SA_ONESHOT)
-                        ka.sa.sa_handler = SIG_DFL;
+                ret = setup_frame(signr, &ka, &info, oldset, regs);
+                if (ret)
+                        return ret;
 
-                spin_lock_irq(&current->sighand->siglock);
-                sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask);
-                if (!(ka.sa.sa_flags & SA_NODEFER))
-                        sigaddset(&current->blocked, signr);
-                recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
+                block_sigmask(&ka, signr);
                 if (current->ptrace & PT_SINGLESTEP)
                         task_pt_regs(current)->icountlevel = 1;
 
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 2c723e8b30da..f9726f6afdf1 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -19,7 +19,6 @@
 #include <linux/param.h>
 #include <linux/seq_file.h>
 #include <linux/serial.h>
-#include <linux/serialP.h>
 
 #include <asm/uaccess.h>
 #include <asm/irq.h>
@@ -37,6 +36,7 @@
 #define SERIAL_TIMER_VALUE (20 * HZ)
 
 static struct tty_driver *serial_driver;
+static struct tty_port serial_port;
 static struct timer_list serial_timer;
 
 static DEFINE_SPINLOCK(timer_lock);
@@ -68,17 +68,10 @@ static void rs_poll(unsigned long);
 
 static int rs_open(struct tty_struct *tty, struct file * filp)
 {
-        int line = tty->index;
-
-        if ((line < 0) || (line >= SERIAL_MAX_NUM_LINES))
-                return -ENODEV;
-
+        tty->port = &serial_port;
         spin_lock(&timer_lock);
-
         if (tty->count == 1) {
-                init_timer(&serial_timer);
-                serial_timer.data = (unsigned long) tty;
-                serial_timer.function = rs_poll;
+                setup_timer(&serial_timer, rs_poll, (unsigned long)tty);
                 mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
         }
         spin_unlock(&timer_lock);
@@ -99,10 +92,10 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
  */
 static void rs_close(struct tty_struct *tty, struct file * filp)
 {
-        spin_lock(&timer_lock);
+        spin_lock_bh(&timer_lock);
         if (tty->count == 1)
                 del_timer_sync(&serial_timer);
-        spin_unlock(&timer_lock);
+        spin_unlock_bh(&timer_lock);
 }
 
 
@@ -210,13 +203,14 @@ static const struct tty_operations serial_ops = {
 
 int __init rs_init(void)
 {
-        serial_driver = alloc_tty_driver(1);
+        tty_port_init(&serial_port);
+
+        serial_driver = alloc_tty_driver(SERIAL_MAX_NUM_LINES);
 
         printk ("%s %s\n", serial_name, serial_version);
 
         /* Initialize the tty_driver structure */
 
-        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = "iss_serial";
         serial_driver->name = "ttyS";
         serial_driver->major = TTY_MAJOR;