Merge branch 'for-rmk' of git://git.marvell.com/orion into devel

[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / visemul.c

diff --git a/arch/sparc64/kernel/visemul.c b/arch/sparc64/kernel/visemul.c
index 84fedaa38aae5652b93a6ddab65ca34fe561dbd6..9e05cb5cb855ba5d0f2d3367d6e0a4e5023fe663 100644 (file)
--- a/arch/sparc64/kernel/visemul.c
+++ b/arch/sparc64/kernel/visemul.c
@@ -128,9 +128,6 @@
 /* 001001100 - Permute bytes as specified by GSR.MASK  */
 #define BSHUFFLE_OPF   0x04c
 
-#define VIS_OPCODE_MASK        ((0x3 << 30) | (0x3f << 19))
-#define VIS_OPCODE_VAL ((0x2 << 30) | (0x36 << 19))
-
 #define VIS_OPF_SHIFT  5
 #define VIS_OPF_MASK   (0x1ff << VIS_OPF_SHIFT)
 
@@ -246,7 +243,7 @@ static inline unsigned int *fps_regaddr(struct fpustate *f,
 struct edge_tab {
        u16 left, right;
 };
-struct edge_tab edge8_tab[8] = {
+static struct edge_tab edge8_tab[8] = {
        { 0xff, 0x80 },
        { 0x7f, 0xc0 },
        { 0x3f, 0xe0 },
@@ -256,7 +253,7 @@ struct edge_tab edge8_tab[8] = {
        { 0x03, 0xfe },
        { 0x01, 0xff },
 };
-struct edge_tab edge8_tab_l[8] = {
+static struct edge_tab edge8_tab_l[8] = {
        { 0xff, 0x01 },
        { 0xfe, 0x03 },
        { 0xfc, 0x07 },
@@ -266,23 +263,23 @@ struct edge_tab edge8_tab_l[8] = {
        { 0xc0, 0x7f },
        { 0x80, 0xff },
 };
-struct edge_tab edge16_tab[4] = {
+static struct edge_tab edge16_tab[4] = {
        { 0xf, 0x8 },
        { 0x7, 0xc },
        { 0x3, 0xe },
        { 0x1, 0xf },
 };
-struct edge_tab edge16_tab_l[4] = {
+static struct edge_tab edge16_tab_l[4] = {
        { 0xf, 0x1 },
        { 0xe, 0x3 },
        { 0xc, 0x7 },
        { 0x8, 0xf },
 };
-struct edge_tab edge32_tab[2] = {
+static struct edge_tab edge32_tab[2] = {
        { 0x3, 0x2 },
        { 0x1, 0x3 },
 };
-struct edge_tab edge32_tab_l[2] = {
+static struct edge_tab edge32_tab_l[2] = {
        { 0x3, 0x1 },
        { 0x2, 0x3 },
 };
@@ -810,9 +807,6 @@ int vis_emul(struct pt_regs *regs, unsigned int insn)
        if (get_user(insn, (u32 __user *) pc))
                return -EFAULT;
 
-       if ((insn & VIS_OPCODE_MASK) != VIS_OPCODE_VAL)
-               return -EINVAL;
-
        opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT;
        switch (opf) {
        default: