Merge ARM fixes

4 files changed, 33 insertions, 19 deletions

diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
index 905e59b4a737..5d233b42fe13 100644
--- a/include/asm-sparc64/irq.h
+++ b/include/asm-sparc64/irq.h
@@ -46,6 +46,10 @@ extern void irq_install_pre_handler(int virt_irq,
 #define irq_canonicalize(irq)   (irq)
 extern unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap);
 extern unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino);
+extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
+                                    unsigned int msi_devino_start,
+                                    unsigned int msi_devino_end);
+extern void sun4v_destroy_msi(unsigned int virt_irq);
 extern unsigned int sbus_build_irq(void *sbus, unsigned int ino);
 
 static __inline__ void set_softint(unsigned long bits)
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h
index dcfa7629358c..7a246d8a1828 100644
--- a/include/asm-sparc64/pbm.h
+++ b/include/asm-sparc64/pbm.h
@@ -11,6 +11,7 @@
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
+#include <linux/msi.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -177,6 +178,24 @@ struct pci_pbm_info {
         int                             is_66mhz_capable;
         int                             all_devs_66mhz;
 
+#ifdef CONFIG_PCI_MSI
+        /* MSI info.  */
+        u32                             msiq_num;
+        u32                             msiq_ent_count;
+        u32                             msiq_first;
+        u32                             msiq_first_devino;
+        u32                             msi_num;
+        u32                             msi_first;
+        u32                             msi_data_mask;
+        u32                             msix_data_width;
+        u64                             msi32_start;
+        u64                             msi64_start;
+        u32                             msi32_len;
+        u32                             msi64_len;
+        void                            *msi_queues;
+        unsigned long                   *msi_bitmap;
+#endif /* !(CONFIG_PCI_MSI) */
+
         /* This PBM's streaming buffer. */
         struct pci_strbuf               stc;
 
@@ -213,6 +232,12 @@ struct pci_controller_info {
         void (*base_address_update)(struct pci_dev *, int);
         void (*resource_adjust)(struct pci_dev *, struct resource *, struct resource *);
 
+#ifdef CONFIG_PCI_MSI
+        int (*setup_msi_irq)(unsigned int *virt_irq_p, struct pci_dev *pdev,
+                             struct msi_desc *entry);
+        void (*teardown_msi_irq)(unsigned int virt_irq, struct pci_dev *pdev);
+#endif
+
         /* Now things for the actual PCI bus probes. */
         struct pci_ops                  *pci_ops;
         unsigned int                    pci_first_busno;
@@ -231,6 +256,9 @@ struct pcidev_cookie {
         int num_prom_regs;
         struct linux_prom_pci_registers prom_assignments[PROMREG_MAX];
         int num_prom_assignments;
+#ifdef CONFIG_PCI_MSI
+        unsigned int                    msi_num;
+#endif
 };
 
 /* Currently these are the same across all PCI controllers
diff --git a/include/asm-sparc64/setup.h b/include/asm-sparc64/setup.h
index b356ee2cda92..5053df3cec40 100644
--- a/include/asm-sparc64/setup.h
+++ b/include/asm-sparc64/setup.h
@@ -5,6 +5,6 @@
 #ifndef _SPARC64_SETUP_H
 #define _SPARC64_SETUP_H
 
-#define COMMAND_LINE_SIZE       256
+#define COMMAND_LINE_SIZE       2048
 
 #endif /* _SPARC64_SETUP_H */
diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h
index ee26a071c677..f05d390993d5 100644
--- a/include/asm-sparc64/termios.h
+++ b/include/asm-sparc64/termios.h
@@ -45,24 +45,6 @@ struct winsize {
         unsigned short ws_ypixel;
 };
 
-/* line disciplines */
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8       /* Reserved for Mobitex module <kaz@cafe.net> */
-#define N_R3964         9       /* Reserved for Simatic R3964 module */
-#define N_PROFIBUS_FDL  10      /* Reserved for Profibus <Dave@mvhi.com> */
-#define N_IRDA          11      /* Linux IrDa - http://irda.sourceforge.net/ */
-#define N_SMSBLOCK      12      /* SMS block mode - for talking to GSM data cards about SMS messages */
-#define N_HDLC          13      /* synchronous HDLC */
-#define N_SYNC_PPP      14      /* synchronous PPP */
-#define N_HCI           15  /* Bluetooth HCI UART */
-
 #ifdef __KERNEL__
 #include <linux/module.h>