From 72ee015b732d813be89dff669d677f9b0f7327e1 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 13 Feb 2006 22:37:07 -0800 Subject: [PATCH] --- yaml --- r: 21444 b: refs/heads/master c: a615fea48be4eada94986d63e3e8ee5563121649 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/sun4v_ivec.S | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4644da4a9dbc..06b40fa8e2ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c8f486ae7fe90d7bb99a70a42d71c9a40688ec2 +refs/heads/master: a615fea48be4eada94986d63e3e8ee5563121649 diff --git a/trunk/arch/sparc64/kernel/sun4v_ivec.S b/trunk/arch/sparc64/kernel/sun4v_ivec.S index c0367ef7e098..b49a68bdda43 100644 --- a/trunk/arch/sparc64/kernel/sun4v_ivec.S +++ b/trunk/arch/sparc64/kernel/sun4v_ivec.S @@ -98,10 +98,7 @@ sun4v_dev_mondo: membar #Sync /* Get &__irq_work[smp_processor_id()] into %g1. */ - sethi %hi(__irq_work), %g4 - sllx %g1, 6, %g1 - or %g4, %lo(__irq_work), %g4 - add %g4, %g1, %g1 + TRAP_LOAD_IRQ_WORK(%g1, %g4) /* Get &ivector_table[IVEC] into %g4. */ sethi %hi(ivector_table), %g4