diff mbox

[08/10] alpha: remove unused variable

Message ID 8d7dcd1ab2db770904ba8dac00e8bb6b50a23201.1308072799.git.mst@redhat.com
State New
Headers show

Commit Message

Michael S. Tsirkin June 14, 2011, 5:36 p.m. UTC 
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 target-alpha/translate.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

Comments

Richard Henderson June 14, 2011, 5:47 p.m. UTC | #1 
On 06/14/2011 10:36 AM, Michael S. Tsirkin wrote:
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  target-alpha/translate.c |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)

Acked-by: Richard Henderson <rth@twiddle.net>


r~
Peter Maydell June 23, 2011, 11:47 a.m. UTC | #2 
On 14 June 2011 18:47, Richard Henderson <rth@twiddle.net> wrote:
> On 06/14/2011 10:36 AM, Michael S. Tsirkin wrote:
>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>> ---
>>  target-alpha/translate.c |    7 ++++++-
>>  1 files changed, 6 insertions(+), 1 deletions(-)
>
> Acked-by: Richard Henderson <rth@twiddle.net>

Richard, does this ack mean you've taken this patch (and the
other target-alpha gcc 4.6 warning fix patch) into an alpha
patches queue, or would you prefer these to be routed via the
trivial-patches queue?

thanks
-- PMM
Richard Henderson June 23, 2011, 3:25 p.m. UTC | #3 
On 06/23/2011 04:47 AM, Peter Maydell wrote:
> On 14 June 2011 18:47, Richard Henderson <rth@twiddle.net> wrote:
>> On 06/14/2011 10:36 AM, Michael S. Tsirkin wrote:
>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>> ---
>>>  target-alpha/translate.c |    7 ++++++-
>>>  1 files changed, 6 insertions(+), 1 deletions(-)
>>
>> Acked-by: Richard Henderson <rth@twiddle.net>
> 
> Richard, does this ack mean you've taken this patch (and the
> other target-alpha gcc 4.6 warning fix patch) into an alpha
> patches queue, or would you prefer these to be routed via the
> trivial-patches queue?

I did not bring it into my patch queue.  Please route it through trivial.


r~
diff mbox

Patch

diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 5d7454c..936760c 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -1661,7 +1661,10 @@  static void gen_mtpr(int rb, int regno)
 static ExitStatus translate_one(DisasContext *ctx, uint32_t insn)
 {
     uint32_t palcode;
-    int32_t disp21, disp16, disp12;
+    int32_t disp21, disp16;
+#ifndef CONFIG_USER_ONLY
+    int32_t disp12;
+#endif
     uint16_t fn11;
     uint8_t opc, ra, rb, rc, fpfn, fn7, islit, real_islit;
     uint8_t lit;
@@ -1681,7 +1684,9 @@  static ExitStatus translate_one(DisasContext *ctx, uint32_t insn)
     palcode = insn & 0x03FFFFFF;
     disp21 = ((int32_t)((insn & 0x001FFFFF) << 11)) >> 11;
     disp16 = (int16_t)(insn & 0x0000FFFF);
+#ifndef CONFIG_USER_ONLY
     disp12 = (int32_t)((insn & 0x00000FFF) << 20) >> 20;
+#endif
     fn11 = (insn >> 5) & 0x000007FF;
     fpfn = fn11 & 0x3F;
     fn7 = (insn >> 5) & 0x0000007F;