3 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 7290e72b9a34..22cac4487b57 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -588,7 +588,7 @@ END(common_interrupt)
  */             
         .macro apicinterrupt num,func
         INTR_FRAME
-        pushq $\num-256
+        pushq $~(\num)
         CFI_ADJUST_CFA_OFFSET 8
         interrupt \func
         jmp ret_from_intr
diff --git a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c
index 59518d4d4358..3be0a7e4bf08 100644
--- a/arch/x86_64/kernel/irq.c
+++ b/arch/x86_64/kernel/irq.c
@@ -115,8 +115,8 @@ skip:
  */
 asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
 {       
-        /* high bits used in ret_from_ code  */
-        unsigned irq = regs->orig_rax & 0xff;
+        /* high bit used in ret_from_ code  */
+        unsigned irq = ~regs->orig_rax;
 
         exit_idle();
         irq_enter();
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index acee4bc3f6fa..5a1c0a3bf872 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -135,10 +135,10 @@ asmlinkage void smp_invalidate_interrupt(struct pt_regs *regs)
 
         cpu = smp_processor_id();
         /*
-         * orig_rax contains the interrupt vector - 256.
+         * orig_rax contains the negated interrupt vector.
          * Use that to determine where the sender put the data.
          */
-        sender = regs->orig_rax + 256 - INVALIDATE_TLB_VECTOR_START;
+        sender = ~regs->orig_rax - INVALIDATE_TLB_VECTOR_START;
         f = &per_cpu(flush_state, sender);
 
         if (!cpu_isset(cpu, f->flush_cpumask))