Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (30 commits)
  sparc64: Update defconfig.
  sparc: Wire up sys_rt_tgsigqueueinfo().
  openprom: Squelch useless GCC warning.
  sparc: replace uses of CPU_MASK_ALL_PTR
  sparc64: Add proper dynamic ftrace support.
  sparc: Simplify code using is_power_of_2() routine.
  sparc: move of_device common code to of_device_common
  sparc: remove dma-mapping_{32|64}.h
  sparc: use dma_map_page instead of dma_map_single
  sparc: add sync_single_for_device and sync_sg_for_device to struct dma_ops
  sparc: move the duplication in dma-mapping_{32|64}.h to dma-mapping.h
  p9100: use standard fields for framebuffer physical address and length
  leo: use standard fields for framebuffer physical address and length
  cg6: use standard fields for framebuffer physical address and length
  cg3: use standard fields for framebuffer physical address and length
  cg14: use standard fields for framebuffer physical address and length
  bw2: use standard fields for framebuffer physical address and length
  sparc64: fix and optimize irq distribution
  sparc64: Use new dynamic per-cpu allocator.
  sparc64: Only allocate per-cpu areas for possible cpus.
  ...

7 files changed, 50 insertions, 70 deletions

diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 124f660a0383..75ac19b1192f 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -303,7 +303,7 @@ static int openprom_sunos_ioctl(struct inode * inode, struct file * file,
                                 struct device_node *dp)
 {
         DATA *data = file->private_data;
-        struct openpromio *opp;
+        struct openpromio *opp = NULL;
         int bufsize, error = 0;
         static int cnt;
         void __user *argp = (void __user *)arg;
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 1e35ba6f18e0..b0b147cb4cb3 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -111,9 +111,7 @@ struct bw2_par {
         u32                     flags;
 #define BW2_FLAG_BLANKED        0x00000001
 
-        unsigned long           physbase;
         unsigned long           which_io;
-        unsigned long           fbsize;
 };
 
 /**
@@ -167,17 +165,15 @@ static int bw2_mmap(struct fb_info *info, struct vm_area_struct *vma)
         struct bw2_par *par = (struct bw2_par *)info->par;
 
         return sbusfb_mmap_helper(bw2_mmap_map,
-                                  par->physbase, par->fbsize,
+                                  info->fix.smem_start, info->fix.smem_len,
                                   par->which_io,
                                   vma);
 }
 
 static int bw2_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
 {
-        struct bw2_par *par = (struct bw2_par *) info->par;
-
         return sbusfb_ioctl_helper(cmd, arg, info,
-                                   FBTYPE_SUN2BW, 1, par->fbsize);
+                                   FBTYPE_SUN2BW, 1, info->fix.smem_len);
 }
 
 /*
@@ -294,7 +290,7 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
 
         spin_lock_init(&par->lock);
 
-        par->physbase = op->resource[0].start;
+        info->fix.smem_start = op->resource[0].start;
         par->which_io = op->resource[0].flags & IORESOURCE_BITS;
 
         sbusfb_fill_var(&info->var, dp, 1);
@@ -317,13 +313,13 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
                         goto out_unmap_regs;
         }
 
-        par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
+        info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
 
         info->flags = FBINFO_DEFAULT;
         info->fbops = &bw2_ops;
 
         info->screen_base = of_ioremap(&op->resource[0], 0,
-                                       par->fbsize, "bw2 ram");
+                                       info->fix.smem_len, "bw2 ram");
         if (!info->screen_base)
                 goto out_unmap_regs;
 
@@ -338,12 +334,12 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
         dev_set_drvdata(&op->dev, info);
 
         printk(KERN_INFO "%s: bwtwo at %lx:%lx\n",
-               dp->full_name, par->which_io, par->physbase);
+               dp->full_name, par->which_io, info->fix.smem_start);
 
         return 0;
 
 out_unmap_screen:
-        of_iounmap(&op->resource[0], info->screen_base, par->fbsize);
+        of_iounmap(&op->resource[0], info->screen_base, info->fix.smem_len);
 
 out_unmap_regs:
         of_iounmap(&op->resource[0], par->regs, sizeof(struct bw2_regs));
@@ -363,7 +359,7 @@ static int __devexit bw2_remove(struct of_device *op)
         unregister_framebuffer(info);
 
         of_iounmap(&op->resource[0], par->regs, sizeof(struct bw2_regs));
-        of_iounmap(&op->resource[0], info->screen_base, par->fbsize);
+        of_iounmap(&op->resource[0], info->screen_base, info->fix.smem_len);
 
         framebuffer_release(info);
 
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index a2d1882791a5..fe45a3b8d0e0 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -196,9 +196,7 @@ struct cg14_par {
         u32                     flags;
 #define CG14_FLAG_BLANKED       0x00000001
 
-        unsigned long           physbase;
         unsigned long           iospace;
-        unsigned long           fbsize;
 
         struct sbus_mmap_map    mmap_map[CG14_MMAP_ENTRIES];
 
@@ -271,7 +269,7 @@ static int cg14_mmap(struct fb_info *info, struct vm_area_struct *vma)
         struct cg14_par *par = (struct cg14_par *) info->par;
 
         return sbusfb_mmap_helper(par->mmap_map,
-                                  par->physbase, par->fbsize,
+                                  info->fix.smem_start, info->fix.smem_len,
                                   par->iospace, vma);
 }
 
@@ -343,7 +341,8 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
 
         default:
                 ret = sbusfb_ioctl_helper(cmd, arg, info,
-                                          FBTYPE_MDICOLOR, 8, par->fbsize);
+                                          FBTYPE_MDICOLOR, 8,
+                                          info->fix.smem_len);
                 break;
         };
 
@@ -462,7 +461,7 @@ static void cg14_unmap_regs(struct of_device *op, struct fb_info *info,
                            par->cursor, sizeof(struct cg14_cursor));
         if (info->screen_base)
                 of_iounmap(&op->resource[1],
-                           info->screen_base, par->fbsize);
+                           info->screen_base, info->fix.smem_len);
 }
 
 static int __devinit cg14_probe(struct of_device *op, const struct of_device_id *match)
@@ -488,14 +487,14 @@ static int __devinit cg14_probe(struct of_device *op, const struct of_device_id
 
         linebytes = of_getintprop_default(dp, "linebytes",
                                           info->var.xres);
-        par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
+        info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
 
         if (!strcmp(dp->parent->name, "sbus") ||
             !strcmp(dp->parent->name, "sbi")) {
-                par->physbase = op->resource[0].start;
+                info->fix.smem_start = op->resource[0].start;
                 par->iospace = op->resource[0].flags & IORESOURCE_BITS;
         } else {
-                par->physbase = op->resource[1].start;
+                info->fix.smem_start = op->resource[1].start;
                 par->iospace = op->resource[0].flags & IORESOURCE_BITS;
         }
 
@@ -507,7 +506,7 @@ static int __devinit cg14_probe(struct of_device *op, const struct of_device_id
                                  sizeof(struct cg14_cursor), "cg14 cursor");
 
         info->screen_base = of_ioremap(&op->resource[1], 0,
-                                       par->fbsize, "cg14 ram");
+                                       info->fix.smem_len, "cg14 ram");
 
         if (!par->regs || !par->clut || !par->cursor || !info->screen_base)
                 goto out_unmap_regs;
@@ -557,7 +556,7 @@ static int __devinit cg14_probe(struct of_device *op, const struct of_device_id
 
         printk(KERN_INFO "%s: cgfourteen at %lx:%lx, %dMB\n",
                dp->full_name,
-               par->iospace, par->physbase,
+               par->iospace, info->fix.smem_start,
                par->ramsize >> 20);
 
         return 0;
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 99f87fb61d05..b2319fa7286f 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -118,9 +118,7 @@ struct cg3_par {
 #define CG3_FLAG_BLANKED        0x00000001
 #define CG3_FLAG_RDI            0x00000002
 
-        unsigned long           physbase;
         unsigned long           which_io;
-        unsigned long           fbsize;
 };
 
 /**
@@ -231,17 +229,15 @@ static int cg3_mmap(struct fb_info *info, struct vm_area_struct *vma)
         struct cg3_par *par = (struct cg3_par *)info->par;
 
         return sbusfb_mmap_helper(cg3_mmap_map,
-                                  par->physbase, par->fbsize,
+                                  info->fix.smem_start, info->fix.smem_len,
                                   par->which_io,
                                   vma);
 }
 
 static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
 {
-        struct cg3_par *par = (struct cg3_par *) info->par;
-
         return sbusfb_ioctl_helper(cmd, arg, info,
-                                   FBTYPE_SUN3COLOR, 8, par->fbsize);
+                                   FBTYPE_SUN3COLOR, 8, info->fix.smem_len);
 }
 
 /*
@@ -368,7 +364,7 @@ static int __devinit cg3_probe(struct of_device *op,
 
         spin_lock_init(&par->lock);
 
-        par->physbase = op->resource[0].start;
+        info->fix.smem_start = op->resource[0].start;
         par->which_io = op->resource[0].flags & IORESOURCE_BITS;
 
         sbusfb_fill_var(&info->var, dp, 8);
@@ -382,7 +378,7 @@ static int __devinit cg3_probe(struct of_device *op,
 
         linebytes = of_getintprop_default(dp, "linebytes",
                                           info->var.xres);
-        par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
+        info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
 
         par->regs = of_ioremap(&op->resource[0], CG3_REGS_OFFSET,
                                sizeof(struct cg3_regs), "cg3 regs");
@@ -392,7 +388,7 @@ static int __devinit cg3_probe(struct of_device *op,
         info->flags = FBINFO_DEFAULT;
         info->fbops = &cg3_ops;
         info->screen_base = of_ioremap(&op->resource[0], CG3_RAM_OFFSET,
-                                       par->fbsize, "cg3 ram");
+                                       info->fix.smem_len, "cg3 ram");
         if (!info->screen_base)
                 goto out_unmap_regs;
 
@@ -418,7 +414,7 @@ static int __devinit cg3_probe(struct of_device *op,
         dev_set_drvdata(&op->dev, info);
 
         printk(KERN_INFO "%s: cg3 at %lx:%lx\n",
-               dp->full_name, par->which_io, par->physbase);
+               dp->full_name, par->which_io, info->fix.smem_start);
 
         return 0;
 
@@ -426,7 +422,7 @@ out_dealloc_cmap:
         fb_dealloc_cmap(&info->cmap);
 
 out_unmap_screen:
-        of_iounmap(&op->resource[0], info->screen_base, par->fbsize);
+        of_iounmap(&op->resource[0], info->screen_base, info->fix.smem_len);
 
 out_unmap_regs:
         of_iounmap(&op->resource[0], par->regs, sizeof(struct cg3_regs));
@@ -447,7 +443,7 @@ static int __devexit cg3_remove(struct of_device *op)
         fb_dealloc_cmap(&info->cmap);
 
         of_iounmap(&op->resource[0], par->regs, sizeof(struct cg3_regs));
-        of_iounmap(&op->resource[0], info->screen_base, par->fbsize);
+        of_iounmap(&op->resource[0], info->screen_base, info->fix.smem_len);
 
         framebuffer_release(info);
 
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 940ec04f0f1b..0d47c6030e3d 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -263,9 +263,7 @@ struct cg6_par {
         u32                     flags;
 #define CG6_FLAG_BLANKED        0x00000001
 
-        unsigned long           physbase;
         unsigned long           which_io;
-        unsigned long           fbsize;
 };
 
 static int cg6_sync(struct fb_info *info)
@@ -596,16 +594,14 @@ static int cg6_mmap(struct fb_info *info, struct vm_area_struct *vma)
         struct cg6_par *par = (struct cg6_par *)info->par;
 
         return sbusfb_mmap_helper(cg6_mmap_map,
-                                  par->physbase, par->fbsize,
+                                  info->fix.smem_start, info->fix.smem_len,
                                   par->which_io, vma);
 }
 
 static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
 {
-        struct cg6_par *par = (struct cg6_par *)info->par;
-
         return sbusfb_ioctl_helper(cmd, arg, info,
-                                   FBTYPE_SUNFAST_COLOR, 8, par->fbsize);
+                                   FBTYPE_SUNFAST_COLOR, 8, info->fix.smem_len);
 }
 
 /*
@@ -631,12 +627,12 @@ static void __devinit cg6_init_fix(struct fb_info *info, int linebytes)
                 break;
         };
         if (((conf >> CG6_FHC_REV_SHIFT) & CG6_FHC_REV_MASK) >= 11) {
-                if (par->fbsize <= 0x100000)
+                if (info->fix.smem_len <= 0x100000)
                         cg6_card_name = "TGX";
                 else
                         cg6_card_name = "TGX+";
         } else {
-                if (par->fbsize <= 0x100000)
+                if (info->fix.smem_len <= 0x100000)
                         cg6_card_name = "GX";
                 else
                         cg6_card_name = "GX+";
@@ -738,7 +734,8 @@ static void cg6_unmap_regs(struct of_device *op, struct fb_info *info,
                 of_iounmap(&op->resource[0], par->fhc, sizeof(u32));
 
         if (info->screen_base)
-                of_iounmap(&op->resource[0], info->screen_base, par->fbsize);
+                of_iounmap(&op->resource[0], info->screen_base,
+                           info->fix.smem_len);
 }
 
 static int __devinit cg6_probe(struct of_device *op,
@@ -759,7 +756,7 @@ static int __devinit cg6_probe(struct of_device *op,
 
         spin_lock_init(&par->lock);
 
-        par->physbase = op->resource[0].start;
+        info->fix.smem_start = op->resource[0].start;
         par->which_io = op->resource[0].flags & IORESOURCE_BITS;
 
         sbusfb_fill_var(&info->var, dp, 8);
@@ -769,11 +766,11 @@ static int __devinit cg6_probe(struct of_device *op,
 
         linebytes = of_getintprop_default(dp, "linebytes",
                                           info->var.xres);
-        par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
+        info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
 
         dblbuf = of_getintprop_default(dp, "dblbuf", 0);
         if (dblbuf)
-                par->fbsize *= 4;
+                info->fix.smem_len *= 4;
 
         par->fbc = of_ioremap(&op->resource[0], CG6_FBC_OFFSET,
                                 4096, "cgsix fbc");
@@ -792,7 +789,7 @@ static int __devinit cg6_probe(struct of_device *op,
         info->fbops = &cg6_ops;
 
         info->screen_base = of_ioremap(&op->resource[0], CG6_RAM_OFFSET,
-                                        par->fbsize, "cgsix ram");
+                                        info->fix.smem_len, "cgsix ram");
         if (!par->fbc || !par->tec || !par->thc ||
             !par->bt || !par->fhc || !info->screen_base)
                 goto out_unmap_regs;
@@ -817,7 +814,7 @@ static int __devinit cg6_probe(struct of_device *op,
 
         printk(KERN_INFO "%s: CGsix [%s] at %lx:%lx\n",
                dp->full_name, info->fix.id,
-               par->which_io, par->physbase);
+               par->which_io, info->fix.smem_start);
 
         return 0;
 
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 7c7e8c2da9d9..e145e2d16fe3 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -191,9 +191,7 @@ struct leo_par {
         u32                     flags;
 #define LEO_FLAG_BLANKED        0x00000001
 
-        unsigned long           physbase;
         unsigned long           which_io;
-        unsigned long           fbsize;
 };
 
 static void leo_wait(struct leo_lx_krn __iomem *lx_krn)
@@ -420,16 +418,14 @@ static int leo_mmap(struct fb_info *info, struct vm_area_struct *vma)
         struct leo_par *par = (struct leo_par *)info->par;
 
         return sbusfb_mmap_helper(leo_mmap_map,
-                                  par->physbase, par->fbsize,
+                                  info->fix.smem_start, info->fix.smem_len,
                                   par->which_io, vma);
 }
 
 static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
 {
-        struct leo_par *par = (struct leo_par *) info->par;
-
         return sbusfb_ioctl_helper(cmd, arg, info,
-                                   FBTYPE_SUNLEO, 32, par->fbsize);
+                                   FBTYPE_SUNLEO, 32, info->fix.smem_len);
 }
 
 /*
@@ -569,7 +565,7 @@ static int __devinit leo_probe(struct of_device *op,
 
         spin_lock_init(&par->lock);
 
-        par->physbase = op->resource[0].start;
+        info->fix.smem_start = op->resource[0].start;
         par->which_io = op->resource[0].flags & IORESOURCE_BITS;
 
         sbusfb_fill_var(&info->var, dp, 32);
@@ -577,7 +573,7 @@ static int __devinit leo_probe(struct of_device *op,
 
         linebytes = of_getintprop_default(dp, "linebytes",
                                           info->var.xres);
-        par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
+        info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
 
         par->lc_ss0_usr =
                 of_ioremap(&op->resource[0], LEO_OFF_LC_SS0_USR,
@@ -627,7 +623,7 @@ static int __devinit leo_probe(struct of_device *op,
 
         printk(KERN_INFO "%s: leo at %lx:%lx\n",
                dp->full_name,
-               par->which_io, par->physbase);
+               par->which_io, info->fix.smem_start);
 
         return 0;
 
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 7000f2cd5854..7fa4ab01b0d3 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -134,9 +134,7 @@ struct p9100_par {
         u32                     flags;
 #define P9100_FLAG_BLANKED      0x00000001
 
-        unsigned long           physbase;
         unsigned long           which_io;
-        unsigned long           fbsize;
 };
 
 /**
@@ -224,18 +222,16 @@ static int p9100_mmap(struct fb_info *info, struct vm_area_struct *vma)
         struct p9100_par *par = (struct p9100_par *)info->par;
 
         return sbusfb_mmap_helper(p9100_mmap_map,
-                                  par->physbase, par->fbsize,
+                                  info->fix.smem_start, info->fix.smem_len,
                                   par->which_io, vma);
 }
 
 static int p9100_ioctl(struct fb_info *info, unsigned int cmd,
                        unsigned long arg)
 {
-        struct p9100_par *par = (struct p9100_par *) info->par;
-
         /* Make it look like a cg3. */
         return sbusfb_ioctl_helper(cmd, arg, info,
-                                   FBTYPE_SUN3COLOR, 8, par->fbsize);
+                                   FBTYPE_SUN3COLOR, 8, info->fix.smem_len);
 }
 
 /*
@@ -271,7 +267,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
         spin_lock_init(&par->lock);
 
         /* This is the framebuffer and the only resource apps can mmap.  */
-        par->physbase = op->resource[2].start;
+        info->fix.smem_start = op->resource[2].start;
         par->which_io = op->resource[2].flags & IORESOURCE_BITS;
 
         sbusfb_fill_var(&info->var, dp, 8);
@@ -280,7 +276,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
         info->var.blue.length = 8;
 
         linebytes = of_getintprop_default(dp, "linebytes", info->var.xres);
-        par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
+        info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
 
         par->regs = of_ioremap(&op->resource[0], 0,
                                sizeof(struct p9100_regs), "p9100 regs");
@@ -290,7 +286,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
         info->flags = FBINFO_DEFAULT;
         info->fbops = &p9100_ops;
         info->screen_base = of_ioremap(&op->resource[2], 0,
-                                       par->fbsize, "p9100 ram");
+                                       info->fix.smem_len, "p9100 ram");
         if (!info->screen_base)
                 goto out_unmap_regs;
 
@@ -311,7 +307,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
 
         printk(KERN_INFO "%s: p9100 at %lx:%lx\n",
                dp->full_name,
-               par->which_io, par->physbase);
+               par->which_io, info->fix.smem_start);
 
         return 0;
 
@@ -319,7 +315,7 @@ out_dealloc_cmap:
         fb_dealloc_cmap(&info->cmap);
 
 out_unmap_screen:
-        of_iounmap(&op->resource[2], info->screen_base, par->fbsize);
+        of_iounmap(&op->resource[2], info->screen_base, info->fix.smem_len);
 
 out_unmap_regs:
         of_iounmap(&op->resource[0], par->regs, sizeof(struct p9100_regs));
@@ -340,7 +336,7 @@ static int __devexit p9100_remove(struct of_device *op)
         fb_dealloc_cmap(&info->cmap);
 
         of_iounmap(&op->resource[0], par->regs, sizeof(struct p9100_regs));
-        of_iounmap(&op->resource[2], info->screen_base, par->fbsize);
+        of_iounmap(&op->resource[2], info->screen_base, info->fix.smem_len);
 
         framebuffer_release(info);